summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
blob: bdb3ec58df0ad67f70f6ba208a5e6b72d23ad6e8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
 * This file is part of the LibreOffice project.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 *
 * This file incorporates work covered by the following license notice:
 *
 *   Licensed to the Apache Software Foundation (ASF) under one or more
 *   contributor license agreements. See the NOTICE file distributed
 *   with this work for additional information regarding copyright
 *   ownership. The ASF licenses this file to you under the Apache
 *   License, Version 2.0 (the "License"); you may not use this file
 *   except in compliance with the License. You may obtain a copy of
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <hsqldb/HStorageAccess.hxx>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <hsqldb/HStorageMap.hxx>
#include "accesslog.hxx"
#include <osl/diagnose.h>

#include <string.h>

using namespace ::com::sun::star::container;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::embed;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::connectivity::hsqldb;

#define ThrowException(env, type, msg) { \
    env->ThrowNew(env->FindClass(type), msg); }

/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    openStream
 * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
 */
extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
  (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jint mode)
{
#ifdef HSQLDB_DBG
    {
        OperationLogFile( env, name, "data" ).logOperation( "openStream" );
        LogFile( env, name, "data" ).create();
    }
#endif

    StorageContainer::registerStream(env,name,key,mode);
}

/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    close
 * Signature: (Ljava/lang/String;Ljava/lang/String;)V
 */
extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
  (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
    {
        OUString sKey = StorageContainer::jstring2ustring(env,key);
        OUString sName = StorageContainer::jstring2ustring(env,name);
    }
#endif
    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XOutputStream> xFlush = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
    if ( xFlush.is() )
        try
        {
            xFlush->flush();
        }
        catch(const Exception&)
        {
            OSL_FAIL( "NativeStorageAccess::close: caught an exception while flushing!" );
        }
#ifdef HSQLDB_DBG
    {
        OperationLogFile aOpLog( env, name, "data" );
        aOpLog.logOperation( "close" );
        aOpLog.close();

        LogFile aDataLog( env, name, "data" );
        aDataLog.close();
    }
#endif

    StorageContainer::revokeStream(env,name,key);
}

/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    getFilePointer
 * Signature: (Ljava/lang/String;Ljava/lang/String;)J
 */
extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
  (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "getFilePointer" );
#endif

    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    OSL_ENSURE(pHelper.get(),"No stream helper!");

    jlong nReturn = pHelper.get() ? pHelper->getSeek()->getPosition() : jlong(0);
#ifdef HSQLDB_DBG
    aOpLog.logReturn( nReturn );
#endif
    return nReturn;
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    length
 * Signature: (Ljava/lang/String;Ljava/lang/String;)J
 */
extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
  (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "length" );
#endif

    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    OSL_ENSURE(pHelper.get(),"No stream helper!");

    jlong nReturn = pHelper.get() ? pHelper->getSeek()->getLength() :jlong(0);
#ifdef HSQLDB_DBG
    aOpLog.logReturn( nReturn );
#endif
    return nReturn;
}


jint read_from_storage_stream( JNIEnv * env, jstring name, jstring key )
{
    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>();
    OSL_ENSURE(xIn.is(),"Input stream is NULL!");
    if ( xIn.is() )
    {
        Sequence< ::sal_Int8 > aData(1);
        sal_Int32 nBytesRead = -1;
        try
        {
            nBytesRead = xIn->readBytes(aData,1);
        }
        catch(const Exception& e)
        {
            StorageContainer::throwJavaException(e,env);
            return -1;

        }
        if (nBytesRead <= 0)
        {
            return -1;
        }
        else
        {
            return static_cast<unsigned char>(aData[0]);
        }
    }
    return -1;
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    read
 * Signature: (Ljava/lang/String;Ljava/lang/String;)I
 */
extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
  (JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "read" );

    DataLogFile aDataLog( env, name, "data" );
    return read_from_storage_stream( env, obj_this, name, key, &aDataLog );
#else
    return read_from_storage_stream( env, name, key );
#endif
}


jint read_from_storage_stream_into_buffer( JNIEnv * env, jstring name, jstring key, jbyteArray buffer, jint off, jint len )
{
#ifdef HSQLDB_DBG
    {
        OUString sKey = StorageContainer::jstring2ustring(env,key);
        OUString sName = StorageContainer::jstring2ustring(env,name);
    }
#endif
    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>();
    OSL_ENSURE(xIn.is(),"Input stream is NULL!");
    if ( xIn.is() )
    {
        jsize nLen = env->GetArrayLength(buffer);
        if ( nLen < len || len <= 0 )
        {
            ThrowException( env,
                    "java/io/IOException",
                    "len is greater or equal to the buffer size");
            return -1;
        }
        sal_Int32 nBytesRead = -1;

        Sequence< ::sal_Int8 > aData(nLen);
        try
        {
            nBytesRead = xIn->readBytes(aData, len);
        }
        catch(const Exception& e)
        {
            StorageContainer::throwJavaException(e,env);
            return -1;
        }

        if (nBytesRead <= 0)
            return -1;
        env->SetByteArrayRegion(buffer,off,nBytesRead,reinterpret_cast<jbyte*>(&aData[0]));

        return nBytesRead;
    }
    ThrowException( env,
                    "java/io/IOException",
                    "Stream is not valid");
    return -1;
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    read
 * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
 */
extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
  (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "read( byte[], int, int )" );

    DataLogFile aDataLog( env, name, "data" );
    return read_from_storage_stream_into_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog );
#else
    (void)obj_this;
    return read_from_storage_stream_into_buffer( env, name, key, buffer, off, len );
#endif
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    readInt
 * Signature: (Ljava/lang/String;Ljava/lang/String;)I
 */
extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
  (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "readInt" );
#endif

    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>();
    OSL_ENSURE(xIn.is(),"Input stream is NULL!");
    if ( xIn.is() )
    {
        Sequence< ::sal_Int8 > aData(4);
        sal_Int32 nBytesRead = -1;
        try
        {
            nBytesRead = xIn->readBytes(aData, 4);
        }
        catch(const Exception& e)
        {
            StorageContainer::throwJavaException(e,env);
            return -1;
        }

        if ( nBytesRead != 4 ) {
            ThrowException( env,
                            "java/io/IOException",
                            "Bytes read != 4");
            return -1;
        }

        Sequence< sal_Int32 > ch(4);
        for(sal_Int32 i = 0;i < 4; ++i)
        {
            ch[i] = static_cast<unsigned char>(aData[i]);
        }

        if ((ch[0] | ch[1] | ch[2] | ch[3]) < 0)
        {
            ThrowException( env,
                            "java/io/IOException",
                            "One byte is < 0");
            return -1;
        }
        jint nRet = (ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0);
#ifdef HSQLDB_DBG
        DataLogFile aDataLog( env, name, "data" );
        aDataLog.write( nRet );

        aOpLog.logReturn( nRet );
#endif
        return nRet;
    }
    ThrowException( env,
                    "java/io/IOException",
                    "No InputStream");
    return -1;
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    seek
 * Signature: (Ljava/lang/String;Ljava/lang/String;J)V
 */
extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
  (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jlong position)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "seek", position );
#endif

    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XSeekable> xSeek = pHelper.get() ? pHelper->getSeek() : Reference< XSeekable>();

    OSL_ENSURE(xSeek.is(),"No Seekable stream!");
    if ( xSeek.is() )
    {
    #ifdef HSQLDB_DBG
        DataLogFile aDataLog( env, name, "data" );
    #endif

        ::sal_Int64 nLen = xSeek->getLength();
        if ( nLen < position)
        {
            static const ::sal_Int64 BUFFER_SIZE = 9192;
        #ifdef HSQLDB_DBG
            aDataLog.seek( nLen );
        #endif
            xSeek->seek(nLen);
            Reference< XOutputStream> xOut = pHelper->getOutputStream();
            OSL_ENSURE(xOut.is(),"No output stream!");

            ::sal_Int64 diff = position - nLen;
            sal_Int32 n;
            while( diff != 0 )
            {
                if ( BUFFER_SIZE < diff )
                {
                    n = static_cast<sal_Int32>(BUFFER_SIZE);
                    diff = diff - BUFFER_SIZE;
                }
                else
                {
                    n = static_cast<sal_Int32>(diff);
                    diff = 0;
                }
                Sequence< ::sal_Int8 > aData(n);
                memset(aData.getArray(),0,n);
                xOut->writeBytes(aData);
            #ifdef HSQLDB_DBG
                aDataLog.write( aData.getConstArray(), n );
            #endif
            }
        }
        xSeek->seek(position);
        OSL_ENSURE(xSeek->getPosition() == position,"Wrong position after seeking the stream");

    #ifdef HSQLDB_DBG
        aDataLog.seek( position );
        OSL_ENSURE( xSeek->getPosition() == aDataLog.tell(), "Wrong position after seeking the stream" );
    #endif
    }
}


void write_to_storage_stream_from_buffer( JNIEnv* env, jstring name, jstring key, jbyteArray buffer, jint off, jint len )
{
    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
    OSL_ENSURE(xOut.is(),"Stream is NULL");

    try
    {
        if ( xOut.is() )
        {
            jbyte *buf = env->GetByteArrayElements(buffer,nullptr);
            if (env->ExceptionCheck())
            {
                env->ExceptionClear();
                OSL_FAIL("ExceptionClear");
            }
            OSL_ENSURE(buf,"buf is NULL");
            if ( buf && len > 0 && len <= env->GetArrayLength(buffer))
            {
                Sequence< ::sal_Int8 > aData(reinterpret_cast<sal_Int8 *>(buf + off),len);
                env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT);
                xOut->writeBytes(aData);
            }
        }
        else
        {
            ThrowException( env,
                    "java/io/IOException",
                    "No OutputStream");
        }
    }
    catch(const Exception& e)
    {
        OSL_FAIL("Exception caught! : write [BII)V");
        StorageContainer::throwJavaException(e,env);
    }
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    write
 * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
 */
extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
  (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "write( byte[], int, int )" );

    DataLogFile aDataLog( env, name, "data" );
    write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len, &aDataLog );
#else
    (void)obj_this;
    write_to_storage_stream_from_buffer( env, name, key, buffer, off, len );
#endif
}


void write_to_storage_stream( JNIEnv* env, jstring name, jstring key, jint v )
{
    std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
    Reference< XOutputStream> xOut = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>();
    OSL_ENSURE(xOut.is(),"Stream is NULL");
    try
    {
        if ( xOut.is() )
        {
            Sequence< ::sal_Int8 > oneByte(4);
            oneByte[0] = static_cast<sal_Int8>((v >> 24) & 0xFF);
            oneByte[1] = static_cast<sal_Int8>((v >> 16) & 0xFF);
            oneByte[2] = static_cast<sal_Int8>((v >>  8) & 0xFF);
            oneByte[3] = static_cast<sal_Int8>((v >>  0) & 0xFF);

            xOut->writeBytes(oneByte);
        }
        else
        {
            ThrowException( env,
                    "java/io/IOException",
                    "No OutputStream");
        }
    }
    catch(const Exception& e)
    {
        OSL_FAIL("Exception caught! : writeBytes(aData);");
        StorageContainer::throwJavaException(e,env);
    }
}


/*
 * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
 * Method:    writeInt
 * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
 */
extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
  (JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v)
{
#ifdef HSQLDB_DBG
    OperationLogFile aOpLog( env, name, "data" );
    aOpLog.logOperation( "writeInt" );

    DataLogFile aDataLog( env, name, "data" );
    write_to_storage_stream( env, name, key, v, &aDataLog );
#else
    (void)obj_this;
    write_to_storage_stream( env, name, key, v );
#endif
}

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
794ae09ba732022fe6a74ea45e304ab70b84'>bridges/test/testcomp.cxx2
-rw-r--r--bridges/test/testcomp.h18
-rw-r--r--canvas/inc/canvas/canvastools.hxx4
-rw-r--r--canvas/source/directx/dx_canvas.hxx4
-rw-r--r--canvas/source/directx/dx_canvasbitmap.hxx6
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.hxx6
-rw-r--r--canvas/source/directx/dx_canvasfont.hxx6
-rw-r--r--canvas/source/directx/dx_config.cxx6
-rw-r--r--canvas/source/directx/dx_config.hxx2
-rw-r--r--canvas/source/directx/dx_spritecanvas.hxx2
-rw-r--r--canvas/source/directx/dx_textlayout.hxx6
-rw-r--r--canvas/source/directx/dx_textlayout_drawhelper.cxx2
-rw-r--r--canvas/source/null/null_canvasbitmap.hxx6
-rw-r--r--canvas/source/null/null_canvascustomsprite.hxx6
-rw-r--r--canvas/source/null/null_canvasfont.hxx6
-rw-r--r--canvas/source/null/null_spritecanvas.hxx2
-rw-r--r--canvas/source/null/null_textlayout.hxx6
-rw-r--r--canvas/source/tools/surfaceproxy.cxx4
-rw-r--r--canvas/source/vcl/canvas.hxx2
-rw-r--r--canvas/source/vcl/canvasbitmap.hxx6
-rw-r--r--canvas/source/vcl/canvascustomsprite.hxx6
-rw-r--r--canvas/source/vcl/canvasfont.hxx6
-rw-r--r--canvas/source/vcl/devicehelper.cxx6
-rw-r--r--canvas/source/vcl/spritecanvas.hxx2
-rw-r--r--canvas/source/vcl/spritedevicehelper.cxx6
-rw-r--r--canvas/source/vcl/textlayout.hxx6
-rw-r--r--chart2/source/controller/accessibility/AccStatisticsObject.hxx4
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.hxx10
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartShape.hxx10
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartView.cxx1
-rw-r--r--chart2/source/controller/accessibility/AccessibleTextHelper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx13
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx32
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx34
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx1
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.hxx8
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.hxx6
-rw-r--r--chart2/source/controller/dialogs/DialogModel.hxx16
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionListener.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx1
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.cxx1
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx10
-rw-r--r--chart2/source/controller/inc/AccessibleChartView.hxx4
-rw-r--r--chart2/source/controller/inc/AccessibleTextHelper.hxx4
-rw-r--r--chart2/source/controller/inc/CharacterPropertyItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/ChartDocumentWrapper.hxx16
-rw-r--r--chart2/source/controller/inc/DrawViewWrapper.hxx2
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ObjectNameProvider.hxx26
-rw-r--r--chart2/source/controller/inc/PositionAndSizeHelper.hxx2
-rw-r--r--chart2/source/controller/inc/RangeSelectionHelper.hxx6
-rw-r--r--chart2/source/controller/inc/RangeSelectionListener.hxx6
-rw-r--r--chart2/source/controller/inc/TitleDialogData.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ChartType_UNO.hxx6
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx14
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx12
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.hxx26
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx1
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx1
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx5
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx27
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.cxx1
-rw-r--r--chart2/source/controller/main/ChartFrameloader.cxx6
-rw-r--r--chart2/source/controller/main/ChartTransferable.cxx1
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx2
-rw-r--r--chart2/source/controller/main/CommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/CommandDispatch.hxx10
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.cxx1
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.hxx8
-rw-r--r--chart2/source/controller/main/ConfigurationAccess.cxx6
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx3
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.hxx12
-rw-r--r--chart2/source/controller/main/DragMethod_Base.cxx4
-rw-r--r--chart2/source/controller/main/DragMethod_Base.hxx6
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.cxx6
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.hxx2
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.hxx2
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx30
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.hxx10
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx14
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx2
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.cxx8
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.hxx12
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx7
-rw-r--r--chart2/source/controller/main/PositionAndSizeHelper.cxx2
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx46
-rw-r--r--chart2/source/controller/main/SelectionHelper.hxx12
-rw-r--r--chart2/source/controller/main/ShapeController.cxx6
-rw-r--r--chart2/source/controller/main/ShapeController.hxx4
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.cxx12
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.hxx14
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/UndoActions.cxx11
-rw-r--r--chart2/source/controller/main/UndoActions.hxx8
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/UndoGuard.cxx1
-rw-r--r--chart2/source/controller/main/UndoGuard.hxx10
-rw-r--r--chart2/source/inc/CachedDataSequence.hxx14
-rw-r--r--chart2/source/inc/ChartTypeHelper.hxx4
-rw-r--r--chart2/source/inc/CommonConverters.hxx8
-rw-r--r--chart2/source/inc/CommonFunctors.hxx24
-rw-r--r--chart2/source/inc/ConfigColorScheme.hxx2
-rw-r--r--chart2/source/inc/ConfigItemListener.hxx2
-rw-r--r--chart2/source/inc/ContainerHelper.hxx6
-rw-r--r--chart2/source/inc/DataSeriesHelper.hxx16
-rw-r--r--chart2/source/inc/DataSourceHelper.hxx20
-rw-r--r--chart2/source/inc/DiagramHelper.hxx8
-rw-r--r--chart2/source/inc/ExplicitCategoriesProvider.hxx16
-rw-r--r--chart2/source/inc/ExponentialRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/FormattedStringHelper.hxx2
-rw-r--r--chart2/source/inc/InternalDataProvider.hxx50
-rw-r--r--chart2/source/inc/LinearRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/MeanValueRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/MediaDescriptorHelper.hxx36
-rw-r--r--chart2/source/inc/NameContainer.hxx28
-rw-r--r--chart2/source/inc/NumberFormatterWrapper.hxx4
-rw-r--r--chart2/source/inc/OPropertySet.hxx14
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx118
-rw-r--r--chart2/source/inc/PotentialRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/PropertyHelper.hxx24
-rw-r--r--chart2/source/inc/RegressionCurveCalculator.hxx8
-rw-r--r--chart2/source/inc/RegressionCurveHelper.hxx6
-rw-r--r--chart2/source/inc/Scaling.hxx8
-rw-r--r--chart2/source/inc/ServiceMacros.hxx24
-rw-r--r--chart2/source/inc/StatisticsHelper.hxx4
-rw-r--r--chart2/source/inc/TitleHelper.hxx6
-rw-r--r--chart2/source/inc/UncachedDataSequence.hxx22
-rw-r--r--chart2/source/inc/WrappedDefaultProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedDirectStateProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedIgnoreProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedProperty.hxx10
-rw-r--r--chart2/source/inc/WrappedPropertySet.hxx34
-rw-r--r--chart2/source/inc/XMLRangeHelper.hxx6
-rw-r--r--chart2/source/inc/chartview/DrawModelWrapper.hxx2
-rw-r--r--chart2/source/inc/chartview/ExplicitValueProvider.hxx4
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx7
-rw-r--r--chart2/source/model/inc/CartesianCoordinateSystem.hxx4
-rw-r--r--chart2/source/model/inc/ChartTypeManager.hxx6
-rw-r--r--chart2/source/model/inc/PolarCoordinateSystem.hxx4
-rw-r--r--chart2/source/model/inc/XMLFilter.hxx20
-rw-r--r--chart2/source/model/main/Axis.cxx1
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx1
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx1
-rw-r--r--chart2/source/model/main/ChartModel.cxx25
-rw-r--r--chart2/source/model/main/ChartModel.hxx24
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx11
-rw-r--r--chart2/source/model/main/DataPoint.cxx1
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx16
-rw-r--r--chart2/source/model/main/DataSeries.cxx1
-rw-r--r--chart2/source/model/main/DataSeriesProperties.cxx1
-rw-r--r--chart2/source/model/main/Diagram.cxx1
-rw-r--r--chart2/source/model/main/FormattedString.cxx5
-rw-r--r--chart2/source/model/main/FormattedString.hxx6
-rw-r--r--chart2/source/model/main/GridProperties.cxx1
-rw-r--r--chart2/source/model/main/Legend.cxx1
-rw-r--r--chart2/source/model/main/PageBackground.cxx4
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx5
-rw-r--r--chart2/source/model/main/StockBar.cxx4
-rw-r--r--chart2/source/model/main/Title.cxx4
-rw-r--r--chart2/source/model/main/UndoManager.cxx14
-rw-r--r--chart2/source/model/main/UndoManager.hxx10
-rw-r--r--chart2/source/model/main/Wall.cxx4
-rw-r--r--chart2/source/model/template/AreaChartType.cxx6
-rw-r--r--chart2/source/model/template/AreaChartType.hxx2
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BarChartType.cxx6
-rw-r--r--chart2/source/model/template/BarChartType.hxx2
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx11
-rw-r--r--chart2/source/model/template/BubbleChartType.hxx6
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx9
-rw-r--r--chart2/source/model/template/CandleStickChartType.hxx8
-rw-r--r--chart2/source/model/template/ChartType.cxx1
-rw-r--r--chart2/source/model/template/ChartType.hxx8
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx1
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.hxx6
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx6
-rw-r--r--chart2/source/model/template/ColumnChartType.hxx2
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/DataInterpreter.hxx6
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx7
-rw-r--r--chart2/source/model/template/FilledNetChartType.hxx2
-rw-r--r--chart2/source/model/template/LineChartType.cxx7
-rw-r--r--chart2/source/model/template/LineChartType.hxx2
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/NetChartType.cxx7
-rw-r--r--chart2/source/model/template/NetChartType.hxx2
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx7
-rw-r--r--chart2/source/model/template/PieChartType.hxx2
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx15
-rw-r--r--chart2/source/model/template/ScatterChartType.hxx6
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/StockDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx1
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx1
-rw-r--r--chart2/source/tools/CharacterProperties.cxx1
-rw-r--r--chart2/source/tools/ChartDebugTrace.cxx1
-rw-r--r--chart2/source/tools/ChartTypeHelper.cxx66
-rw-r--r--chart2/source/tools/CommonConverters.cxx10
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx1
-rw-r--r--chart2/source/tools/ControllerLockGuard.cxx1
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx2
-rw-r--r--chart2/source/tools/DataSource.cxx1
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx25
-rw-r--r--chart2/source/tools/DiagramHelper.cxx19
-rw-r--r--chart2/source/tools/ErrorBar.cxx6
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx17
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/FillProperties.cxx8
-rw-r--r--chart2/source/tools/FormattedStringHelper.cxx1
-rw-r--r--chart2/source/tools/ImplOPropertySet.cxx1
-rw-r--r--chart2/source/tools/InternalData.cxx1
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx16
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx1
-rw-r--r--chart2/source/tools/LineProperties.cxx2
-rw-r--r--chart2/source/tools/LinearRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx1
-rw-r--r--chart2/source/tools/NameContainer.cxx3
-rw-r--r--chart2/source/tools/NumberFormatterWrapper.cxx8
-rw-r--r--chart2/source/tools/OPropertySet.cxx1
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx28
-rw-r--r--chart2/source/tools/PotentialRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/PropertyHelper.cxx1
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx1
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx1
-rw-r--r--chart2/source/tools/RegressionCalculationHelper.hxx2
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx1
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx11
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx26
-rw-r--r--chart2/source/tools/RegressionCurveModel.hxx2
-rw-r--r--chart2/source/tools/RegressionEquation.cxx6
-rw-r--r--chart2/source/tools/RelativeSizeHelper.cxx1
-rw-r--r--chart2/source/tools/Scaling.cxx24
-rw-r--r--chart2/source/tools/StatisticsHelper.cxx2
-rw-r--r--chart2/source/tools/ThreeDHelper.cxx5
-rw-r--r--chart2/source/tools/TitleHelper.cxx14
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx3
-rw-r--r--chart2/source/tools/WeakListenerAdapter.cxx1
-rw-r--r--chart2/source/tools/WrappedDefaultProperty.cxx1
-rw-r--r--chart2/source/tools/WrappedDirectStateProperty.cxx1
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx13
-rw-r--r--chart2/source/tools/WrappedProperty.cxx5
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx15
-rw-r--r--chart2/source/tools/XMLRangeHelper.cxx30
-rw-r--r--chart2/source/view/axes/DateScaling.cxx12
-rw-r--r--chart2/source/view/axes/DateScaling.hxx4
-rw-r--r--chart2/source/view/axes/Tickmarks.hxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx12
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx6
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx14
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx6
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx2
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx10
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx8
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx6
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx11
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx6
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx17
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx10
-rw-r--r--chart2/source/view/inc/PlotterBase.hxx6
-rw-r--r--chart2/source/view/inc/PropertyMapper.hxx14
-rw-r--r--chart2/source/view/inc/ShapeFactory.hxx12
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx12
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx28
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx6
-rw-r--r--chart2/source/view/main/ChartView.cxx81
-rw-r--r--chart2/source/view/main/ChartView.hxx26
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx2
-rw-r--r--chart2/source/view/main/PlotterBase.cxx4
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx10
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx18
-rw-r--r--chart2/source/view/main/VDataSeries.cxx34
-rw-r--r--chart2/source/view/main/VLegend.cxx4
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx1
-rw-r--r--chart2/source/view/main/VTitle.cxx6
-rw-r--r--chart2/source/view/main/VTitle.hxx4
-rw-r--r--chart2/workbench/addin/sampleaddin.cxx5
-rw-r--r--chart2/workbench/addin/sampleaddin.hxx16
-rwxr-xr-xcli_ure/source/climaker/climaker_share.h6
-rw-r--r--cli_ure/source/native/native_share.h6
-rw-r--r--cli_ure/source/uno_bridge/cli_base.h8
-rw-r--r--cli_ure/source/uno_bridge/cli_bridge.cxx7
-rw-r--r--cli_ure/source/uno_bridge/cli_data.cxx14
-rw-r--r--cli_ure/source/uno_bridge/cli_proxy.cxx10
-rw-r--r--cli_ure/source/uno_bridge/cli_proxy.h12
-rw-r--r--cli_ure/source/uno_bridge/cli_uno.cxx1
-rw-r--r--codemaker/inc/codemaker/codemaker.hxx8
-rw-r--r--codemaker/inc/codemaker/commoncpp.hxx12
-rw-r--r--codemaker/inc/codemaker/commonjava.hxx8
-rw-r--r--codemaker/inc/codemaker/dependencies.hxx12
-rw-r--r--codemaker/inc/codemaker/exceptiontree.hxx8
-rw-r--r--codemaker/inc/codemaker/generatedtypeset.hxx6
-rw-r--r--codemaker/inc/codemaker/global.hxx50
-rw-r--r--codemaker/inc/codemaker/options.hxx18
-rw-r--r--codemaker/inc/codemaker/typemanager.hxx24
-rw-r--r--codemaker/inc/codemaker/unotype.hxx13
-rw-r--r--codemaker/source/codemaker/codemaker.cxx14
-rw-r--r--codemaker/source/codemaker/dependencies.cxx14
-rw-r--r--codemaker/source/codemaker/exceptiontree.cxx12
-rw-r--r--codemaker/source/codemaker/global.cxx8
-rw-r--r--codemaker/source/codemaker/options.cxx1
-rw-r--r--codemaker/source/codemaker/typemanager.cxx10
-rw-r--r--codemaker/source/codemaker/unotype.cxx10
-rw-r--r--codemaker/source/commoncpp/commoncpp.cxx16
-rw-r--r--codemaker/source/commonjava/commonjava.cxx6
-rw-r--r--codemaker/source/cppumaker/cppumaker.cxx8
-rw-r--r--codemaker/source/cppumaker/cppuoptions.cxx3
-rw-r--r--codemaker/source/cppumaker/cppuoptions.hxx4
-rw-r--r--codemaker/source/cppumaker/cpputype.cxx395
-rw-r--r--codemaker/source/cppumaker/cpputype.hxx71
-rw-r--r--codemaker/source/cppumaker/dumputils.cxx8
-rw-r--r--codemaker/source/cppumaker/dumputils.hxx9
-rw-r--r--codemaker/source/cppumaker/includes.cxx16
-rw-r--r--codemaker/source/cppumaker/includes.hxx10
-rw-r--r--codemaker/source/javamaker/classfile.cxx90
-rw-r--r--codemaker/source/javamaker/classfile.hxx87
-rw-r--r--codemaker/source/javamaker/javamaker.cxx2
-rw-r--r--codemaker/source/javamaker/javaoptions.cxx3
-rw-r--r--codemaker/source/javamaker/javaoptions.hxx4
-rw-r--r--codemaker/source/javamaker/javatype.cxx296
-rw-r--r--codemaker/source/javamaker/javatype.hxx4
-rw-r--r--comphelper/inc/comphelper/ChainablePropertySet.hxx28
-rw-r--r--comphelper/inc/comphelper/ChainablePropertySetInfo.hxx6
-rw-r--r--comphelper/inc/comphelper/MasterPropertySet.hxx28
-rw-r--r--comphelper/inc/comphelper/MasterPropertySetInfo.hxx4
-rw-r--r--comphelper/inc/comphelper/PropertyInfoHash.hxx12
-rw-r--r--comphelper/inc/comphelper/SettingsHelper.hxx20
-rw-r--r--comphelper/inc/comphelper/accessiblecontexthelper.hxx4
-rw-r--r--comphelper/inc/comphelper/accessibletexthelper.hxx18
-rw-r--r--comphelper/inc/comphelper/accessiblewrapper.hxx4
-rw-r--r--comphelper/inc/comphelper/anycompare.hxx4
-rw-r--r--comphelper/inc/comphelper/anytostring.hxx2
-rw-r--r--comphelper/inc/comphelper/attributelist.hxx12
-rw-r--r--comphelper/inc/comphelper/basicio.hxx6
-rw-r--r--comphelper/inc/comphelper/componentcontext.hxx24
-rw-r--r--comphelper/inc/comphelper/componentguard.hxx2
-rw-r--r--comphelper/inc/comphelper/componentmodule.hxx32
-rw-r--r--comphelper/inc/comphelper/configuration.hxx22
-rw-r--r--comphelper/inc/comphelper/configurationhelper.hxx26
-rw-r--r--comphelper/inc/comphelper/container.hxx2
-rw-r--r--comphelper/inc/comphelper/docpasswordhelper.hxx22
-rw-r--r--comphelper/inc/comphelper/docpasswordrequest.hxx8
-rw-r--r--comphelper/inc/comphelper/documentconstants.hxx54
-rw-r--r--comphelper/inc/comphelper/documentinfo.hxx2
-rw-r--r--comphelper/inc/comphelper/embeddedobjectcontainer.hxx54
-rw-r--r--comphelper/inc/comphelper/enumhelper.hxx4
-rw-r--r--comphelper/inc/comphelper/evtmethodhelper.hxx2
-rw-r--r--comphelper/inc/comphelper/ihwrapnofilter.hxx10
-rw-r--r--comphelper/inc/comphelper/interaction.hxx8
-rw-r--r--comphelper/inc/comphelper/logging.hxx82
-rw-r--r--comphelper/inc/comphelper/mediadescriptor.hxx92
-rw-r--r--comphelper/inc/comphelper/mimeconfighelper.hxx40
-rw-r--r--comphelper/inc/comphelper/namedvaluecollection.hxx40
-rw-r--r--comphelper/inc/comphelper/numberedcollection.hxx6
-rw-r--r--comphelper/inc/comphelper/numbers.hxx2
-rw-r--r--comphelper/inc/comphelper/officeresourcebundle.hxx2
-rw-r--r--comphelper/inc/comphelper/ofopxmlhelper.hxx40
-rw-r--r--comphelper/inc/comphelper/propagg.hxx34
-rw-r--r--comphelper/inc/comphelper/property.hxx12
-rw-r--r--comphelper/inc/comphelper/propertybag.hxx8
-rw-r--r--comphelper/inc/comphelper/propertycontainerhelper.hxx12
-rw-r--r--comphelper/inc/comphelper/propertysethelper.hxx28
-rw-r--r--comphelper/inc/comphelper/propertysetinfo.hxx6
-rw-r--r--comphelper/inc/comphelper/propertystatecontainer.hxx10
-rw-r--r--comphelper/inc/comphelper/propmultiplex.hxx4
-rw-r--r--comphelper/inc/comphelper/propstate.hxx8
-rw-r--r--comphelper/inc/comphelper/sequence.hxx4
-rw-r--r--comphelper/inc/comphelper/sequenceashashmap.hxx10
-rw-r--r--comphelper/inc/comphelper/servicedecl.hxx12
-rw-r--r--comphelper/inc/comphelper/serviceinfohelper.hxx10
-rw-r--r--comphelper/inc/comphelper/stl_types.hxx36
-rw-r--r--comphelper/inc/comphelper/storagehelper.hxx38
-rw-r--r--comphelper/inc/comphelper/string.hxx88
-rw-r--r--comphelper/inc/comphelper/synchronousdispatch.hxx4
-rw-r--r--comphelper/inc/comphelper/types.hxx4
-rw-r--r--comphelper/inc/comphelper/unwrapargs.hxx2
-rw-r--r--comphelper/inc/comphelper/xmltools.hxx2
-rw-r--r--comphelper/qa/string/test_string.cxx104
-rw-r--r--comphelper/source/compare/AnyCompareFactory.cxx5
-rw-r--r--comphelper/source/container/IndexedPropertyValuesContainer.cxx18
-rw-r--r--comphelper/source/container/NamedPropertyValuesContainer.cxx44
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx120
-rw-r--r--comphelper/source/container/enumerablemap.cxx22
-rw-r--r--comphelper/source/container/enumhelper.cxx2
-rw-r--r--comphelper/source/container/namecontainer.cxx28
-rw-r--r--comphelper/source/eventattachermgr/eventattachermgr.cxx1
-rw-r--r--comphelper/source/misc/accessiblecontexthelper.cxx2
-rw-r--r--comphelper/source/misc/accessibletexthelper.cxx38
-rw-r--r--comphelper/source/misc/accessiblewrapper.cxx8
-rw-r--r--comphelper/source/misc/anytostring.cxx12
-rw-r--r--comphelper/source/misc/componentbase.cxx4
-rw-r--r--comphelper/source/misc/componentcontext.cxx6
-rw-r--r--comphelper/source/misc/componentmodule.cxx8
-rw-r--r--comphelper/source/misc/configuration.cxx24
-rw-r--r--comphelper/source/misc/configurationhelper.cxx30
-rw-r--r--comphelper/source/misc/docpasswordhelper.cxx21
-rw-r--r--comphelper/source/misc/docpasswordrequest.cxx1
-rw-r--r--comphelper/source/misc/documentinfo.cxx18
-rw-r--r--comphelper/source/misc/documentiologring.cxx18
-rw-r--r--comphelper/source/misc/documentiologring.hxx20
-rw-r--r--comphelper/source/misc/evtmethodhelper.cxx8
-rw-r--r--comphelper/source/misc/ihwrapnofilter.cxx8
-rw-r--r--comphelper/source/misc/instancelocker.cxx8
-rw-r--r--comphelper/source/misc/instancelocker.hxx10
-rw-r--r--comphelper/source/misc/interaction.cxx4
-rw-r--r--comphelper/source/misc/logging.cxx50
-rw-r--r--comphelper/source/misc/mediadescriptor.cxx86
-rw-r--r--comphelper/source/misc/mimeconfighelper.cxx94
-rw-r--r--comphelper/source/misc/namedvaluecollection.cxx18
-rw-r--r--comphelper/source/misc/numberedcollection.cxx8
-rw-r--r--comphelper/source/misc/numbers.cxx4
-rw-r--r--comphelper/source/misc/officeresourcebundle.cxx20
-rw-r--r--comphelper/source/misc/officerestartmanager.cxx14
-rw-r--r--comphelper/source/misc/officerestartmanager.hxx14
-rw-r--r--comphelper/source/misc/scopeguard.cxx2
-rw-r--r--comphelper/source/misc/sequence.cxx12
-rw-r--r--comphelper/source/misc/sequenceashashmap.cxx4
-rw-r--r--comphelper/source/misc/servicedecl.cxx32
-rw-r--r--comphelper/source/misc/serviceinfohelper.cxx20
-rw-r--r--comphelper/source/misc/storagehelper.cxx44
-rw-r--r--comphelper/source/misc/string.cxx62
-rw-r--r--comphelper/source/misc/synchronousdispatch.cxx4
-rw-r--r--comphelper/source/misc/types.cxx18
-rw-r--r--comphelper/source/officeinstdir/officeinstallationdirectories.cxx52
-rw-r--r--comphelper/source/officeinstdir/officeinstallationdirectories.hxx34
-rw-r--r--comphelper/source/property/ChainablePropertySet.cxx28
-rw-r--r--comphelper/source/property/ChainablePropertySetInfo.cxx7
-rw-r--r--comphelper/source/property/MasterPropertySet.cxx28
-rw-r--r--comphelper/source/property/MasterPropertySetInfo.cxx5
-rw-r--r--comphelper/source/property/TypeGeneration.cxx3
-rw-r--r--comphelper/source/property/genericpropertyset.cxx16
-rw-r--r--comphelper/source/property/opropertybag.cxx40
-rw-r--r--comphelper/source/property/opropertybag.hxx14
-rw-r--r--comphelper/source/property/propagg.cxx82
-rw-r--r--comphelper/source/property/property.cxx18
-rw-r--r--comphelper/source/property/propertybag.cxx12
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx16
-rw-r--r--comphelper/source/property/propertysethelper.cxx28
-rw-r--r--comphelper/source/property/propertysetinfo.cxx6
-rw-r--r--comphelper/source/property/propertystatecontainer.cxx24
-rw-r--r--comphelper/source/property/propmultiplex.cxx4
-rw-r--r--comphelper/source/property/propstate.cxx10
-rw-r--r--comphelper/source/streaming/basicio.cxx4
-rw-r--r--comphelper/source/streaming/memorystream.cxx11
-rw-r--r--comphelper/source/streaming/oslfile2streamwrap.cxx28
-rw-r--r--comphelper/source/streaming/seqinputstreamserv.cxx18
-rw-r--r--comphelper/source/streaming/seqoutputstreamserv.cxx18
-rw-r--r--comphelper/source/streaming/seqstream.cxx8
-rw-r--r--comphelper/source/xml/attributelist.cxx1
-rw-r--r--comphelper/source/xml/ofopxmlhelper.cxx46
-rw-r--r--comphelper/source/xml/xmltools.cxx4
-rw-r--r--configmgr/qa/unit/test.cxx184
-rw-r--r--configmgr/source/valueparser.cxx22
-rw-r--r--configmgr/source/valueparser.hxx2
-rw-r--r--configmgr/source/writemodfile.cxx12
-rw-r--r--configmgr/source/xcsparser.cxx4
-rw-r--r--configmgr/source/xcuparser.cxx10
-rw-r--r--connectivity/inc/connectivity/CommonTools.hxx44
-rw-r--r--connectivity/inc/connectivity/ConnectionWrapper.hxx6
-rw-r--r--connectivity/inc/connectivity/DriversConfig.hxx18
-rw-r--r--connectivity/inc/connectivity/FValue.hxx10
-rw-r--r--connectivity/inc/connectivity/IParseContext.hxx6
-rw-r--r--connectivity/inc/connectivity/PColumn.hxx34
-rw-r--r--connectivity/inc/connectivity/SQLStatementHelper.hxx2
-rw-r--r--connectivity/inc/connectivity/StdTypeDefs.hxx6
-rw-r--r--connectivity/inc/connectivity/TColumnsHelper.hxx6
-rw-r--r--connectivity/inc/connectivity/TIndex.hxx4
-rw-r--r--connectivity/inc/connectivity/TIndexColumns.hxx4
-rw-r--r--connectivity/inc/connectivity/TIndexes.hxx8
-rw-r--r--connectivity/inc/connectivity/TKey.hxx2
-rw-r--r--connectivity/inc/connectivity/TKeyColumns.hxx4
-rw-r--r--connectivity/inc/connectivity/TKeys.hxx8
-rw-r--r--connectivity/inc/connectivity/TTableHelper.hxx42
-rw-r--r--connectivity/inc/connectivity/dbcharset.hxx8
-rw-r--r--connectivity/inc/connectivity/dbconversion.hxx28
-rw-r--r--connectivity/inc/connectivity/dbexception.hxx16
-rw-r--r--connectivity/inc/connectivity/dbmetadata.hxx4
-rw-r--r--connectivity/inc/connectivity/dbtools.hxx102
-rw-r--r--connectivity/inc/connectivity/filtermanager.hxx12
-rw-r--r--connectivity/inc/connectivity/formattedcolumnvalue.hxx4
-rw-r--r--connectivity/inc/connectivity/parameters.hxx24
-rw-r--r--connectivity/inc/connectivity/paramwrapper.hxx2
-rw-r--r--connectivity/inc/connectivity/predicateinput.hxx24
-rw-r--r--connectivity/inc/connectivity/sdbcx/VCatalog.hxx2
-rw-r--r--connectivity/inc/connectivity/sdbcx/VCollection.hxx42
-rw-r--r--connectivity/inc/connectivity/sdbcx/VColumn.hxx30
-rw-r--r--connectivity/inc/connectivity/sdbcx/VDescriptor.hxx4
-rw-r--r--connectivity/inc/connectivity/sdbcx/VGroup.hxx14
-rw-r--r--connectivity/inc/connectivity/sdbcx/VIndex.hxx10
-rw-r--r--connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx12
-rw-r--r--connectivity/inc/connectivity/sdbcx/VKey.hxx16
-rw-r--r--connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx16
-rw-r--r--connectivity/inc/connectivity/sdbcx/VTable.hxx26
-rw-r--r--connectivity/inc/connectivity/sdbcx/VUser.hxx16
-rw-r--r--connectivity/inc/connectivity/sdbcx/VView.hxx18
-rw-r--r--connectivity/inc/connectivity/sqlerror.hxx10
-rw-r--r--connectivity/inc/connectivity/sqliterator.hxx48
-rw-r--r--connectivity/inc/connectivity/sqlnode.hxx56
-rw-r--r--connectivity/inc/connectivity/sqlparse.hxx32
-rw-r--r--connectivity/inc/connectivity/statementcomposer.hxx8
-rw-r--r--connectivity/inc/connectivity/virtualdbtools.hxx46
-rw-r--r--connectivity/inc/connectivity/warningscontainer.hxx2
-rw-r--r--connectivity/source/commontools/AutoRetrievingBase.cxx12
-rw-r--r--connectivity/source/commontools/CommonTools.cxx30
-rw-r--r--connectivity/source/commontools/ConnectionWrapper.cxx28
-rw-r--r--connectivity/source/commontools/DateConversion.cxx38
-rw-r--r--connectivity/source/commontools/DriversConfig.cxx62
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx41
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx26
-rw-r--r--connectivity/source/commontools/FValue.cxx60
-rw-r--r--connectivity/source/commontools/ParamterSubstitution.cxx30
-rw-r--r--connectivity/source/commontools/RowFunctionParser.cxx10
-rw-r--r--connectivity/source/commontools/TColumnsHelper.cxx22
-rw-r--r--connectivity/source/commontools/TConnection.cxx2
-rw-r--r--connectivity/source/commontools/TDatabaseMetaDataBase.cxx48
-rw-r--r--connectivity/source/commontools/TIndex.cxx12
-rw-r--r--connectivity/source/commontools/TIndexColumns.cxx12
-rw-r--r--connectivity/source/commontools/TIndexes.cxx34
-rw-r--r--connectivity/source/commontools/TKey.cxx8
-rw-r--r--connectivity/source/commontools/TKeyColumns.cxx14
-rw-r--r--connectivity/source/commontools/TKeys.cxx32
-rw-r--r--connectivity/source/commontools/TPrivilegesResultSet.cxx10
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx96
-rw-r--r--connectivity/source/commontools/conncleanup.cxx4
-rw-r--r--connectivity/source/commontools/dbcharset.cxx10
-rw-r--r--connectivity/source/commontools/dbconversion.cxx22
-rw-r--r--connectivity/source/commontools/dbexception.cxx34
-rw-r--r--connectivity/source/commontools/dbmetadata.cxx26
-rw-r--r--connectivity/source/commontools/dbtools.cxx260
-rw-r--r--connectivity/source/commontools/dbtools2.cxx216
-rw-r--r--connectivity/source/commontools/filtermanager.cxx12
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx12
-rw-r--r--connectivity/source/commontools/parameters.cxx64
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx18
-rw-r--r--connectivity/source/commontools/predicateinput.cxx78
-rw-r--r--connectivity/source/commontools/propertyids.cxx6
-rw-r--r--connectivity/source/commontools/sqlerror.cxx38
-rw-r--r--connectivity/source/commontools/statementcomposer.cxx40
-rw-r--r--connectivity/source/commontools/warningscontainer.cxx4
-rw-r--r--connectivity/source/cpool/ZConnectionPool.cxx8
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx4
-rw-r--r--connectivity/source/cpool/ZConnectionWrapper.cxx10
-rw-r--r--connectivity/source/cpool/ZConnectionWrapper.hxx10
-rw-r--r--connectivity/source/cpool/ZDriverWrapper.cxx6
-rw-r--r--connectivity/source/cpool/ZDriverWrapper.hxx6
-rw-r--r--connectivity/source/cpool/ZPoolCollection.cxx82
-rw-r--r--connectivity/source/cpool/ZPoolCollection.hxx32
-rw-r--r--connectivity/source/drivers/ado/ACallableStatement.cxx6
-rw-r--r--connectivity/source/drivers/ado/ACatalog.cxx2
-rw-r--r--connectivity/source/drivers/ado/AColumn.cxx26
-rw-r--r--connectivity/source/drivers/ado/AColumns.cxx10
-rw-r--r--connectivity/source/drivers/ado/AConnection.cxx38
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaData.cxx232
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx78
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx48
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx8
-rw-r--r--connectivity/source/drivers/ado/ADriver.cxx62
-rw-r--r--connectivity/source/drivers/ado/AGroup.cxx12
-rw-r--r--connectivity/source/drivers/ado/AGroups.cxx6
-rw-r--r--connectivity/source/drivers/ado/AIndex.cxx6
-rw-r--r--connectivity/source/drivers/ado/AIndexes.cxx6
-rw-r--r--connectivity/source/drivers/ado/AKey.cxx4
-rw-r--r--connectivity/source/drivers/ado/AKeys.cxx10
-rw-r--r--connectivity/source/drivers/ado/APreparedStatement.cxx32
-rw-r--r--connectivity/source/drivers/ado/AResultSet.cxx34
-rw-r--r--connectivity/source/drivers/ado/AResultSetMetaData.cxx36
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx20
-rw-r--r--connectivity/source/drivers/ado/ATable.cxx8
-rw-r--r--connectivity/source/drivers/ado/ATables.cxx8
-rw-r--r--connectivity/source/drivers/ado/AUser.cxx18
-rw-r--r--connectivity/source/drivers/ado/AUsers.cxx6
-rw-r--r--connectivity/source/drivers/ado/AView.cxx2
-rw-r--r--connectivity/source/drivers/ado/AViews.cxx8
-rw-r--r--connectivity/source/drivers/ado/Aolevariant.cxx25
-rw-r--r--connectivity/source/drivers/ado/Aservices.cxx1
-rw-r--r--connectivity/source/drivers/ado/Awrapado.cxx138
-rw-r--r--connectivity/source/drivers/ado/adoimp.cxx2
-rw-r--r--connectivity/source/drivers/calc/CCatalog.cxx4
-rw-r--r--connectivity/source/drivers/calc/CColumns.cxx2
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx20
-rw-r--r--connectivity/source/drivers/calc/CDatabaseMetaData.cxx66
-rw-r--r--connectivity/source/drivers/calc/CDriver.cxx14
-rw-r--r--connectivity/source/drivers/calc/CResultSet.cxx20
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx52
-rw-r--r--connectivity/source/drivers/calc/CTables.cxx4
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx1
-rw-r--r--connectivity/source/drivers/dbase/DCatalog.cxx4
-rw-r--r--connectivity/source/drivers/dbase/DCode.cxx8
-rw-r--r--connectivity/source/drivers/dbase/DColumns.cxx6
-rw-r--r--connectivity/source/drivers/dbase/DConnection.cxx6
-rw-r--r--connectivity/source/drivers/dbase/DDatabaseMetaData.cxx90
-rw-r--r--connectivity/source/drivers/dbase/DDriver.cxx40
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx56
-rw-r--r--connectivity/source/drivers/dbase/DIndexColumns.cxx6
-rw-r--r--connectivity/source/drivers/dbase/DIndexes.cxx14
-rw-r--r--connectivity/source/drivers/dbase/DResultSet.cxx22
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx140
-rw-r--r--connectivity/source/drivers/dbase/DTables.cxx10
-rw-r--r--connectivity/source/drivers/dbase/Dservices.cxx1
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx12
-rw-r--r--connectivity/source/drivers/evoab2/EApi.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NCatalog.cxx8
-rw-r--r--connectivity/source/drivers/evoab2/NColumns.cxx8
-rw-r--r--connectivity/source/drivers/evoab2/NColumns.hxx2
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx36
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.hxx18
-rw-r--r--connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx126
-rw-r--r--connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx50
-rw-r--r--connectivity/source/drivers/evoab2/NDriver.cxx32
-rw-r--r--connectivity/source/drivers/evoab2/NDriver.hxx18
-rw-r--r--connectivity/source/drivers/evoab2/NPreparedStatement.cxx10
-rw-r--r--connectivity/source/drivers/evoab2/NPreparedStatement.hxx8
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.cxx36
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.hxx4
-rw-r--r--connectivity/source/drivers/evoab2/NResultSetMetaData.cxx34
-rw-r--r--connectivity/source/drivers/evoab2/NResultSetMetaData.hxx18
-rw-r--r--connectivity/source/drivers/evoab2/NServices.cxx1
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.cxx50
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.hxx24
-rw-r--r--connectivity/source/drivers/evoab2/NTable.cxx12
-rw-r--r--connectivity/source/drivers/evoab2/NTable.hxx16
-rw-r--r--connectivity/source/drivers/evoab2/NTables.cxx10
-rw-r--r--connectivity/source/drivers/evoab2/NTables.hxx2
-rw-r--r--connectivity/source/drivers/file/FCatalog.cxx6
-rw-r--r--connectivity/source/drivers/file/FColumns.cxx8
-rw-r--r--connectivity/source/drivers/file/FConnection.cxx35
-rw-r--r--connectivity/source/drivers/file/FDatabaseMetaData.cxx108
-rw-r--r--connectivity/source/drivers/file/FDateFunctions.cxx42
-rw-r--r--connectivity/source/drivers/file/FDriver.cxx84
-rw-r--r--connectivity/source/drivers/file/FPreparedStatement.cxx26
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx24
-rw-r--r--connectivity/source/drivers/file/FResultSetMetaData.cxx22
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx22
-rw-r--r--connectivity/source/drivers/file/FStringFunctions.cxx36
-rw-r--r--connectivity/source/drivers/file/FTable.cxx12
-rw-r--r--connectivity/source/drivers/file/FTables.cxx2
-rw-r--r--connectivity/source/drivers/file/fanalyzer.cxx2
-rw-r--r--connectivity/source/drivers/file/fcode.cxx4
-rw-r--r--connectivity/source/drivers/file/fcomp.cxx10
-rw-r--r--connectivity/source/drivers/file/quotedstring.cxx2
-rw-r--r--connectivity/source/drivers/flat/ECatalog.cxx4
-rw-r--r--connectivity/source/drivers/flat/EColumns.cxx2
-rw-r--r--connectivity/source/drivers/flat/EConnection.cxx14
-rw-r--r--connectivity/source/drivers/flat/EDatabaseMetaData.cxx46
-rw-r--r--connectivity/source/drivers/flat/EDriver.cxx52
-rw-r--r--connectivity/source/drivers/flat/EResultSet.cxx20
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx38
-rw-r--r--connectivity/source/drivers/flat/ETables.cxx4
-rw-r--r--connectivity/source/drivers/flat/Eservices.cxx1
-rw-r--r--connectivity/source/drivers/hsqldb/HCatalog.cxx18
-rw-r--r--connectivity/source/drivers/hsqldb/HColumns.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HConnection.cxx28
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx152
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageAccess.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx42
-rw-r--r--connectivity/source/drivers/hsqldb/HTable.cxx84
-rw-r--r--connectivity/source/drivers/hsqldb/HTables.cxx34
-rw-r--r--connectivity/source/drivers/hsqldb/HTools.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HUser.cxx104
-rw-r--r--connectivity/source/drivers/hsqldb/HUsers.cxx24
-rw-r--r--connectivity/source/drivers/hsqldb/HView.cxx20
-rw-r--r--connectivity/source/drivers/hsqldb/HViews.cxx20
-rw-r--r--connectivity/source/drivers/hsqldb/Hservices.cxx1
-rw-r--r--connectivity/source/drivers/hsqldb/StorageFileAccess.cxx18
-rw-r--r--connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.cxx6
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.hxx16
-rw-r--r--connectivity/source/drivers/jdbc/Array.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/CallableStatement.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/Class.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Clob.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/ConnectionLog.cxx12
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx110
-rw-r--r--connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx18
-rw-r--r--connectivity/source/drivers/jdbc/InputStream.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/JBigDecimal.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/JConnection.cxx58
-rw-r--r--connectivity/source/drivers/jdbc/JDriver.cxx128
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx18
-rw-r--r--connectivity/source/drivers/jdbc/Object.cxx14
-rw-r--r--connectivity/source/drivers/jdbc/PreparedStatement.cxx12
-rw-r--r--connectivity/source/drivers/jdbc/Ref.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx16
-rw-r--r--connectivity/source/drivers/jdbc/ResultSetMetaData.cxx14
-rw-r--r--connectivity/source/drivers/jdbc/SQLException.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/String.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Throwable.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/Timestamp.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/jservices.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/tools.cxx16
-rw-r--r--connectivity/source/drivers/kab/KCatalog.cxx10
-rw-r--r--connectivity/source/drivers/kab/KColumns.cxx8
-rw-r--r--connectivity/source/drivers/kab/KColumns.hxx2
-rw-r--r--connectivity/source/drivers/kab/KConnection.cxx14
-rw-r--r--connectivity/source/drivers/kab/KConnection.hxx12
-rw-r--r--connectivity/source/drivers/kab/KDatabaseMetaData.cxx144
-rw-r--r--connectivity/source/drivers/kab/KDatabaseMetaData.hxx66
-rw-r--r--connectivity/source/drivers/kab/KDriver.cxx64
-rw-r--r--connectivity/source/drivers/kab/KDriver.hxx20
-rw-r--r--connectivity/source/drivers/kab/KPreparedStatement.cxx12
-rw-r--r--connectivity/source/drivers/kab/KPreparedStatement.hxx10
-rw-r--r--connectivity/source/drivers/kab/KResultSet.cxx26
-rw-r--r--connectivity/source/drivers/kab/KResultSet.hxx6
-rw-r--r--connectivity/source/drivers/kab/KResultSetMetaData.cxx30
-rw-r--r--connectivity/source/drivers/kab/KResultSetMetaData.hxx14
-rw-r--r--connectivity/source/drivers/kab/KServices.cxx1
-rw-r--r--connectivity/source/drivers/kab/KStatement.cxx28
-rw-r--r--connectivity/source/drivers/kab/KStatement.hxx10
-rw-r--r--connectivity/source/drivers/kab/KTable.cxx12
-rw-r--r--connectivity/source/drivers/kab/KTable.hxx16
-rw-r--r--connectivity/source/drivers/kab/KTables.cxx12
-rw-r--r--connectivity/source/drivers/kab/KTables.hxx2
-rw-r--r--connectivity/source/drivers/kab/kcondition.cxx20
-rw-r--r--connectivity/source/drivers/kab/kcondition.hxx24
-rw-r--r--connectivity/source/drivers/kab/kfields.cxx10
-rw-r--r--connectivity/source/drivers/kab/kfields.hxx2
-rw-r--r--connectivity/source/drivers/kab/korder.cxx2
-rw-r--r--connectivity/source/drivers/kab/korder.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabAddressBook.cxx22
-rw-r--r--connectivity/source/drivers/macab/MacabAddressBook.hxx10
-rw-r--r--connectivity/source/drivers/macab/MacabCatalog.cxx16
-rw-r--r--connectivity/source/drivers/macab/MacabCatalog.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabColumns.cxx8
-rw-r--r--connectivity/source/drivers/macab/MacabColumns.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabConnection.cxx14
-rw-r--r--connectivity/source/drivers/macab/MacabConnection.hxx12
-rw-r--r--connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx150
-rw-r--r--connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx64
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.cxx44
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.hxx20
-rw-r--r--connectivity/source/drivers/macab/MacabHeader.cxx8
-rw-r--r--connectivity/source/drivers/macab/MacabHeader.hxx4
-rw-r--r--connectivity/source/drivers/macab/MacabPreparedStatement.cxx18
-rw-r--r--connectivity/source/drivers/macab/MacabPreparedStatement.hxx10
-rw-r--r--connectivity/source/drivers/macab/MacabRecord.cxx12
-rw-r--r--connectivity/source/drivers/macab/MacabRecord.hxx4
-rw-r--r--connectivity/source/drivers/macab/MacabRecords.cxx66
-rw-r--r--connectivity/source/drivers/macab/MacabRecords.hxx14
-rw-r--r--connectivity/source/drivers/macab/MacabResultSet.cxx28
-rw-r--r--connectivity/source/drivers/macab/MacabResultSet.hxx10
-rw-r--r--connectivity/source/drivers/macab/MacabResultSetMetaData.cxx32
-rw-r--r--connectivity/source/drivers/macab/MacabResultSetMetaData.hxx18
-rw-r--r--connectivity/source/drivers/macab/MacabServices.cxx1
-rw-r--r--connectivity/source/drivers/macab/MacabStatement.cxx38
-rw-r--r--connectivity/source/drivers/macab/MacabStatement.hxx12
-rw-r--r--connectivity/source/drivers/macab/MacabTable.cxx12
-rw-r--r--connectivity/source/drivers/macab/MacabTable.hxx16
-rw-r--r--connectivity/source/drivers/macab/MacabTables.cxx12
-rw-r--r--connectivity/source/drivers/macab/MacabTables.hxx2
-rw-r--r--connectivity/source/drivers/macab/macabcondition.cxx16
-rw-r--r--connectivity/source/drivers/macab/macabcondition.hxx24
-rw-r--r--connectivity/source/drivers/macab/macaborder.cxx2
-rw-r--r--connectivity/source/drivers/macab/macaborder.hxx2
-rw-r--r--connectivity/source/drivers/macab/macabutilities.hxx10
-rw-r--r--connectivity/source/drivers/mork/MCatalog.cxx8
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.cxx6
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.hxx8
-rw-r--r--connectivity/source/drivers/mork/MColumns.cxx10
-rw-r--r--connectivity/source/drivers/mork/MColumns.hxx2
-rw-r--r--connectivity/source/drivers/mork/MConnection.cxx24
-rw-r--r--connectivity/source/drivers/mork/MConnection.hxx14
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx126
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.hxx46
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx8
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx4
-rw-r--r--connectivity/source/drivers/mork/MDriver.cxx28
-rw-r--r--connectivity/source/drivers/mork/MDriver.hxx16
-rw-r--r--connectivity/source/drivers/mork/MErrorResource.hxx6
-rw-r--r--connectivity/source/drivers/mork/MNSFolders.cxx24
-rw-r--r--connectivity/source/drivers/mork/MNSFolders.hxx2
-rw-r--r--connectivity/source/drivers/mork/MNSINIParser.hxx11
-rw-r--r--connectivity/source/drivers/mork/MNSProfileDiscover.cxx30
-rw-r--r--connectivity/source/drivers/mork/MNSProfileDiscover.hxx22
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.cxx26
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.hxx10
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.cxx20
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.hxx30
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx92
-rw-r--r--connectivity/source/drivers/mork/MResultSet.hxx12
-rw-r--r--connectivity/source/drivers/mork/MResultSetMetaData.cxx22
-rw-r--r--connectivity/source/drivers/mork/MResultSetMetaData.hxx18
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx26
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx10
-rw-r--r--connectivity/source/drivers/mork/MTable.cxx2
-rw-r--r--connectivity/source/drivers/mork/MTable.hxx10
-rw-r--r--connectivity/source/drivers/mork/MTables.cxx10
-rw-r--r--connectivity/source/drivers/mork/MTables.hxx2
-rw-r--r--connectivity/source/drivers/mork/mork_helper.cxx8
-rw-r--r--connectivity/source/drivers/mozab/MCatalog.cxx8
-rw-r--r--connectivity/source/drivers/mozab/MColumnAlias.cxx22
-rw-r--r--connectivity/source/drivers/mozab/MColumnAlias.hxx10
-rw-r--r--connectivity/source/drivers/mozab/MColumns.cxx10
-rw-r--r--connectivity/source/drivers/mozab/MColumns.hxx2
-rw-r--r--connectivity/source/drivers/mozab/MConfigAccess.cxx46
-rw-r--r--connectivity/source/drivers/mozab/MConnection.cxx60
-rw-r--r--connectivity/source/drivers/mozab/MConnection.hxx38
-rw-r--r--connectivity/source/drivers/mozab/MDatabaseMetaData.cxx126
-rw-r--r--connectivity/source/drivers/mozab/MDatabaseMetaData.hxx46
-rw-r--r--connectivity/source/drivers/mozab/MDriver.cxx66
-rw-r--r--connectivity/source/drivers/mozab/MDriver.hxx18
-rw-r--r--connectivity/source/drivers/mozab/MPreparedStatement.cxx26
-rw-r--r--connectivity/source/drivers/mozab/MPreparedStatement.hxx10
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.cxx102
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.hxx12
-rw-r--r--connectivity/source/drivers/mozab/MResultSetMetaData.cxx24
-rw-r--r--connectivity/source/drivers/mozab/MResultSetMetaData.hxx18
-rw-r--r--connectivity/source/drivers/mozab/MServices.cxx9
-rw-r--r--connectivity/source/drivers/mozab/MStatement.cxx26
-rw-r--r--connectivity/source/drivers/mozab/MStatement.hxx10
-rw-r--r--connectivity/source/drivers/mozab/MTable.cxx2
-rw-r--r--connectivity/source/drivers/mozab/MTable.hxx10
-rw-r--r--connectivity/source/drivers/mozab/MTables.cxx10
-rw-r--r--connectivity/source/drivers/mozab/MTables.hxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx54
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx26
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx24
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx11
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx4
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx9
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx44
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx28
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx18
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx6
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx74
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx16
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx6
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx22
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx18
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx6
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx14
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx10
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx18
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx26
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx8
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx8
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx24
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx14
-rw-r--r--connectivity/source/drivers/mysql/YCatalog.cxx20
-rw-r--r--connectivity/source/drivers/mysql/YColumns.cxx8
-rw-r--r--connectivity/source/drivers/mysql/YDriver.cxx122
-rw-r--r--connectivity/source/drivers/mysql/YTable.cxx88
-rw-r--r--connectivity/source/drivers/mysql/YTables.cxx48
-rw-r--r--connectivity/source/drivers/mysql/YUser.cxx104
-rw-r--r--connectivity/source/drivers/mysql/YUsers.cxx24
-rw-r--r--connectivity/source/drivers/mysql/YViews.cxx22
-rw-r--r--connectivity/source/drivers/mysql/Yservices.cxx1
-rw-r--r--connectivity/source/drivers/odbc/OFunctions.cxx118
-rw-r--r--connectivity/source/drivers/odbc/ORealDriver.cxx6
-rw-r--r--connectivity/source/drivers/odbc/oservices.cxx1
-rw-r--r--connectivity/source/drivers/odbcbase/OConnection.cxx42
-rw-r--r--connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx150
-rw-r--r--connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx196
-rw-r--r--connectivity/source/drivers/odbcbase/ODriver.cxx100
-rw-r--r--connectivity/source/drivers/odbcbase/OPreparedStatement.cxx32
-rw-r--r--connectivity/source/drivers/odbcbase/OResultSet.cxx54
-rw-r--r--connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx24
-rw-r--r--connectivity/source/drivers/odbcbase/OStatement.cxx36
-rw-r--r--connectivity/source/drivers/odbcbase/OTools.cxx30
-rw-r--r--connectivity/source/drivers/postgresql/pq_array.cxx7
-rw-r--r--connectivity/source/drivers/postgresql/pq_array.hxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_baseresultset.cxx6
-rw-r--r--connectivity/source/drivers/postgresql/pq_baseresultset.hxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx23
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.hxx22
-rw-r--r--connectivity/source/drivers/postgresql/pq_databasemetadata.cxx17
-rw-r--r--connectivity/source/drivers/postgresql/pq_databasemetadata.hxx70
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.cxx10
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.hxx14
-rw-r--r--connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx9
-rw-r--r--connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx10
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.cxx20
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.hxx16
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultset.cxx10
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultset.hxx10
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx35
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx30
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx3
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx6
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx16
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.cxx59
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.hxx22
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.cxx15
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.hxx208
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.cxx162
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.hxx90
-rw-r--r--connectivity/source/drivers/postgresql/pq_updateableresultset.cxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_updateableresultset.hxx24
-rw-r--r--connectivity/source/drivers/postgresql/pq_xbase.cxx28
-rw-r--r--connectivity/source/drivers/postgresql/pq_xbase.hxx20
-rw-r--r--connectivity/source/drivers/postgresql/pq_xcolumns.cxx35
-rw-r--r--connectivity/source/drivers/postgresql/pq_xcolumns.hxx20
-rw-r--r--connectivity/source/drivers/postgresql/pq_xcontainer.cxx23
-rw-r--r--connectivity/source/drivers/postgresql/pq_xcontainer.hxx24
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindex.cxx6
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindex.hxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx25
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx26
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindexes.cxx13
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindexes.hxx12
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkey.cxx6
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkey.hxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx21
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx24
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkeys.cxx15
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkeys.hxx12
-rw-r--r--connectivity/source/drivers/postgresql/pq_xtable.cxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_xtable.hxx10
-rw-r--r--connectivity/source/drivers/postgresql/pq_xtables.hxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_xuser.cxx14
-rw-r--r--connectivity/source/drivers/postgresql/pq_xuser.hxx10
-rw-r--r--connectivity/source/drivers/postgresql/pq_xusers.cxx5
-rw-r--r--connectivity/source/drivers/postgresql/pq_xusers.hxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_xview.cxx14
-rw-r--r--connectivity/source/drivers/postgresql/pq_xview.hxx6
-rw-r--r--connectivity/source/drivers/postgresql/pq_xviews.cxx7
-rw-r--r--connectivity/source/drivers/postgresql/pq_xviews.hxx2
-rw-r--r--connectivity/source/inc/AutoRetrievingBase.hxx8
-rw-r--r--connectivity/source/inc/FDatabaseMetaDataResultSet.hxx14
-rw-r--r--connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx14
-rw-r--r--connectivity/source/inc/OColumn.hxx38
-rw-r--r--connectivity/source/inc/OTypeInfo.hxx12
-rw-r--r--connectivity/source/inc/ParameterSubstitution.hxx16
-rw-r--r--connectivity/source/inc/RowFunctionParser.hxx2
-rw-r--r--connectivity/source/inc/TConnection.hxx6
-rw-r--r--connectivity/source/inc/TDatabaseMetaDataBase.hxx34
-rw-r--r--connectivity/source/inc/TKeyValue.hxx2
-rw-r--r--connectivity/source/inc/TPrivilegesResultSet.hxx2
-rw-r--r--connectivity/source/inc/ado/ACallableStatement.hxx6
-rw-r--r--connectivity/source/inc/ado/AColumn.hxx2
-rw-r--r--connectivity/source/inc/ado/AColumns.hxx6
-rw-r--r--connectivity/source/inc/ado/AConnection.hxx16
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaData.hxx70
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx14
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx14
-rw-r--r--connectivity/source/inc/ado/ADriver.hxx20
-rw-r--r--connectivity/source/inc/ado/AGroup.hxx10
-rw-r--r--connectivity/source/inc/ado/AGroups.hxx6
-rw-r--r--connectivity/source/inc/ado/AIndexes.hxx6
-rw-r--r--connectivity/source/inc/ado/AKeys.hxx6
-rw-r--r--connectivity/source/inc/ado/APreparedStatement.hxx8
-rw-r--r--connectivity/source/inc/ado/AResultSet.hxx14
-rw-r--r--connectivity/source/inc/ado/AResultSetMetaData.hxx14
-rw-r--r--connectivity/source/inc/ado/AStatement.hxx14
-rw-r--r--connectivity/source/inc/ado/ATable.hxx8
-rw-r--r--connectivity/source/inc/ado/ATables.hxx8
-rw-r--r--connectivity/source/inc/ado/AUser.hxx18
-rw-r--r--connectivity/source/inc/ado/AUsers.hxx6
-rw-r--r--connectivity/source/inc/ado/AViews.hxx6
-rw-r--r--connectivity/source/inc/ado/Aolevariant.hxx14
-rw-r--r--connectivity/source/inc/ado/Aolewrap.hxx8
-rw-r--r--connectivity/source/inc/ado/Awrapado.hxx88
-rw-r--r--connectivity/source/inc/ado/Awrapadox.hxx12
-rw-r--r--connectivity/source/inc/ado/WrapCatalog.hxx2
-rw-r--r--connectivity/source/inc/ado/WrapColumn.hxx8
-rw-r--r--connectivity/source/inc/ado/WrapIndex.hxx4
-rw-r--r--connectivity/source/inc/ado/WrapKey.hxx8
-rw-r--r--connectivity/source/inc/ado/WrapTable.hxx6
-rw-r--r--connectivity/source/inc/calc/CColumns.hxx2
-rw-r--r--connectivity/source/inc/calc/CConnection.hxx8
-rw-r--r--connectivity/source/inc/calc/CDatabaseMetaData.hxx6
-rw-r--r--connectivity/source/inc/calc/CDriver.hxx10
-rw-r--r--connectivity/source/inc/calc/CTable.hxx12
-rw-r--r--connectivity/source/inc/calc/CTables.hxx2
-rw-r--r--connectivity/source/inc/dbase/DColumns.hxx6
-rw-r--r--connectivity/source/inc/dbase/DConnection.hxx4
-rw-r--r--connectivity/source/inc/dbase/DDatabaseMetaData.hxx6
-rw-r--r--connectivity/source/inc/dbase/DDriver.hxx12
-rw-r--r--connectivity/source/inc/dbase/DIndex.hxx6
-rw-r--r--connectivity/source/inc/dbase/DIndexColumns.hxx4
-rw-r--r--connectivity/source/inc/dbase/DIndexes.hxx6
-rw-r--r--connectivity/source/inc/dbase/DTable.hxx24
-rw-r--r--connectivity/source/inc/dbase/DTables.hxx6
-rw-r--r--connectivity/source/inc/dbase/dindexnode.hxx4
-rw-r--r--connectivity/source/inc/file/FCatalog.hxx2
-rw-r--r--connectivity/source/inc/file/FColumns.hxx2
-rw-r--r--connectivity/source/inc/file/FConnection.hxx14
-rw-r--r--connectivity/source/inc/file/FDatabaseMetaData.hxx44
-rw-r--r--connectivity/source/inc/file/FDriver.hxx18
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx8
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx8
-rw-r--r--connectivity/source/inc/file/FResultSetMetaData.hxx18
-rw-r--r--connectivity/source/inc/file/FStatement.hxx10
-rw-r--r--connectivity/source/inc/file/FTable.hxx14
-rw-r--r--connectivity/source/inc/file/FTables.hxx2
-rw-r--r--connectivity/source/inc/file/fcode.hxx2
-rw-r--r--connectivity/source/inc/flat/EColumns.hxx2
-rw-r--r--connectivity/source/inc/flat/EConnection.hxx6
-rw-r--r--connectivity/source/inc/flat/EDatabaseMetaData.hxx4
-rw-r--r--connectivity/source/inc/flat/EDriver.hxx12
-rw-r--r--connectivity/source/inc/flat/ETable.hxx12
-rw-r--r--connectivity/source/inc/flat/ETables.hxx2
-rw-r--r--connectivity/source/inc/hsqldb/HCatalog.hxx2
-rw-r--r--connectivity/source/inc/hsqldb/HColumns.hxx4
-rw-r--r--connectivity/source/inc/hsqldb/HConnection.hxx8
-rw-r--r--connectivity/source/inc/hsqldb/HDriver.hxx14
-rw-r--r--connectivity/source/inc/hsqldb/HStorageMap.hxx16
-rw-r--r--connectivity/source/inc/hsqldb/HTable.hxx26
-rw-r--r--connectivity/source/inc/hsqldb/HTables.hxx16
-rw-r--r--connectivity/source/inc/hsqldb/HTools.hxx4
-rw-r--r--connectivity/source/inc/hsqldb/HUser.hxx18
-rw-r--r--connectivity/source/inc/hsqldb/HUsers.hxx6
-rw-r--r--connectivity/source/inc/hsqldb/HView.hxx8
-rw-r--r--connectivity/source/inc/hsqldb/HViews.hxx8
-rw-r--r--connectivity/source/inc/internalnode.hxx4
-rw-r--r--connectivity/source/inc/java/lang/Class.hxx2
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx10
-rw-r--r--connectivity/source/inc/java/lang/String.hxx2
-rw-r--r--connectivity/source/inc/java/lang/Throwable.hxx4
-rw-r--r--connectivity/source/inc/java/math/BigDecimal.hxx2
-rw-r--r--connectivity/source/inc/java/sql/Array.hxx2
-rw-r--r--connectivity/source/inc/java/sql/CallableStatement.hxx6
-rw-r--r--connectivity/source/inc/java/sql/Clob.hxx4
-rw-r--r--connectivity/source/inc/java/sql/Connection.hxx20
-rw-r--r--connectivity/source/inc/java/sql/ConnectionLog.hxx6
-rw-r--r--connectivity/source/inc/java/sql/DatabaseMetaData.hxx70
-rw-r--r--connectivity/source/inc/java/sql/Driver.hxx16
-rw-r--r--connectivity/source/inc/java/sql/DriverPropertyInfo.hxx8
-rw-r--r--connectivity/source/inc/java/sql/JStatement.hxx14
-rw-r--r--connectivity/source/inc/java/sql/PreparedStatement.hxx6
-rw-r--r--connectivity/source/inc/java/sql/Ref.hxx2
-rw-r--r--connectivity/source/inc/java/sql/ResultSet.hxx8
-rw-r--r--connectivity/source/inc/java/sql/ResultSetMetaData.hxx14
-rw-r--r--connectivity/source/inc/java/sql/SQLException.hxx2
-rw-r--r--connectivity/source/inc/java/tools.hxx4
-rw-r--r--connectivity/source/inc/java/util/Property.hxx2
-rw-r--r--connectivity/source/inc/mysql/YCatalog.hxx2
-rw-r--r--connectivity/source/inc/mysql/YColumns.hxx4
-rw-r--r--connectivity/source/inc/mysql/YDriver.hxx16
-rw-r--r--connectivity/source/inc/mysql/YTable.hxx28
-rw-r--r--connectivity/source/inc/mysql/YTables.hxx20
-rw-r--r--connectivity/source/inc/mysql/YUser.hxx18
-rw-r--r--connectivity/source/inc/mysql/YUsers.hxx6
-rw-r--r--connectivity/source/inc/mysql/YViews.hxx8
-rw-r--r--connectivity/source/inc/odbc/OConnection.hxx18
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaData.hxx66
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx56
-rw-r--r--connectivity/source/inc/odbc/ODriver.hxx18
-rw-r--r--connectivity/source/inc/odbc/OFunctions.hxx4
-rw-r--r--connectivity/source/inc/odbc/OPreparedStatement.hxx8
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx10
-rw-r--r--connectivity/source/inc/odbc/OResultSetMetaData.hxx16
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx18
-rw-r--r--connectivity/source/inc/odbc/OTools.hxx4
-rw-r--r--connectivity/source/inc/parse/sqlbison_exports.hxx2
-rw-r--r--connectivity/source/inc/propertyids.hxx6
-rw-r--r--connectivity/source/inc/resource/sharedresources.hxx24
-rw-r--r--connectivity/source/inc/sqlscan.hxx10
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx68
-rw-r--r--connectivity/source/manager/mdrivermanager.hxx28
-rw-r--r--connectivity/source/parse/PColumn.cxx34
-rw-r--r--connectivity/source/parse/internalnode.cxx4
-rw-r--r--connectivity/source/parse/sqliterator.cxx266
-rw-r--r--connectivity/source/parse/sqlnode.cxx226
-rw-r--r--connectivity/source/resource/sharedresources.cxx48
-rw-r--r--connectivity/source/sdbcx/VCatalog.cxx18
-rw-r--r--connectivity/source/sdbcx/VCollection.cxx60
-rw-r--r--connectivity/source/sdbcx/VColumn.cxx40
-rw-r--r--connectivity/source/sdbcx/VGroup.cxx14
-rw-r--r--connectivity/source/sdbcx/VIndex.cxx32
-rw-r--r--connectivity/source/sdbcx/VIndexColumn.cxx36
-rw-r--r--connectivity/source/sdbcx/VKey.cxx34
-rw-r--r--connectivity/source/sdbcx/VKeyColumn.cxx40
-rw-r--r--connectivity/source/sdbcx/VTable.cxx46
-rw-r--r--connectivity/source/sdbcx/VUser.cxx16
-rw-r--r--connectivity/source/sdbcx/VView.cxx20
-rw-r--r--connectivity/source/simpledbt/parsenode_s.cxx4
-rw-r--r--connectivity/source/simpledbt/parsenode_s.hxx4
-rw-r--r--connectivity/source/simpledbt/parser_s.cxx2
-rw-r--r--connectivity/source/simpledbt/parser_s.hxx4
-rw-r--r--connectivity/source/simpledbt/staticdbtools_s.cxx24
-rw-r--r--connectivity/source/simpledbt/staticdbtools_s.hxx38
-rw-r--r--connectivity/workben/iniParser/main.cxx12
-rw-r--r--connectivity/workben/little/main.cxx3
-rw-r--r--connectivity/workben/skeleton/SResultSet.hxx8
-rw-r--r--connectivity/workben/testmoz/main.cxx25
-rw-r--r--connectivity/workben/testmoz/mozthread.cxx14
-rw-r--r--cppcanvas/inc/cppcanvas/canvas.hxx2
-rw-r--r--cppcanvas/inc/cppcanvas/font.hxx2
-rw-r--r--cppcanvas/inc/cppcanvas/renderer.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx18
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx8
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx34
-rw-r--r--cppcanvas/source/wrapper/implcanvas.cxx2
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx2
-rw-r--r--cppcanvas/source/wrapper/implfont.cxx4
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx4
-rw-r--r--cppuhelper/source/defaultbootstrap.cxx2
-rw-r--r--cppuhelper/source/servicemanager.cxx8
-rw-r--r--cppuhelper/source/typedescriptionprovider.cxx3
-rw-r--r--cpputools/source/unoexe/unoexe.cxx4
-rw-r--r--crashrep/source/win32/soreport.cxx6
-rw-r--r--cui/source/customize/acccfg.cxx4
-rw-r--r--cui/source/customize/cfg.cxx105
-rw-r--r--cui/source/customize/cfgutil.cxx2
-rw-r--r--cui/source/customize/eventdlg.cxx1
-rw-r--r--cui/source/customize/macropg_impl.hxx6
-rw-r--r--cui/source/customize/selector.cxx1
-rw-r--r--cui/source/dialogs/SpellAttrib.hxx28
-rw-r--r--cui/source/dialogs/SpellDialog.cxx45
-rw-r--r--cui/source/dialogs/about.cxx10
-rw-r--r--cui/source/dialogs/colorpicker.cxx5
-rw-r--r--cui/source/dialogs/cuicharmap.cxx12
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx6
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx16
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx2
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx13
-rw-r--r--cui/source/dialogs/hldocntp.cxx10
-rw-r--r--cui/source/dialogs/hlinettp.cxx12
-rw-r--r--cui/source/dialogs/hlmailtp.cxx6
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx10
-rw-r--r--cui/source/dialogs/iconcdlg.cxx10
-rw-r--r--cui/source/dialogs/insdlg.cxx8
-rw-r--r--cui/source/dialogs/insrc.cxx2
-rw-r--r--cui/source/dialogs/multifil.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx4
-rw-r--r--cui/source/dialogs/plfilter.cxx12
-rw-r--r--cui/source/dialogs/postdlg.cxx2
-rw-r--r--cui/source/dialogs/showcols.cxx2
-rw-r--r--cui/source/dialogs/thesdlg.cxx3
-rw-r--r--cui/source/dialogs/thesdlg_impl.hxx1
-rw-r--r--cui/source/factory/dlgfact.cxx22
-rw-r--r--cui/source/factory/dlgfact.hxx10
-rw-r--r--cui/source/inc/acccfg.hxx8
-rw-r--r--cui/source/inc/autocdlg.hxx6
-rw-r--r--cui/source/inc/cfg.hxx78
-rw-r--r--cui/source/inc/cfgutil.hxx20
-rw-r--r--cui/source/inc/chardlg.hxx2
-rw-r--r--cui/source/inc/cuigaldlg.hxx2
-rw-r--r--cui/source/inc/cuitabline.hxx2
-rw-r--r--cui/source/inc/dbregister.hxx2
-rw-r--r--cui/source/inc/dlgname.hxx2
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx6
-rw-r--r--cui/source/inc/hlmarkwn.hxx2
-rw-r--r--cui/source/inc/insdlg.hxx4
-rw-r--r--cui/source/inc/insrc.hxx6
-rw-r--r--cui/source/inc/macropg.hxx6
-rw-r--r--cui/source/inc/numpages.hxx8
-rw-r--r--cui/source/inc/scriptdlg.hxx26
-rw-r--r--cui/source/inc/selector.hxx14
-rw-r--r--cui/source/inc/thesdlg.hxx2
-rw-r--r--cui/source/inc/treeopt.hxx66
-rw-r--r--cui/source/options/certpath.cxx40
-rw-r--r--cui/source/options/certpath.hxx8
-rw-r--r--cui/source/options/cfgchart.cxx10
-rw-r--r--cui/source/options/cfgchart.hxx6
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/options/dbregisterednamesconfig.cxx18
-rw-r--r--cui/source/options/dbregistersettings.hxx6
-rw-r--r--cui/source/options/doclinkdialog.cxx6
-rw-r--r--cui/source/options/fontsubs.cxx8
-rw-r--r--cui/source/options/optasian.cxx1
-rw-r--r--cui/source/options/optcolor.cxx16
-rw-r--r--cui/source/options/optdict.cxx6
-rw-r--r--cui/source/options/optgdlg.cxx8
-rw-r--r--cui/source/options/optgdlg.hxx2
-rw-r--r--cui/source/options/optgenrl.cxx8
-rw-r--r--cui/source/options/optinet2.cxx1
-rw-r--r--cui/source/options/optinet2.hxx16
-rw-r--r--cui/source/options/optjava.cxx44
-rw-r--r--cui/source/options/optjava.hxx6
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/optsave.cxx4
-rw-r--r--cui/source/options/optupdt.cxx18
-rw-r--r--cui/source/options/optupdt.hxx4
-rw-r--r--cui/source/options/sdbcdriverenum.cxx4
-rw-r--r--cui/source/options/sdbcdriverenum.hxx8
-rw-r--r--cui/source/options/treeopt.cxx110
-rw-r--r--cui/source/options/webconninfo.cxx14
-rw-r--r--cui/source/tabpages/backgrnd.cxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx4
-rw-r--r--cui/source/tabpages/macroass.cxx6
-rw-r--r--cui/source/tabpages/numfmt.cxx8
-rw-r--r--cui/source/tabpages/tabstpge.cxx6
-rw-r--r--cui/source/tabpages/tparea.cxx2
-rw-r--r--cui/source/uno/services.cxx5
-rw-r--r--dbaccess/inc/IController.hxx4
-rw-r--r--dbaccess/inc/dbaundomanager.hxx10
-rw-r--r--dbaccess/inc/dbsubcomponentcontroller.hxx6
-rw-r--r--dbaccess/inc/genericcontroller.hxx40
-rw-r--r--dbaccess/qa/extras/macros-test.cxx16
-rw-r--r--dbaccess/source/core/api/BookmarkSet.cxx2
-rw-r--r--dbaccess/source/core/api/BookmarkSet.hxx2
-rw-r--r--dbaccess/source/core/api/CIndexes.cxx6
-rw-r--r--dbaccess/source/core/api/CIndexes.hxx8
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.cxx14
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.hxx4
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx22
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.hxx14
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx36
-rw-r--r--dbaccess/source/core/api/CacheSet.hxx12
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx70
-rw-r--r--dbaccess/source/core/api/HelperCollections.cxx10
-rw-r--r--dbaccess/source/core/api/HelperCollections.hxx8
-rw-r--r--dbaccess/source/core/api/KeySet.hxx38
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx114
-rw-r--r--dbaccess/source/core/api/OptimisticSet.hxx6
-rw-r--r--dbaccess/source/core/api/PrivateRow.cxx2
-rw-r--r--dbaccess/source/core/api/PrivateRow.hxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx16
-rw-r--r--dbaccess/source/core/api/RowSet.hxx54
-rw-r--r--dbaccess/source/core/api/RowSetBase.cxx10
-rw-r--r--dbaccess/source/core/api/RowSetBase.hxx4
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx26
-rw-r--r--dbaccess/source/core/api/RowSetCache.hxx8
-rw-r--r--dbaccess/source/core/api/TableDeco.cxx24
-rw-r--r--dbaccess/source/core/api/View.cxx12
-rw-r--r--dbaccess/source/core/api/WrappedResultSet.cxx2
-rw-r--r--dbaccess/source/core/api/WrappedResultSet.hxx2
-rw-r--r--dbaccess/source/core/api/callablestatement.cxx12
-rw-r--r--dbaccess/source/core/api/column.cxx42
-rw-r--r--dbaccess/source/core/api/columnsettings.cxx4
-rw-r--r--dbaccess/source/core/api/datacolumn.cxx12
-rw-r--r--dbaccess/source/core/api/datacolumn.hxx8
-rw-r--r--dbaccess/source/core/api/datasettings.cxx2
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx64
-rw-r--r--dbaccess/source/core/api/preparedstatement.cxx18
-rw-r--r--dbaccess/source/core/api/query.cxx22
-rw-r--r--dbaccess/source/core/api/query.hxx8
-rw-r--r--dbaccess/source/core/api/querycomposer.cxx26
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx40
-rw-r--r--dbaccess/source/core/api/querydescriptor.cxx20
-rw-r--r--dbaccess/source/core/api/querydescriptor.hxx14
-rw-r--r--dbaccess/source/core/api/resultcolumn.cxx26
-rw-r--r--dbaccess/source/core/api/resultcolumn.hxx6
-rw-r--r--dbaccess/source/core/api/resultset.cxx30
-rw-r--r--dbaccess/source/core/api/resultset.hxx12
-rw-r--r--dbaccess/source/core/api/statement.cxx38
-rw-r--r--dbaccess/source/core/api/table.cxx18
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx32
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.cxx30
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx28
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx54
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx104
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx36
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.hxx10
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.cxx34
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.hxx34
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx26
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.hxx44
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx36
-rw-r--r--dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx60
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx54
-rw-r--r--dbaccess/source/core/dataaccess/databaseregistrations.cxx88
-rw-r--r--dbaccess/source/core/dataaccess/datasource.hxx22
-rw-r--r--dbaccess/source/core/dataaccess/definitioncontainer.cxx42
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.hxx32
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx88
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.hxx22
-rw-r--r--dbaccess/source/core/dataaccess/documenteventexecutor.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.hxx8
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.cxx18
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.hxx12
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/intercept.hxx6
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.cxx24
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.hxx2
-rw-r--r--dbaccess/source/core/inc/ContainerMediator.hxx6
-rw-r--r--dbaccess/source/core/inc/ContentHelper.hxx34
-rw-r--r--dbaccess/source/core/inc/DatabaseDataProvider.hxx106
-rw-r--r--dbaccess/source/core/inc/FilteredContainer.hxx14
-rw-r--r--dbaccess/source/core/inc/PropertyForward.hxx8
-rw-r--r--dbaccess/source/core/inc/SingleSelectQueryComposer.hxx62
-rw-r--r--dbaccess/source/core/inc/TableDeco.hxx12
-rw-r--r--dbaccess/source/core/inc/View.hxx8
-rw-r--r--dbaccess/source/core/inc/callablestatement.hxx8
-rw-r--r--dbaccess/source/core/inc/column.hxx44
-rw-r--r--dbaccess/source/core/inc/columnsettings.hxx6
-rw-r--r--dbaccess/source/core/inc/commandbase.hxx8
-rw-r--r--dbaccess/source/core/inc/composertools.hxx16
-rw-r--r--dbaccess/source/core/inc/containerapprove.hxx2
-rw-r--r--dbaccess/source/core/inc/datasettings.hxx8
-rw-r--r--dbaccess/source/core/inc/definitioncolumn.hxx40
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx40
-rw-r--r--dbaccess/source/core/inc/objectnameapproval.hxx2
-rw-r--r--dbaccess/source/core/inc/preparedstatement.hxx10
-rw-r--r--dbaccess/source/core/inc/querycomposer.hxx28
-rw-r--r--dbaccess/source/core/inc/querycontainer.hxx12
-rw-r--r--dbaccess/source/core/inc/sdbcoretools.hxx2
-rw-r--r--dbaccess/source/core/inc/statement.hxx16
-rw-r--r--dbaccess/source/core/inc/table.hxx18
-rw-r--r--dbaccess/source/core/inc/tablecontainer.hxx8
-rw-r--r--dbaccess/source/core/inc/veto.hxx6
-rw-r--r--dbaccess/source/core/inc/viewcontainer.hxx8
-rw-r--r--dbaccess/source/core/misc/ContainerMediator.cxx14
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx124
-rw-r--r--dbaccess/source/core/misc/PropertyForward.cxx14
-rw-r--r--dbaccess/source/core/misc/objectnameapproval.cxx2
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx8
-rw-r--r--dbaccess/source/core/misc/services.cxx2
-rw-r--r--dbaccess/source/core/misc/veto.cxx4
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx24
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx42
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx26
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx4
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx4
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx8
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx4
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx16
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx12
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx60
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.hxx8
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.cxx10
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.hxx10
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.cxx12
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.hxx10
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.cxx20
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.hxx10
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.cxx10
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.cxx12
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.hxx16
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx16
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.hxx16
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.cxx12
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.hxx8
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.hxx24
-rw-r--r--dbaccess/source/filter/xml/xmlTable.hxx30
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.hxx12
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlservices.cxx2
-rw-r--r--dbaccess/source/inc/OAuthenticationContinuation.hxx16
-rw-r--r--dbaccess/source/inc/apitools.hxx68
-rw-r--r--dbaccess/source/inc/registrationhelper.hxx24
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.hxx14
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.hxx10
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.hxx18
-rw-r--r--dbaccess/source/sdbtools/misc/sdbt_services.cxx2
-rw-r--r--dbaccess/source/shared/registrationhelper.cxx22
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx20
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx20
-rw-r--r--dbaccess/source/ui/app/AppView.cxx18
-rw-r--r--dbaccess/source/ui/app/AppView.hxx18
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.hxx8
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx14
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx42
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx8
-rw-r--r--dbaccess/source/ui/control/SqlNameEdit.cxx10
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx4
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx30
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx10
-rw-r--r--dbaccess/source/ui/control/tabletree.cxx52
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx26
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx26
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx34
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx4
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx40
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx2
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.cxx50
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx10
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx10
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx2
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx6
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx2
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx4
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.hxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx32
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx8
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx56
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx36
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx6
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx82
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx11
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx16
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx2
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx2
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx10
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx10
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.cxx8
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.hxx4
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx42
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx28
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx14
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx38
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx8
-rw-r--r--dbaccess/source/ui/inc/CollectionView.hxx4
-rw-r--r--dbaccess/source/ui/inc/ColumnControlWindow.hxx4
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineAccess.hxx6
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineData.hxx22
-rw-r--r--dbaccess/source/ui/inc/DExport.hxx10
-rw-r--r--dbaccess/source/ui/inc/FieldControls.hxx4
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx6
-rw-r--r--dbaccess/source/ui/inc/FieldDescriptions.hxx30
-rw-r--r--dbaccess/source/ui/inc/GeneralUndo.hxx2
-rw-r--r--dbaccess/source/ui/inc/IItemSetHelper.hxx4
-rw-r--r--dbaccess/source/ui/inc/IUpdateHelper.hxx2
-rw-r--r--dbaccess/source/ui/inc/JAccess.hxx4
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx2
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx14
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx20
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx10
-rw-r--r--dbaccess/source/ui/inc/QueryTextView.hxx4
-rw-r--r--dbaccess/source/ui/inc/QueryViewSwitch.hxx4
-rw-r--r--dbaccess/source/ui/inc/RTableConnectionData.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx12
-rw-r--r--dbaccess/source/ui/inc/RelationTableView.hxx2
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx16
-rw-r--r--dbaccess/source/ui/inc/TableConnectionData.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx22
-rw-r--r--dbaccess/source/ui/inc/TableCopyHelper.hxx24
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx44
-rw-r--r--dbaccess/source/ui/inc/TableGrantCtrl.hxx6
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx10
-rw-r--r--dbaccess/source/ui/inc/TableWindowAccess.hxx12
-rw-r--r--dbaccess/source/ui/inc/TableWindowData.hxx20
-rw-r--r--dbaccess/source/ui/inc/TokenWriter.hxx10
-rw-r--r--dbaccess/source/ui/inc/TypeInfo.hxx20
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx32
-rw-r--r--dbaccess/source/ui/inc/UserAdminDlg.hxx4
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx2
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx16
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx86
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx4
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx6
-rw-r--r--dbaccess/source/ui/inc/charsets.hxx14
-rw-r--r--dbaccess/source/ui/inc/commontypes.hxx4
-rw-r--r--dbaccess/source/ui/inc/databaseobjectview.hxx20
-rw-r--r--dbaccess/source/ui/inc/datasourceconnector.hxx6
-rw-r--r--dbaccess/source/ui/inc/dbadmin.hxx4
-rw-r--r--dbaccess/source/ui/inc/dbexchange.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwiz.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx16
-rw-r--r--dbaccess/source/ui/inc/defaultobjectnamecheck.hxx6
-rw-r--r--dbaccess/source/ui/inc/dsmeta.hxx4
-rw-r--r--dbaccess/source/ui/inc/exsrcbrw.hxx8
-rw-r--r--dbaccess/source/ui/inc/formadapter.hxx70
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx4
-rw-r--r--dbaccess/source/ui/inc/indexes.hxx12
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx2
-rw-r--r--dbaccess/source/ui/inc/linkeddocuments.hxx14
-rw-r--r--dbaccess/source/ui/inc/objectnamecheck.hxx5
-rw-r--r--dbaccess/source/ui/inc/opendoccontrols.hxx4
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx4
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx28
-rw-r--r--dbaccess/source/ui/inc/queryfilter.hxx4
-rw-r--r--dbaccess/source/ui/inc/queryorder.hxx6
-rw-r--r--dbaccess/source/ui/inc/queryview.hxx4
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx10
-rw-r--r--dbaccess/source/ui/inc/sbamultiplex.hxx30
-rw-r--r--dbaccess/source/ui/inc/sqlmessage.hxx4
-rw-r--r--dbaccess/source/ui/inc/stringlistitem.hxx6
-rw-r--r--dbaccess/source/ui/inc/tabletree.hxx14
-rw-r--r--dbaccess/source/ui/inc/unosqlmessage.hxx8
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx46
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx6
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx4
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx2
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx26
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx46
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx110
-rw-r--r--dbaccess/source/ui/misc/UpdateHelperImpl.hxx4
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx12
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx28
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx178
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx12
-rw-r--r--dbaccess/source/ui/misc/charsets.cxx8
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx4
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx68
-rw-r--r--dbaccess/source/ui/misc/datasourceconnector.cxx6
-rw-r--r--dbaccess/source/ui/misc/dbaundomanager.cxx14
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx14
-rw-r--r--dbaccess/source/ui/misc/defaultobjectnamecheck.cxx14
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx30
-rw-r--r--dbaccess/source/ui/misc/imageprovider.cxx4
-rw-r--r--dbaccess/source/ui/misc/indexcollection.cxx36
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx36
-rw-r--r--dbaccess/source/ui/misc/propertystorage.cxx4
-rw-r--r--dbaccess/source/ui/misc/stringlistitem.cxx6
-rw-r--r--dbaccess/source/ui/misc/uiservices.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineData.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/JAccess.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx14
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnection.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.hxx4
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx14
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.hxx10
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindowData.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindowData.hxx6
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx34
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx90
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx14
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx20
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowAccess.cxx22
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowData.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx40
-rw-r--r--dbaccess/source/ui/relationdesign/RTableWindow.hxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx46
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx12
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescriptions.cxx22
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx16
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx72
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableRow.cxx2
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx14
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx4
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.hxx2
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.cxx4
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.hxx4
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.cxx8
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.hxx4
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx8
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx12
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx8
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx8
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx8
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx8
-rw-r--r--dbaccess/source/ui/uno/admindlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx36
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.hxx2
-rw-r--r--desktop/inc/app.hxx18
-rw-r--r--desktop/qa/deployment_misc/test_dp_version.cxx20
-rw-r--r--desktop/source/app/app.cxx156
-rw-r--r--desktop/source/app/appfirststart.cxx3
-rw-r--r--desktop/source/app/appinit.cxx13
-rw-r--r--desktop/source/app/check_ext_deps.cxx9
-rw-r--r--desktop/source/app/cmdlineargs.cxx51
-rw-r--r--desktop/source/app/cmdlineargs.hxx70
-rw-r--r--desktop/source/app/cmdlinehelp.cxx16
-rw-r--r--desktop/source/app/configinit.cxx1
-rw-r--r--desktop/source/app/desktopcontext.cxx1
-rw-r--r--desktop/source/app/desktopcontext.hxx2
-rw-r--r--desktop/source/app/dispatchwatcher.cxx55
-rw-r--r--desktop/source/app/dispatchwatcher.hxx14
-rw-r--r--desktop/source/app/langselect.cxx5
-rw-r--r--desktop/source/app/langselect.hxx18
-rw-r--r--desktop/source/app/lockfile2.cxx12
-rw-r--r--desktop/source/app/officeipcthread.cxx75
-rw-r--r--desktop/source/app/officeipcthread.hxx36
-rw-r--r--desktop/source/app/sofficemain.cxx2
-rw-r--r--desktop/source/app/userinstall.cxx16
-rw-r--r--desktop/source/deployment/dp_persmap.cxx2
-rw-r--r--desktop/source/deployment/dp_xml.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dependencydialog.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dependencydialog.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx13
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx24
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx13
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx18
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.hxx12
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx19
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx5
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.hxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedata.hxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx96
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx38
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx9
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx20
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx9
-rw-r--r--desktop/source/deployment/gui/license_dialog.hxx1
-rw-r--r--desktop/source/deployment/inc/dp_dependencies.hxx2
-rw-r--r--desktop/source/deployment/inc/dp_descriptioninfoset.hxx50
-rw-r--r--desktop/source/deployment/inc/dp_identifier.hxx12
-rw-r--r--desktop/source/deployment/inc/dp_interact.h10
-rw-r--r--desktop/source/deployment/inc/dp_misc.h30
-rw-r--r--desktop/source/deployment/inc/dp_persmap.h16
-rw-r--r--desktop/source/deployment/inc/dp_platform.hxx6
-rw-r--r--desktop/source/deployment/inc/dp_resource.h4
-rw-r--r--desktop/source/deployment/inc/dp_ucb.h20
-rw-r--r--desktop/source/deployment/inc/dp_update.hxx30
-rw-r--r--desktop/source/deployment/inc/dp_version.hxx2
-rw-r--r--desktop/source/deployment/inc/lockfile.hxx20
-rw-r--r--desktop/source/deployment/manager/dp_activepackages.cxx60
-rw-r--r--desktop/source/deployment/manager/dp_activepackages.hxx26
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx1
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.hxx4
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx9
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.hxx70
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx72
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx27
-rw-r--r--desktop/source/deployment/manager/dp_manager.h44
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx3
-rw-r--r--desktop/source/deployment/manager/dp_properties.cxx5
-rw-r--r--desktop/source/deployment/manager/dp_properties.hxx12
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx16
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx119
-rw-r--r--desktop/source/deployment/misc/dp_identifier.cxx14
-rw-r--r--desktop/source/deployment/misc/dp_interact.cxx1
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx22
-rw-r--r--desktop/source/deployment/misc/dp_platform.cxx3
-rw-r--r--desktop/source/deployment/misc/dp_resource.cxx1
-rw-r--r--desktop/source/deployment/misc/dp_ucb.cxx7
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx36
-rw-r--r--desktop/source/deployment/misc/dp_version.cxx8
-rw-r--r--desktop/source/deployment/misc/lockfile.cxx26
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.cxx7
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.hxx18
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx69
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx31
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx7
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx20
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx1
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx33
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx15
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx3
-rw-r--r--desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx3
-rw-r--r--desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx10
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx93
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.cxx7
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.hxx18
-rw-r--r--desktop/source/deployment/registry/inc/dp_backend.h96
-rw-r--r--desktop/source/deployment/registry/inc/dp_backenddb.hxx74
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.cxx7
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.hxx18
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx17
-rw-r--r--desktop/source/deployment/registry/script/dp_lib_container.cxx1
-rw-r--r--desktop/source/deployment/registry/script/dp_lib_container.h4
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx1
-rw-r--r--desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx3
-rw-r--r--desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx10
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx1
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx14
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx1
-rw-r--r--desktop/source/lib/init.cxx4
-rw-r--r--desktop/source/migration/migration.cxx158
-rw-r--r--desktop/source/migration/migration_impl.hxx62
-rw-r--r--desktop/source/migration/services/basicmigration.cxx30
-rw-r--r--desktop/source/migration/services/basicmigration.hxx14
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx35
-rw-r--r--desktop/source/migration/services/jvmfwk.hxx4
-rw-r--r--desktop/source/migration/services/misc.hxx2
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx44
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx22
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx38
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx14
-rw-r--r--desktop/source/offacc/acceptor.cxx4
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx1
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx5
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx16
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_shared.h18
-rw-r--r--desktop/source/splash/splash.cxx12
-rw-r--r--desktop/source/splash/splash.hxx4
-rw-r--r--desktop/test/deployment/active/active_native.cxx4
-rw-r--r--desktop/unx/source/officeloader/officeloader.cxx1
-rw-r--r--desktop/unx/splash/unxsplash.cxx4
-rw-r--r--drawinglayer/inc/drawinglayer/XShapeDumper.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx6
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx18
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx6
-rw-r--r--drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx4
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx24
-rw-r--r--drawinglayer/source/dumper/EnhancedShapeDumper.cxx26
-rw-r--r--drawinglayer/source/dumper/EnhancedShapeDumper.hxx4
-rw-r--r--drawinglayer/source/dumper/XShapeDumper.cxx126
-rw-r--r--drawinglayer/source/geometry/viewinformation2d.cxx24
-rw-r--r--drawinglayer/source/geometry/viewinformation3d.cxx36
-rw-r--r--drawinglayer/source/primitive2d/controlprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/mediaprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx6
-rw-r--r--drawinglayer/source/primitive2d/textbreakuphelper.cxx2
-rw-r--r--drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx28
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx2
-rw-r--r--drawinglayer/source/tools/converters.cxx2
-rw-r--r--dtrans/source/cnttype/mcnttfactory.hxx8
-rw-r--r--dtrans/source/cnttype/mcnttype.cxx19
-rw-r--r--dtrans/source/cnttype/mcnttype.hxx38
-rw-r--r--dtrans/source/generic/clipboardmanager.cxx1
-rw-r--r--dtrans/source/generic/clipboardmanager.hxx18
-rw-r--r--dtrans/source/generic/dtrans.cxx1
-rw-r--r--dtrans/source/generic/generic_clipboard.cxx1
-rw-r--r--dtrans/source/generic/generic_clipboard.hxx12
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.cxx1
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.hxx6
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.cxx1
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.hxx10
-rw-r--r--dtrans/source/win32/clipb/wcbentry.cxx2
-rw-r--r--dtrans/source/win32/dnd/source.cxx1
-rw-r--r--dtrans/source/win32/dnd/source.hxx3
-rw-r--r--dtrans/source/win32/dnd/target.cxx1
-rw-r--r--dtrans/source/win32/dnd/target.hxx3
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx1
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.cxx1
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.hxx6
-rw-r--r--dtrans/source/win32/dtobj/FetcList.cxx1
-rw-r--r--dtrans/source/win32/dtobj/FetcList.hxx2
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx1
-rw-r--r--dtrans/source/win32/dtobj/MimeAttrib.hxx10
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx1
-rw-r--r--dtrans/source/win32/ftransl/ftransl.cxx15
-rw-r--r--dtrans/source/win32/ftransl/ftransl.hxx20
-rw-r--r--dtrans/source/win32/misc/ImplHelper.cxx2
-rw-r--r--dtrans/source/win32/misc/ImplHelper.hxx14
-rw-r--r--dtrans/test/win32/dnd/atlwindow.cxx1
-rw-r--r--dtrans/test/win32/dnd/dndTest.cxx1
-rw-r--r--dtrans/test/win32/dnd/targetlistener.cxx1
-rw-r--r--editeng/inc/editeng/AccessibleComponentBase.hxx4
-rw-r--r--editeng/inc/editeng/AccessibleContextBase.hxx22
-rw-r--r--editeng/inc/editeng/AccessibleEditableTextPara.hxx34
-rw-r--r--editeng/inc/editeng/AccessibleImageBullet.hxx12
-rw-r--r--editeng/inc/editeng/AccessibleStaticTextBase.hxx12
-rw-r--r--editeng/inc/editeng/SpellPortions.hxx4
-rw-r--r--editeng/inc/editeng/acorrcfg.hxx8
-rw-r--r--editeng/inc/editeng/adjustitem.hxx2
-rw-r--r--editeng/inc/editeng/charreliefitem.hxx2
-rw-r--r--editeng/inc/editeng/cmapitem.hxx2
-rw-r--r--editeng/inc/editeng/crossedoutitem.hxx2
-rw-r--r--editeng/inc/editeng/editund2.hxx2
-rw-r--r--editeng/inc/editeng/edtdlg.hxx2
-rw-r--r--editeng/inc/editeng/escapementitem.hxx2
-rw-r--r--editeng/inc/editeng/flditem.hxx66
-rw-r--r--editeng/inc/editeng/flstitem.hxx2
-rw-r--r--editeng/inc/editeng/formatbreakitem.hxx2
-rw-r--r--editeng/inc/editeng/hangulhanja.hxx6
-rw-r--r--editeng/inc/editeng/lspcitem.hxx2
-rw-r--r--editeng/inc/editeng/numitem.hxx12
-rw-r--r--editeng/inc/editeng/outliner.hxx6
-rw-r--r--editeng/inc/editeng/postitem.hxx2
-rw-r--r--editeng/inc/editeng/shaditem.hxx2
-rw-r--r--editeng/inc/editeng/svxacorr.hxx4
-rw-r--r--editeng/inc/editeng/udlnitem.hxx6
-rw-r--r--editeng/inc/editeng/unofield.hxx24
-rw-r--r--editeng/inc/editeng/unoipset.hxx2
-rw-r--r--editeng/inc/editeng/unonrule.hxx6
-rw-r--r--editeng/inc/editeng/unopracc.hxx8
-rw-r--r--editeng/inc/editeng/unotext.hxx116
-rw-r--r--editeng/inc/editeng/wghtitem.hxx2
-rw-r--r--editeng/inc/editeng/xmlcnitm.hxx24
-rw-r--r--editeng/qa/lookuptree/lookuptree_test.cxx10
-rw-r--r--editeng/qa/unit/core-test.cxx32
-rw-r--r--editeng/source/editeng/editattr.cxx6
-rw-r--r--editeng/source/editeng/editattr.hxx6
-rw-r--r--editeng/source/editeng/editdbg.cxx26
-rw-r--r--editeng/source/editeng/editdbg.hxx2
-rw-r--r--editeng/source/editeng/editdoc.cxx12
-rw-r--r--editeng/source/editeng/editdoc.hxx2
-rw-r--r--editeng/source/editeng/editeng.cxx10
-rw-r--r--editeng/source/editeng/editobj.cxx30
-rw-r--r--editeng/source/editeng/editundo.cxx4
-rw-r--r--editeng/source/editeng/editview.cxx3
-rw-r--r--editeng/source/editeng/edtspell.cxx1
-rw-r--r--editeng/source/editeng/eehtml.hxx2
-rw-r--r--editeng/source/editeng/eeobj.cxx2
-rw-r--r--editeng/source/editeng/impedit.cxx2
-rw-r--r--editeng/source/editeng/impedit.hxx2
-rw-r--r--editeng/source/editeng/impedit2.cxx20
-rw-r--r--editeng/source/editeng/impedit3.cxx19
-rw-r--r--editeng/source/editeng/impedit4.cxx10
-rw-r--r--editeng/source/editeng/textconv.cxx9
-rw-r--r--editeng/source/editeng/textconv.hxx10
-rw-r--r--editeng/source/items/bulitem.cxx4
-rw-r--r--editeng/source/items/flditem.cxx52
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/numitem.cxx4
-rw-r--r--editeng/source/items/paraitem.cxx14
-rw-r--r--editeng/source/items/textitem.cxx22
-rw-r--r--editeng/source/items/xmlcnitm.cxx32
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectExport.cxx4
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectExport.hxx4
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.cxx4
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.hxx16
-rw-r--r--editeng/source/misc/acorrcfg.cxx7
-rw-r--r--editeng/source/misc/hangulhanja.cxx36
-rw-r--r--editeng/source/misc/splwrap.cxx8
-rw-r--r--editeng/source/misc/svxacorr.cxx66
-rw-r--r--editeng/source/misc/swafopt.cxx2
-rw-r--r--editeng/source/misc/unolingu.cxx24
-rw-r--r--editeng/source/outliner/outliner.cxx2
-rw-r--r--editeng/source/rtf/svxrtf.cxx6
-rw-r--r--editeng/source/uno/unofield.cxx4
-rw-r--r--editeng/source/uno/unonrule.cxx1
-rw-r--r--editeng/source/uno/unopracc.cxx10
-rw-r--r--editeng/source/uno/unotext.cxx22
-rw-r--r--editeng/source/uno/unotext2.cxx10
-rw-r--r--editeng/source/xml/xmltxtexp.cxx24
-rw-r--r--editeng/source/xml/xmltxtimp.cxx2
-rw-r--r--embeddedobj/source/commonembedding/embedobj.cxx38
-rw-r--r--embeddedobj/source/commonembedding/inplaceobj.cxx2
-rw-r--r--embeddedobj/source/commonembedding/miscobj.cxx10
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx184
-rw-r--r--embeddedobj/source/commonembedding/register.cxx2
-rw-r--r--embeddedobj/source/commonembedding/specialobject.cxx14
-rw-r--r--embeddedobj/source/commonembedding/visobj.cxx18
-rw-r--r--embeddedobj/source/commonembedding/xfactory.cxx102
-rw-r--r--embeddedobj/source/commonembedding/xfactory.hxx34
-rw-r--r--embeddedobj/source/general/docholder.cxx60
-rw-r--r--embeddedobj/source/general/dummyobject.cxx62
-rw-r--r--embeddedobj/source/general/intercept.cxx44
-rw-r--r--embeddedobj/source/general/xcreator.cxx86
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx64
-rw-r--r--embeddedobj/source/inc/docholder.hxx16
-rw-r--r--embeddedobj/source/inc/dummyobject.hxx20
-rw-r--r--embeddedobj/source/inc/intercept.hxx6
-rw-r--r--embeddedobj/source/inc/oleembobj.hxx52
-rw-r--r--embeddedobj/source/inc/xcreator.hxx22
-rw-r--r--embeddedobj/source/msole/graphconvert.cxx8
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx80
-rw-r--r--embeddedobj/source/msole/olecomponent.hxx8
-rw-r--r--embeddedobj/source/msole/oleembed.cxx88
-rw-r--r--embeddedobj/source/msole/olemisc.cxx12
-rw-r--r--embeddedobj/source/msole/olepersist.cxx156
-rw-r--r--embeddedobj/source/msole/oleregister.cxx2
-rw-r--r--embeddedobj/source/msole/olevisual.cxx38
-rw-r--r--embeddedobj/source/msole/ownview.cxx60
-rw-r--r--embeddedobj/source/msole/ownview.hxx12
-rw-r--r--embeddedobj/source/msole/xdialogcreator.cxx52
-rw-r--r--embeddedobj/source/msole/xdialogcreator.hxx14
-rw-r--r--embeddedobj/source/msole/xolefactory.cxx54
-rw-r--r--embeddedobj/source/msole/xolefactory.hxx20
-rw-r--r--embeddedobj/test/MainThreadExecutor/register.cxx8
-rw-r--r--embeddedobj/test/MainThreadExecutor/xexecutor.cxx16
-rw-r--r--embeddedobj/test/MainThreadExecutor/xexecutor.hxx10
-rw-r--r--embeddedobj/test/mtexecutor/bitmapcreator.cxx16
-rw-r--r--embeddedobj/test/mtexecutor/bitmapcreator.hxx10
-rw-r--r--embeddedobj/test/mtexecutor/mainthreadexecutor.cxx16
-rw-r--r--embeddedobj/test/mtexecutor/mainthreadexecutor.hxx10
-rw-r--r--embeddedobj/test/mtexecutor/mteregister.cxx12
-rw-r--r--embedserv/source/embed/docholder.cxx58
-rw-r--r--embedserv/source/embed/ed_idataobj.cxx8
-rw-r--r--embedserv/source/embed/ed_ioleobject.cxx8
-rw-r--r--embedserv/source/embed/ed_ipersiststr.cxx50
-rw-r--r--embedserv/source/embed/guid.cxx96
-rw-r--r--embedserv/source/embed/intercept.cxx64
-rw-r--r--embedserv/source/embed/register.cxx12
-rw-r--r--embedserv/source/inc/docholder.hxx10
-rw-r--r--embedserv/source/inc/embeddoc.hxx2
-rw-r--r--embedserv/source/inc/intercept.hxx6
-rw-r--r--eventattacher/source/eventattacher.cxx3
-rw-r--r--extensions/qa/update/test_update.cxx34
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx4
-rw-r--r--extensions/source/abpilot/abpservices.cxx2
-rw-r--r--extensions/source/abpilot/abptypes.hxx4
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/abpilot/addresssettings.hxx6
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx10
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx68
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx34
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx56
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.hxx4
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx6
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx14
-rw-r--r--extensions/source/abpilot/unodialogabp.hxx8
-rw-r--r--extensions/source/bibliography/bibbeam.cxx3
-rw-r--r--extensions/source/bibliography/bibconfig.cxx3
-rw-r--r--extensions/source/bibliography/bibconfig.hxx40
-rw-r--r--extensions/source/bibliography/bibload.cxx86
-rw-r--r--extensions/source/bibliography/bibmod.cxx2
-rw-r--r--extensions/source/bibliography/datman.cxx168
-rw-r--r--extensions/source/bibliography/datman.hxx44
-rw-r--r--extensions/source/bibliography/framectr.cxx51
-rw-r--r--extensions/source/bibliography/framectr.hxx8
-rw-r--r--extensions/source/bibliography/general.cxx36
-rw-r--r--extensions/source/bibliography/general.hxx6
-rw-r--r--extensions/source/bibliography/toolbar.cxx34
-rw-r--r--extensions/source/bibliography/toolbar.hxx14
-rw-r--r--extensions/source/config/ldap/ldapaccess.cxx42
-rw-r--r--extensions/source/config/ldap/ldapaccess.hxx18
-rw-r--r--extensions/source/config/ldap/ldapuserprofilebe.cxx60
-rw-r--r--extensions/source/config/ldap/ldapuserprofilebe.hxx28
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx34
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx52
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx4
-rw-r--r--extensions/source/dbpilots/dbpservices.cxx2
-rw-r--r--extensions/source/dbpilots/dbptools.cxx6
-rw-r--r--extensions/source/dbpilots/dbptools.hxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx40
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx22
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx2
-rw-r--r--extensions/source/dbpilots/optiongrouplayouter.cxx22
-rw-r--r--extensions/source/dbpilots/unoautopilot.hxx10
-rw-r--r--extensions/source/dbpilots/wizardcontext.hxx2
-rw-r--r--extensions/source/dbpilots/wizardservices.cxx30
-rw-r--r--extensions/source/dbpilots/wizardservices.hxx12
-rw-r--r--extensions/source/inc/componentmodule.cxx32
-rw-r--r--extensions/source/inc/componentmodule.hxx28
-rw-r--r--extensions/source/logging/consolehandler.cxx46
-rw-r--r--extensions/source/logging/csvformatter.cxx84
-rw-r--r--extensions/source/logging/filehandler.cxx64
-rw-r--r--extensions/source/logging/logger.cxx80
-rw-r--r--extensions/source/logging/loggerconfig.cxx38
-rw-r--r--extensions/source/logging/loghandler.cxx34
-rw-r--r--extensions/source/logging/loghandler.hxx10
-rw-r--r--extensions/source/logging/logrecord.cxx8
-rw-r--r--extensions/source/logging/logrecord.hxx14
-rw-r--r--extensions/source/logging/plaintextformatter.cxx50
-rw-r--r--extensions/source/nsplugin/source/so_instance.cxx24
-rw-r--r--extensions/source/nsplugin/source/so_instance.hxx2
-rw-r--r--extensions/source/nsplugin/source/so_main.cxx14
-rw-r--r--extensions/source/ole/ole2uno.hxx2
-rw-r--r--extensions/source/ole/oleobjw.cxx37
-rw-r--r--extensions/source/ole/oleobjw.hxx17
-rw-r--r--extensions/source/ole/servprov.cxx1
-rw-r--r--extensions/source/ole/servreg.cxx1
-rw-r--r--extensions/source/ole/unoobjw.cxx1
-rw-r--r--extensions/source/ole/unotypewrapper.cxx2
-rw-r--r--extensions/source/ole/unotypewrapper.hxx2
-rw-r--r--extensions/source/plugin/base/context.cxx66
-rw-r--r--extensions/source/plugin/base/manager.cxx28
-rw-r--r--extensions/source/plugin/base/nfuncs.cxx31
-rw-r--r--extensions/source/plugin/base/plcom.cxx2
-rw-r--r--extensions/source/plugin/base/plmodel.cxx20
-rw-r--r--extensions/source/plugin/base/service.cxx2
-rw-r--r--extensions/source/plugin/base/xplugin.cxx6
-rw-r--r--extensions/source/plugin/inc/plugin/aqua/sysplug.hxx16
-rw-r--r--extensions/source/plugin/inc/plugin/impl.hxx46
-rw-r--r--extensions/source/plugin/inc/plugin/model.hxx18
-rw-r--r--extensions/source/plugin/inc/plugin/plcom.hxx8
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx2
-rw-r--r--extensions/source/plugin/inc/plugin/unx/sysplug.hxx2
-rw-r--r--extensions/source/plugin/inc/plugin/win/sysplug.hxx2
-rw-r--r--extensions/source/plugin/unx/npwrap.cxx4
-rw-r--r--extensions/source/plugin/unx/sysplug.cxx10
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx36
-rw-r--r--extensions/source/plugin/win/sysplug.cxx3
-rw-r--r--extensions/source/plugin/win/winmgr.cxx4
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.cxx8
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.hxx12
-rw-r--r--extensions/source/propctrlr/browserline.cxx14
-rw-r--r--extensions/source/propctrlr/browserline.hxx12
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx38
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx20
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.cxx28
-rw-r--r--extensions/source/propctrlr/buttonnavigationhandler.hxx18
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.cxx34
-rw-r--r--extensions/source/propctrlr/cellbindinghandler.hxx16
-rw-r--r--extensions/source/propctrlr/cellbindinghelper.cxx40
-rw-r--r--extensions/source/propctrlr/cellbindinghelper.hxx24
-rw-r--r--extensions/source/propctrlr/commoncontrol.hxx2
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx68
-rw-r--r--extensions/source/propctrlr/composeduiupdate.hxx4
-rw-r--r--extensions/source/propctrlr/controlfontdialog.cxx8
-rw-r--r--extensions/source/propctrlr/controlfontdialog.hxx6
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx26
-rw-r--r--extensions/source/propctrlr/defaultforminspection.hxx10
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.cxx20
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.hxx6
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.cxx44
-rw-r--r--extensions/source/propctrlr/editpropertyhandler.hxx14
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx64
-rw-r--r--extensions/source/propctrlr/eformshelper.hxx26
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx92
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.hxx26
-rw-r--r--extensions/source/propctrlr/enumrepresentation.hxx6
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx164
-rw-r--r--extensions/source/propctrlr/eventhandler.hxx50
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx36
-rw-r--r--extensions/source/propctrlr/formbrowsertools.cxx4
-rw-r--r--extensions/source/propctrlr/formbrowsertools.hxx6
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx82
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.hxx46
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx30
-rw-r--r--extensions/source/propctrlr/formcontroller.hxx16
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx46
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx58
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx24
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx34
-rw-r--r--extensions/source/propctrlr/formmetadata.hxx12
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx96
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.hxx32
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx14
-rw-r--r--extensions/source/propctrlr/handlerhelper.hxx4
-rw-r--r--extensions/source/propctrlr/inspectormodelbase.cxx14
-rw-r--r--extensions/source/propctrlr/inspectormodelbase.hxx2
-rw-r--r--extensions/source/propctrlr/linedescriptor.hxx2
-rw-r--r--extensions/source/propctrlr/listselectiondlg.cxx10
-rw-r--r--extensions/source/propctrlr/listselectiondlg.hxx6
-rw-r--r--extensions/source/propctrlr/newdatatype.cxx4
-rw-r--r--extensions/source/propctrlr/newdatatype.hxx4
-rw-r--r--extensions/source/propctrlr/objectinspectormodel.cxx30
-rw-r--r--extensions/source/propctrlr/pcrcommon.cxx12
-rw-r--r--extensions/source/propctrlr/pcrcommon.hxx4
-rw-r--r--extensions/source/propctrlr/pcrcommontypes.hxx2
-rw-r--r--extensions/source/propctrlr/pcrcomponentcontext.cxx4
-rw-r--r--extensions/source/propctrlr/pcrcomponentcontext.hxx12
-rw-r--r--extensions/source/propctrlr/pcrservices.cxx2
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.cxx8
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.hxx6
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx110
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx62
-rw-r--r--extensions/source/propctrlr/propertycomposer.cxx44
-rw-r--r--extensions/source/propctrlr/propertycomposer.hxx28
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx24
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx26
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx66
-rw-r--r--extensions/source/propctrlr/propertyhandler.hxx82
-rw-r--r--extensions/source/propctrlr/propertyinfo.hxx4
-rw-r--r--extensions/source/propctrlr/proplinelistener.hxx4
-rw-r--r--extensions/source/propctrlr/pushbuttonnavigation.cxx12
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx12
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.hxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.cxx16
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.hxx8
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx96
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx28
-rw-r--r--extensions/source/propctrlr/stringrepresentation.cxx96
-rw-r--r--extensions/source/propctrlr/submissionhandler.cxx40
-rw-r--r--extensions/source/propctrlr/submissionhandler.hxx20
-rw-r--r--extensions/source/propctrlr/taborder.cxx10
-rw-r--r--extensions/source/propctrlr/unourl.cxx2
-rw-r--r--extensions/source/propctrlr/unourl.hxx4
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx8
-rw-r--r--extensions/source/propctrlr/xsddatatypes.cxx10
-rw-r--r--extensions/source/propctrlr/xsddatatypes.hxx8
-rw-r--r--extensions/source/propctrlr/xsdvalidationhelper.cxx38
-rw-r--r--extensions/source/propctrlr/xsdvalidationhelper.hxx24
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx116
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx24
-rw-r--r--extensions/source/resource/ResourceIndexAccess.cxx5
-rw-r--r--extensions/source/resource/ResourceIndexAccess.hxx6
-rw-r--r--extensions/source/resource/oooresourceloader.cxx48
-rw-r--r--extensions/source/resource/oooresourceloader.hxx6
-rw-r--r--extensions/source/scanner/sane.cxx18
-rw-r--r--extensions/source/scanner/sane.hxx2
-rw-r--r--extensions/source/scanner/sanedlg.cxx38
-rw-r--r--extensions/source/scanner/scanner.cxx4
-rw-r--r--extensions/source/scanner/scanner.hxx2
-rw-r--r--extensions/source/scanner/scanunx.cxx14
-rw-r--r--extensions/source/scanner/scanwin.cxx18
-rw-r--r--extensions/source/scanner/scnserv.cxx2
-rw-r--r--extensions/source/update/check/download.cxx50
-rw-r--r--extensions/source/update/check/download.hxx14
-rw-r--r--extensions/source/update/check/updatecheck.cxx100
-rw-r--r--extensions/source/update/check/updatecheck.hxx18
-rw-r--r--extensions/source/update/check/updatecheckconfig.cxx108
-rw-r--r--extensions/source/update/check/updatecheckconfig.hxx52
-rw-r--r--extensions/source/update/check/updatecheckjob.cxx34
-rw-r--r--extensions/source/update/check/updatehdl.cxx96
-rw-r--r--extensions/source/update/check/updatehdl.hxx118
-rw-r--r--extensions/source/update/check/updateinfo.hxx20
-rw-r--r--extensions/source/update/check/updateprotocol.cxx40
-rw-r--r--extensions/source/update/check/updateprotocol.hxx12
-rw-r--r--extensions/source/update/check/updateprotocoltest.cxx4
-rw-r--r--extensions/source/update/feed/test/updatefeedtest.cxx6
-rw-r--r--extensions/source/update/feed/updatefeed.cxx74
-rw-r--r--extensions/source/update/tools/ztool.cxx4
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx62
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx1
-rw-r--r--extensions/test/ole/OleClient/funcs.cxx1
-rw-r--r--extensions/test/ole/OleConverterVar1/convTest.cxx1
-rw-r--r--extensions/test/ole/cpnt/cpnt.cxx9
-rw-r--r--extensions/workben/pythonautotest.cxx1
-rw-r--r--extensions/workben/pythontest.cxx1
-rw-r--r--extensions/workben/testcomponent.cxx2
-rw-r--r--fileaccess/source/FileAccess.cxx148
-rw-r--r--filter/inc/filter/msfilter/dffpropset.hxx2
-rw-r--r--filter/inc/filter/msfilter/escherex.hxx18
-rw-r--r--filter/inc/filter/msfilter/mstoolbar.hxx30
-rw-r--r--filter/inc/filter/msfilter/util.hxx6
-rw-r--r--filter/qa/cppunit/filters-pict-test.cxx12
-rw-r--r--filter/qa/cppunit/filters-tga-test.cxx12
-rw-r--r--filter/qa/cppunit/filters-tiff-test.cxx12
-rw-r--r--filter/source/config/cache/basecontainer.cxx36
-rw-r--r--filter/source/config/cache/basecontainer.hxx28
-rw-r--r--filter/source/config/cache/cacheitem.cxx14
-rw-r--r--filter/source/config/cache/cacheitem.hxx18
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx18
-rw-r--r--filter/source/config/cache/configflush.cxx18
-rw-r--r--filter/source/config/cache/configflush.hxx10
-rw-r--r--filter/source/config/cache/contenthandlerfactory.cxx10
-rw-r--r--filter/source/config/cache/contenthandlerfactory.hxx10
-rw-r--r--filter/source/config/cache/filtercache.cxx152
-rw-r--r--filter/source/config/cache/filtercache.hxx52
-rw-r--r--filter/source/config/cache/filterfactory.cxx68
-rw-r--r--filter/source/config/cache/filterfactory.hxx16
-rw-r--r--filter/source/config/cache/frameloaderfactory.cxx10
-rw-r--r--filter/source/config/cache/frameloaderfactory.hxx10
-rw-r--r--filter/source/config/cache/querytokenizer.cxx8
-rw-r--r--filter/source/config/cache/querytokenizer.hxx10
-rw-r--r--filter/source/config/cache/registration.cxx2
-rw-r--r--filter/source/config/cache/typedetection.cxx98
-rw-r--r--filter/source/config/cache/typedetection.hxx22
-rw-r--r--filter/source/flash/impswfdialog.cxx1
-rw-r--r--filter/source/flash/swfdialog.hxx4
-rw-r--r--filter/source/flash/swfexporter.hxx12
-rw-r--r--filter/source/flash/swffilter.cxx2
-rw-r--r--filter/source/flash/swfuno.cxx4
-rw-r--r--filter/source/flash/swfwriter1.cxx2
-rw-r--r--filter/source/flash/swfwriter2.cxx4
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx2
-rw-r--r--filter/source/graphicfilter/eos2met/eos2met.cxx10
-rw-r--r--filter/source/graphicfilter/epbm/epbm.cxx4
-rw-r--r--filter/source/graphicfilter/epgm/epgm.cxx4
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx8
-rw-r--r--filter/source/graphicfilter/eppm/eppm.cxx4
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx22
-rw-r--r--filter/source/graphicfilter/eras/eras.cxx2
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx2
-rw-r--r--filter/source/graphicfilter/expm/expm.cxx4
-rw-r--r--filter/source/graphicfilter/icgm/actimpr.cxx8
-rw-r--r--filter/source/graphicfilter/icgm/outact.hxx2
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.cxx8
-rw-r--r--filter/source/graphicfilter/idxf/dxfgrprd.cxx8
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx2
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx2
-rw-r--r--filter/source/msfilter/dffpropset.cxx4
-rw-r--r--filter/source/msfilter/eschesdo.cxx23
-rw-r--r--filter/source/msfilter/eschesdo.hxx4
-rw-r--r--filter/source/msfilter/mscodec.cxx20
-rw-r--r--filter/source/msfilter/mstoolbar.cxx92
-rw-r--r--filter/source/msfilter/services.cxx1
-rw-r--r--filter/source/msfilter/svdfppt.cxx40
-rw-r--r--filter/source/msfilter/util.cxx14
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx2
-rw-r--r--filter/source/pdf/impdialog.cxx4
-rw-r--r--filter/source/pdf/impdialog.hxx12
-rw-r--r--filter/source/pdf/pdfexport.cxx8
-rw-r--r--filter/source/placeware/exporter.cxx32
-rw-r--r--filter/source/placeware/exporter.hxx2
-rw-r--r--filter/source/placeware/filter.cxx1
-rw-r--r--filter/source/placeware/tempfile.cxx1
-rw-r--r--filter/source/placeware/tempfile.hxx8
-rw-r--r--filter/source/placeware/zip.cxx1
-rw-r--r--filter/source/placeware/zip.hxx2
-rw-r--r--filter/source/svg/gfxtypes.hxx6
-rw-r--r--filter/source/svg/svgdialog.hxx10
-rw-r--r--filter/source/svg/svgexport.cxx23
-rw-r--r--filter/source/svg/svgfilter.cxx11
-rw-r--r--filter/source/svg/svgfilter.hxx30
-rw-r--r--filter/source/svg/svgfontexport.cxx34
-rw-r--r--filter/source/svg/svgfontexport.hxx8
-rw-r--r--filter/source/svg/svgimport.cxx2
-rw-r--r--filter/source/svg/svgreader.cxx186
-rw-r--r--filter/source/svg/svgwriter.cxx167
-rw-r--r--filter/source/svg/svgwriter.hxx24
-rw-r--r--filter/source/svg/test/odfserializer.cxx26
-rw-r--r--filter/source/svg/test/svg2odf.cxx10
-rw-r--r--filter/source/svg/tokenmap.cxx4
-rw-r--r--filter/source/svg/tokenmap.hxx2
-rw-r--r--filter/source/svg/units.cxx4
-rw-r--r--filter/source/svg/units.hxx4
-rw-r--r--filter/source/t602/t602filter.cxx4
-rw-r--r--filter/source/t602/t602filter.hxx36
-rw-r--r--filter/source/textfilterdetect/filterdetect.cxx20
-rw-r--r--filter/source/textfilterdetect/filterdetect.hxx14
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx5
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx18
-rw-r--r--filter/source/xmlfilteradaptor/streamwrap.cxx2
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.cxx27
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.hxx14
-rw-r--r--filter/source/xsltdialog/typedetectionexport.cxx1
-rw-r--r--filter/source/xsltdialog/typedetectionexport.hxx4
-rw-r--r--filter/source/xsltdialog/typedetectionimport.cxx1
-rw-r--r--filter/source/xsltdialog/typedetectionimport.hxx52
-rw-r--r--filter/source/xsltdialog/xmlfiltercommon.hxx48
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx20
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx9
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.hxx20
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx6
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx14
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx3
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx6
-rw-r--r--filter/source/xsltfilter/LibXSLTTransformer.cxx4
-rw-r--r--filter/source/xsltfilter/OleHandler.cxx8
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx12
-rw-r--r--forms/source/component/Button.cxx28
-rw-r--r--forms/source/component/Button.hxx6
-rw-r--r--forms/source/component/CheckBox.cxx8
-rw-r--r--forms/source/component/CheckBox.hxx2
-rw-r--r--forms/source/component/Columns.cxx40
-rw-r--r--forms/source/component/Columns.hxx10
-rw-r--r--forms/source/component/ComboBox.cxx44
-rw-r--r--forms/source/component/ComboBox.hxx6
-rw-r--r--forms/source/component/Currency.cxx12
-rw-r--r--forms/source/component/Currency.hxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx236
-rw-r--r--forms/source/component/DatabaseForm.hxx70
-rw-r--r--forms/source/component/Date.cxx6
-rw-r--r--forms/source/component/Date.hxx2
-rw-r--r--forms/source/component/Edit.cxx40
-rw-r--r--forms/source/component/Edit.hxx4
-rw-r--r--forms/source/component/EditBase.cxx6
-rw-r--r--forms/source/component/EditBase.hxx2
-rw-r--r--forms/source/component/File.cxx10
-rw-r--r--forms/source/component/File.hxx4
-rw-r--r--forms/source/component/Filter.cxx98
-rw-r--r--forms/source/component/Filter.hxx26
-rw-r--r--forms/source/component/FixedText.cxx4
-rw-r--r--forms/source/component/FixedText.hxx2
-rw-r--r--forms/source/component/FormComponent.cxx90
-rw-r--r--forms/source/component/FormattedField.cxx30
-rw-r--r--forms/source/component/FormattedField.hxx6
-rw-r--r--forms/source/component/FormattedFieldWrapper.cxx12
-rw-r--r--forms/source/component/FormattedFieldWrapper.hxx8
-rw-r--r--forms/source/component/FormsCollection.cxx14
-rw-r--r--forms/source/component/FormsCollection.hxx6
-rw-r--r--forms/source/component/Grid.cxx32
-rw-r--r--forms/source/component/Grid.hxx10
-rw-r--r--forms/source/component/GroupBox.cxx6
-rw-r--r--forms/source/component/GroupBox.hxx2
-rw-r--r--forms/source/component/GroupManager.cxx22
-rw-r--r--forms/source/component/GroupManager.hxx18
-rw-r--r--forms/source/component/Hidden.cxx14
-rw-r--r--forms/source/component/Hidden.hxx4
-rw-r--r--forms/source/component/ImageButton.cxx16
-rw-r--r--forms/source/component/ImageButton.hxx2
-rw-r--r--forms/source/component/ImageControl.cxx36
-rw-r--r--forms/source/component/ImageControl.hxx8
-rw-r--r--forms/source/component/ListBox.cxx126
-rw-r--r--forms/source/component/ListBox.hxx18
-rw-r--r--forms/source/component/Numeric.cxx6
-rw-r--r--forms/source/component/Numeric.hxx2
-rw-r--r--forms/source/component/Pattern.cxx14
-rw-r--r--forms/source/component/Pattern.hxx2
-rw-r--r--forms/source/component/RadioButton.cxx20
-rw-r--r--forms/source/component/RadioButton.hxx4
-rw-r--r--forms/source/component/Time.cxx6
-rw-r--r--forms/source/component/Time.hxx2
-rw-r--r--forms/source/component/cachedrowset.cxx8
-rw-r--r--forms/source/component/cachedrowset.hxx4
-rw-r--r--forms/source/component/clickableimage.cxx40
-rw-r--r--forms/source/component/clickableimage.hxx16
-rw-r--r--forms/source/component/entrylisthelper.cxx4
-rw-r--r--forms/source/component/entrylisthelper.hxx4
-rw-r--r--forms/source/component/errorbroadcaster.cxx2
-rw-r--r--forms/source/component/errorbroadcaster.hxx2
-rw-r--r--forms/source/component/findpos.cxx8
-rw-r--r--forms/source/component/findpos.hxx4
-rw-r--r--forms/source/component/formcontrolfont.cxx6
-rw-r--r--forms/source/component/imgprod.cxx8
-rw-r--r--forms/source/component/imgprod.hxx4
-rw-r--r--forms/source/component/navigationbar.cxx24
-rw-r--r--forms/source/component/navigationbar.hxx16
-rw-r--r--forms/source/component/propertybaghelper.cxx22
-rw-r--r--forms/source/component/refvaluecomponent.cxx14
-rw-r--r--forms/source/component/refvaluecomponent.hxx14
-rw-r--r--forms/source/component/scrollbar.cxx12
-rw-r--r--forms/source/component/spinbutton.cxx10
-rw-r--r--forms/source/helper/commanddescriptionprovider.cxx12
-rw-r--r--forms/source/helper/commandimageprovider.cxx2
-rw-r--r--forms/source/helper/controlfeatureinterception.cxx4
-rw-r--r--forms/source/helper/formnavigation.cxx8
-rw-r--r--forms/source/helper/urltransformer.cxx6
-rw-r--r--forms/source/inc/FormComponent.hxx70
-rw-r--r--forms/source/inc/InterfaceContainer.hxx16
-rw-r--r--forms/source/inc/commanddescriptionprovider.hxx2
-rw-r--r--forms/source/inc/commandimageprovider.hxx2
-rw-r--r--forms/source/inc/controlfeatureinterception.hxx2
-rw-r--r--forms/source/inc/featuredispatcher.hxx2
-rw-r--r--forms/source/inc/formnavigation.hxx4
-rw-r--r--forms/source/inc/forms_module.hxx56
-rw-r--r--forms/source/inc/forms_module_impl.hxx22
-rw-r--r--forms/source/inc/frm_resource.hxx2
-rw-r--r--forms/source/inc/property.hxx10
-rw-r--r--forms/source/inc/propertybaghelper.hxx10
-rw-r--r--forms/source/inc/urltransformer.hxx2
-rw-r--r--forms/source/misc/InterfaceContainer.cxx44
-rw-r--r--forms/source/misc/limitedformats.cxx12
-rw-r--r--forms/source/misc/property.cxx4
-rw-r--r--forms/source/misc/services.cxx22
-rw-r--r--forms/source/resource/frm_resource.cxx4
-rw-r--r--forms/source/richtext/attributedispatcher.cxx4
-rw-r--r--forms/source/richtext/clipboarddispatcher.cxx6
-rw-r--r--forms/source/richtext/richtextcontrol.cxx46
-rw-r--r--forms/source/richtext/richtextcontrol.hxx16
-rw-r--r--forms/source/richtext/richtextmodel.cxx30
-rw-r--r--forms/source/richtext/richtextmodel.hxx10
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx4
-rw-r--r--forms/source/runtime/formoperations.cxx88
-rw-r--r--forms/source/runtime/formoperations.hxx10
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx22
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx12
-rw-r--r--forms/source/solar/control/navtoolbar.cxx18
-rw-r--r--forms/source/solar/inc/navtoolbar.hxx2
-rw-r--r--forms/source/xforms/NameContainer.hxx30
-rw-r--r--forms/source/xforms/binding.cxx12
-rw-r--r--forms/source/xforms/binding.hxx54
-rw-r--r--forms/source/xforms/boolexpression.cxx2
-rw-r--r--forms/source/xforms/boolexpression.hxx2
-rw-r--r--forms/source/xforms/computedexpression.cxx3
-rw-r--r--forms/source/xforms/computedexpression.hxx12
-rw-r--r--forms/source/xforms/convert.cxx42
-rw-r--r--forms/source/xforms/convert.hxx16
-rw-r--r--forms/source/xforms/datatyperepository.cxx26
-rw-r--r--forms/source/xforms/datatyperepository.hxx16
-rw-r--r--forms/source/xforms/datatypes.cxx122
-rw-r--r--forms/source/xforms/datatypes.hxx98
-rw-r--r--forms/source/xforms/datatypes_impl.hxx4
-rw-r--r--forms/source/xforms/mip.cxx14
-rw-r--r--forms/source/xforms/mip.hxx12
-rw-r--r--forms/source/xforms/model.cxx22
-rw-r--r--forms/source/xforms/model.hxx86
-rw-r--r--forms/source/xforms/model_helper.hxx12
-rw-r--r--forms/source/xforms/model_ui.cxx30
-rw-r--r--forms/source/xforms/namedcollection.hxx16
-rw-r--r--forms/source/xforms/pathexpression.cxx4
-rw-r--r--forms/source/xforms/pathexpression.hxx4
-rw-r--r--forms/source/xforms/propertysetbase.cxx4
-rw-r--r--forms/source/xforms/propertysetbase.hxx2
-rw-r--r--forms/source/xforms/resourcehelper.cxx1
-rw-r--r--forms/source/xforms/resourcehelper.hxx17
-rw-r--r--forms/source/xforms/submission.cxx22
-rw-r--r--forms/source/xforms/submission.hxx86
-rw-r--r--forms/source/xforms/submission/replace.cxx12
-rw-r--r--forms/source/xforms/submission/serialization.hxx4
-rw-r--r--forms/source/xforms/submission/serialization_urlencoded.cxx12
-rw-r--r--forms/source/xforms/submission/serialization_urlencoded.hxx2
-rw-r--r--forms/source/xforms/submission/submission.hxx8
-rw-r--r--forms/source/xforms/submission/submission_get.cxx5
-rw-r--r--forms/source/xforms/submission/submission_get.hxx2
-rw-r--r--forms/source/xforms/submission/submission_post.cxx3
-rw-r--r--forms/source/xforms/submission/submission_post.hxx2
-rw-r--r--forms/source/xforms/submission/submission_put.cxx3
-rw-r--r--forms/source/xforms/submission/submission_put.hxx2
-rw-r--r--forms/source/xforms/unohelper.cxx1
-rw-r--r--forms/source/xforms/xforms_services.cxx1
-rw-r--r--forms/source/xforms/xformsevent.cxx1
-rw-r--r--forms/source/xforms/xformsevent.hxx8
-rw-r--r--forms/source/xforms/xmlhelper.cxx1
-rw-r--r--forms/source/xforms/xmlhelper.hxx7
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx10
-rw-r--r--forms/source/xforms/xpathlib/extension.hxx4
-rw-r--r--forms/source/xforms/xpathlib/xpathlib.cxx26
-rw-r--r--formula/inc/formula/ExternalReferenceHelper.hxx2
-rw-r--r--formula/inc/formula/FormulaCompiler.hxx26
-rw-r--r--formula/inc/formula/FormulaOpCodeMapperObj.hxx12
-rw-r--r--formula/inc/formula/IFunctionDescription.hxx18
-rw-r--r--formula/inc/formula/formdata.hxx6
-rw-r--r--formula/inc/formula/formula.hxx4
-rw-r--r--formula/inc/formula/formulahelper.hxx6
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx64
-rw-r--r--formula/source/core/api/FormulaOpCodeMapperObj.cxx18
-rw-r--r--formula/source/core/api/token.cxx6
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx22
-rw-r--r--formula/source/ui/dlg/formula.cxx36
-rw-r--r--formula/source/ui/dlg/funcpage.cxx2
-rw-r--r--formula/source/ui/dlg/funcpage.hxx2
-rw-r--r--formula/source/ui/dlg/parawin.cxx2
-rw-r--r--fpicker/source/aqua/ControlHelper.hxx2
-rw-r--r--fpicker/source/aqua/NSString_OOoAdditions.hxx6
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.cxx48
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.hxx42
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx70
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.hxx32
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.cxx7
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.hxx24
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.cxx4
-rw-r--r--fpicker/source/win32/filepicker/PreviewCtrl.hxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx64
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.hxx36
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx4
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx60
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx48
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx44
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.hxx22
-rw-r--r--fpicker/source/win32/filepicker/asynceventnotifier.cxx6
-rw-r--r--fpicker/source/win32/filepicker/asyncrequests.hxx4
-rw-r--r--fpicker/source/win32/filepicker/controlaccess.cxx1
-rw-r--r--fpicker/source/win32/filepicker/controlcommand.cxx4
-rw-r--r--fpicker/source/win32/filepicker/controlcommand.hxx6
-rw-r--r--fpicker/source/win32/filepicker/controlcommandresult.hxx6
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.cxx1
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.cxx9
-rw-r--r--fpicker/source/win32/filepicker/filepickerstate.hxx24
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.cxx3
-rw-r--r--fpicker/source/win32/filepicker/helppopupwindow.hxx4
-rw-r--r--fpicker/source/win32/filepicker/previewbase.cxx1
-rw-r--r--fpicker/source/win32/filepicker/shared.hxx6
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx1
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.hxx16
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.cxx9
-rw-r--r--fpicker/source/win32/folderpicker/MtaFop.hxx30
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx1
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.hxx8
-rw-r--r--fpicker/source/win32/misc/AutoBuffer.cxx1
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.cxx14
-rw-r--r--fpicker/source/win32/misc/WinImplHelper.hxx4
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx1
-rw-r--r--fpicker/source/win32/misc/resourceprovider.hxx2
-rw-r--r--fpicker/test/svdem.cxx4
-rw-r--r--framework/inc/classes/actiontriggercontainer.hxx12
-rw-r--r--framework/inc/classes/actiontriggerpropertyset.hxx14
-rw-r--r--framework/inc/classes/actiontriggerseparatorpropertyset.hxx6
-rw-r--r--framework/inc/classes/converter.hxx4
-rw-r--r--framework/inc/classes/filtercache.hxx158
-rw-r--r--framework/inc/classes/filtercachedata.hxx136
-rw-r--r--framework/inc/classes/framecontainer.hxx4
-rw-r--r--framework/inc/classes/fwktabwindow.hxx12
-rw-r--r--framework/inc/classes/menumanager.hxx16
-rw-r--r--framework/inc/classes/propertysethelper.hxx22
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx12
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx20
-rw-r--r--framework/inc/classes/taskcreator.hxx2
-rw-r--r--framework/inc/classes/wildcard.hxx8
-rw-r--r--framework/inc/dispatch/closedispatcher.hxx4
-rw-r--r--framework/inc/dispatch/dispatchprovider.hxx8
-rw-r--r--framework/inc/dispatch/interceptionhelper.hxx8
-rw-r--r--framework/inc/dispatch/mailtodispatcher.hxx2
-rw-r--r--framework/inc/dispatch/menudispatcher.hxx6
-rw-r--r--framework/inc/dispatch/oxt_handler.hxx2
-rw-r--r--framework/inc/dispatch/popupmenudispatcher.hxx8
-rw-r--r--framework/inc/dispatch/servicehandler.hxx2
-rw-r--r--framework/inc/dispatch/startmoduledispatcher.hxx4
-rw-r--r--framework/inc/dispatch/systemexec.hxx2
-rw-r--r--framework/inc/framework/actiontriggerhelper.hxx2
-rw-r--r--framework/inc/framework/addonmenu.hxx20
-rw-r--r--framework/inc/framework/eventsconfiguration.hxx2
-rw-r--r--framework/inc/framework/imageproducer.hxx4
-rw-r--r--framework/inc/framework/interaction.hxx4
-rw-r--r--framework/inc/framework/menuextensionsupplier.hxx4
-rw-r--r--framework/inc/framework/sfxhelperfunctions.hxx20
-rw-r--r--framework/inc/framework/titlehelper.hxx18
-rw-r--r--framework/inc/framework/undomanagerhelper.hxx10
-rw-r--r--framework/inc/helper/mischelper.hxx12
-rw-r--r--framework/inc/helper/networkdomain.hxx4
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx14
-rw-r--r--framework/inc/helper/statusindicator.hxx4
-rw-r--r--framework/inc/helper/statusindicatorfactory.hxx8
-rw-r--r--framework/inc/helper/titlebarupdate.hxx4
-rw-r--r--framework/inc/helper/uiconfigelementwrapperbase.hxx4
-rw-r--r--framework/inc/helper/uielementwrapperbase.hxx4
-rw-r--r--framework/inc/helper/vclstatusindicator.hxx6
-rw-r--r--framework/inc/jobs/configaccess.hxx4
-rw-r--r--framework/inc/jobs/helponstartup.hxx18
-rw-r--r--framework/inc/jobs/jobconst.hxx6
-rw-r--r--framework/inc/jobs/jobdata.hxx38
-rw-r--r--framework/inc/jobs/jobdispatch.hxx10
-rw-r--r--framework/inc/jobs/jobexecutor.hxx2
-rw-r--r--framework/inc/jobs/joburl.hxx34
-rw-r--r--framework/inc/jobs/shelljob.hxx6
-rw-r--r--framework/inc/macros/debug/assertion.hxx8
-rw-r--r--framework/inc/macros/debug/event.hxx4
-rw-r--r--framework/inc/macros/debug/filterdbg.hxx4
-rw-r--r--framework/inc/macros/debug/logmechanism.hxx4
-rw-r--r--framework/inc/macros/debug/mutex.hxx2
-rw-r--r--framework/inc/macros/debug/plugin.hxx8
-rw-r--r--framework/inc/macros/debug/registration.hxx2
-rw-r--r--framework/inc/macros/registration.hxx2
-rw-r--r--framework/inc/macros/xserviceinfo.hxx22
-rw-r--r--framework/inc/protocols.h4
-rw-r--r--framework/inc/recording/dispatchrecorder.hxx8
-rw-r--r--framework/inc/services/autorecovery.hxx48
-rw-r--r--framework/inc/services/backingcomp.hxx10
-rw-r--r--framework/inc/services/contenthandlerfactory.hxx26
-rw-r--r--framework/inc/services/desktop.hxx18
-rw-r--r--framework/inc/services/dispatchhelper.hxx4
-rw-r--r--framework/inc/services/frame.hxx24
-rw-r--r--framework/inc/services/layoutmanager.hxx80
-rw-r--r--framework/inc/services/licensedlg.hxx2
-rw-r--r--framework/inc/services/logindialog.hxx76
-rw-r--r--framework/inc/services/mediatypedetectionhelper.hxx2
-rw-r--r--framework/inc/services/modulemanager.hxx24
-rw-r--r--framework/inc/services/pathsettings.hxx20
-rw-r--r--framework/inc/services/substitutepathvars.hxx90
-rw-r--r--framework/inc/services/tabwindowservice.hxx6
-rw-r--r--framework/inc/services/taskcreatorsrv.hxx4
-rw-r--r--framework/inc/services/uriabbreviation.hxx2
-rw-r--r--framework/inc/services/urltransformer.hxx4
-rw-r--r--framework/inc/stdtypes.h24
-rw-r--r--framework/inc/tabwin/tabwindow.hxx6
-rw-r--r--framework/inc/uiconfiguration/graphicnameaccess.hxx10
-rw-r--r--framework/inc/uiconfiguration/imagemanager.hxx12
-rw-r--r--framework/inc/uiconfiguration/imagetype.hxx14
-rw-r--r--framework/inc/uiconfiguration/moduleimagemanager.hxx12
-rw-r--r--framework/inc/uiconfiguration/moduleuicfgsupplier.hxx8
-rw-r--r--framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx40
-rw-r--r--framework/inc/uiconfiguration/uicategorydescription.hxx2
-rw-r--r--framework/inc/uiconfiguration/uiconfigurationmanager.hxx34
-rw-r--r--framework/inc/uiconfiguration/windowstateconfiguration.hxx20
-rw-r--r--framework/inc/uielement/addonstoolbarmanager.hxx2
-rw-r--r--framework/inc/uielement/buttontoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/comboboxtoolbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/complextoolbarcontroller.hxx10
-rw-r--r--framework/inc/uielement/constitemcontainer.hxx14
-rw-r--r--framework/inc/uielement/controlmenucontroller.hxx6
-rw-r--r--framework/inc/uielement/dropdownboxtoolbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/edittoolbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/fontmenucontroller.hxx4
-rw-r--r--framework/inc/uielement/fontsizemenucontroller.hxx2
-rw-r--r--framework/inc/uielement/footermenucontroller.hxx10
-rw-r--r--framework/inc/uielement/generictoolbarcontroller.hxx10
-rw-r--r--framework/inc/uielement/imagebuttontoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/langselectionmenucontroller.hxx14
-rw-r--r--framework/inc/uielement/langselectionstatusbarcontroller.hxx6
-rw-r--r--framework/inc/uielement/logotextstatusbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/macrosmenucontroller.hxx2
-rw-r--r--framework/inc/uielement/menubarmanager.hxx32
-rw-r--r--framework/inc/uielement/menubarmerger.hxx42
-rw-r--r--framework/inc/uielement/menubarwrapper.hxx6
-rw-r--r--framework/inc/uielement/newmenucontroller.hxx12
-rw-r--r--framework/inc/uielement/progressbarwrapper.hxx6
-rw-r--r--framework/inc/uielement/recentfilesmenucontroller.hxx8
-rw-r--r--framework/inc/uielement/rootitemcontainer.hxx2
-rw-r--r--framework/inc/uielement/simpletextstatusbarcontroller.hxx2
-rw-r--r--framework/inc/uielement/spinfieldtoolbarcontroller.hxx6
-rw-r--r--framework/inc/uielement/statusbarmanager.hxx8
-rw-r--r--framework/inc/uielement/statusindicatorinterfacewrapper.hxx4
-rw-r--r--framework/inc/uielement/togglebuttontoolbarcontroller.hxx6
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx22
-rw-r--r--framework/inc/uielement/toolbarmerger.hxx56
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx14
-rw-r--r--framework/inc/uielement/toolbarwrapper.hxx2
-rw-r--r--framework/inc/uielement/uicommanddescription.hxx24
-rw-r--r--framework/inc/uielement/uielement.hxx10
-rw-r--r--framework/inc/uifactory/addonstoolboxfactory.hxx2
-rw-r--r--framework/inc/uifactory/factoryconfiguration.hxx34
-rw-r--r--framework/inc/uifactory/menubarfactory.hxx4
-rw-r--r--framework/inc/uifactory/statusbarfactory.hxx2
-rw-r--r--framework/inc/uifactory/toolbarcontrollerfactory.hxx12
-rw-r--r--framework/inc/uifactory/toolboxfactory.hxx2
-rw-r--r--framework/inc/uifactory/uielementfactorymanager.hxx36
-rw-r--r--framework/inc/uifactory/windowcontentfactorymanager.hxx2
-rw-r--r--framework/inc/xml/acceleratorconfigurationreader.hxx18
-rw-r--r--framework/inc/xml/acceleratorconfigurationwriter.hxx2
-rw-r--r--framework/inc/xml/imagesdocumenthandler.hxx30
-rw-r--r--framework/inc/xml/menudocumenthandler.hxx58
-rw-r--r--framework/inc/xml/saxnamespacefilter.hxx18
-rw-r--r--framework/inc/xml/statusbardocumenthandler.hxx32
-rw-r--r--framework/inc/xml/toolboxdocumenthandler.hxx44
-rw-r--r--framework/inc/xml/xmlnamespaces.hxx14
-rw-r--r--framework/source/accelerators/acceleratorcache.cxx18
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx162
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx4
-rw-r--r--framework/source/accelerators/keymapping.cxx10
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx6
-rw-r--r--framework/source/accelerators/presethandler.cxx122
-rw-r--r--framework/source/accelerators/storageholder.cxx72
-rw-r--r--framework/source/classes/droptargetlistener.cxx2
-rw-r--r--framework/source/classes/framecontainer.cxx4
-rw-r--r--framework/source/classes/fwktabwindow.cxx14
-rw-r--r--framework/source/classes/taskcreator.cxx14
-rw-r--r--framework/source/dispatch/closedispatcher.cxx8
-rw-r--r--framework/source/dispatch/dispatchinformationprovider.cxx2
-rw-r--r--framework/source/dispatch/dispatchprovider.cxx10
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx4
-rw-r--r--framework/source/dispatch/loaddispatcher.cxx2
-rw-r--r--framework/source/dispatch/mailtodispatcher.cxx4
-rw-r--r--framework/source/dispatch/menudispatcher.cxx1
-rw-r--r--framework/source/dispatch/oxt_handler.cxx12
-rw-r--r--framework/source/dispatch/servicehandler.cxx8
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx2
-rw-r--r--framework/source/dispatch/systemexec.cxx8
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx8
-rw-r--r--framework/source/fwe/classes/framelistanalyzer.cxx4
-rw-r--r--framework/source/fwe/classes/sfxhelperfunctions.cxx10
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx26
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx1
-rw-r--r--framework/source/fwe/helper/configimporter.cxx4
-rw-r--r--framework/source/fwe/helper/imageproducer.cxx2
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx1
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx2
-rw-r--r--framework/source/fwi/classes/converter.cxx6
-rw-r--r--framework/source/fwi/classes/propertysethelper.cxx18
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx18
-rw-r--r--framework/source/fwi/helper/mischelper.cxx11
-rw-r--r--framework/source/fwi/helper/networkdomain.cxx30
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx2
-rw-r--r--framework/source/fwi/threadhelp/lockhelper.cxx4
-rw-r--r--framework/source/helper/oframes.cxx1
-rw-r--r--framework/source/helper/persistentwindowstate.cxx52
-rw-r--r--framework/source/helper/statusindicator.cxx4
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx20
-rw-r--r--framework/source/helper/titlebarupdate.cxx28
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx21
-rw-r--r--framework/source/helper/uielementwrapperbase.cxx9
-rw-r--r--framework/source/helper/vclstatusindicator.cxx8
-rw-r--r--framework/source/inc/accelerators/acceleratorcache.hxx12
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx32
-rw-r--r--framework/source/inc/accelerators/globalacceleratorconfiguration.hxx2
-rw-r--r--framework/source/inc/accelerators/istoragelistener.hxx2
-rw-r--r--framework/source/inc/accelerators/keymapping.hxx8
-rw-r--r--framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx4
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx42
-rw-r--r--framework/source/inc/accelerators/storageholder.hxx32
-rw-r--r--framework/source/inc/dispatch/loaddispatcher.hxx4
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx2
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx14
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx4
-rw-r--r--framework/source/inc/loadenv/targethelper.hxx4
-rw-r--r--framework/source/inc/pattern/configuration.hxx10
-rw-r--r--framework/source/inc/pattern/window.hxx10
-rw-r--r--framework/source/jobs/helponstartup.cxx92
-rw-r--r--framework/source/jobs/job.cxx18
-rw-r--r--framework/source/jobs/jobdata.cxx102
-rw-r--r--framework/source/jobs/jobdispatch.cxx12
-rw-r--r--framework/source/jobs/jobexecutor.cxx20
-rw-r--r--framework/source/jobs/joburl.cxx64
-rw-r--r--framework/source/jobs/shelljob.cxx28
-rw-r--r--framework/source/layoutmanager/helpers.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx138
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx72
-rw-r--r--framework/source/loadenv/loadenv.cxx82
-rw-r--r--framework/source/loadenv/targethelper.cxx4
-rw-r--r--framework/source/recording/dispatchrecorder.cxx44
-rw-r--r--framework/source/services/autorecovery.cxx262
-rw-r--r--framework/source/services/backingcomp.cxx26
-rw-r--r--framework/source/services/backingwindow.hxx8
-rw-r--r--framework/source/services/desktop.cxx26
-rw-r--r--framework/source/services/dispatchhelper.cxx6
-rw-r--r--framework/source/services/frame.cxx32
-rw-r--r--framework/source/services/license.cxx58
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx2
-rw-r--r--framework/source/services/modulemanager.cxx64
-rw-r--r--framework/source/services/sessionlistener.cxx2
-rw-r--r--framework/source/services/tabwindowservice.cxx10
-rw-r--r--framework/source/services/uriabbreviation.cxx4
-rw-r--r--framework/source/services/urltransformer.cxx26
-rw-r--r--framework/source/tabwin/tabwindow.cxx1
-rw-r--r--framework/source/tabwin/tabwinfactory.cxx1
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx1
-rw-r--r--framework/source/uiconfiguration/graphicnameaccess.cxx10
-rw-r--r--framework/source/uiconfiguration/imagemanager.cxx13
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx71
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx52
-rw-r--r--framework/source/uiconfiguration/moduleimagemanager.cxx13
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx45
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx66
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx48
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx124
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx8
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx26
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx6
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx28
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx22
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx30
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx1
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx1
-rw-r--r--framework/source/uielement/logoimagestatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/logotextstatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx18
-rw-r--r--framework/source/uielement/menubarmanager.cxx104
-rw-r--r--framework/source/uielement/menubarmerger.cxx42
-rw-r--r--framework/source/uielement/menubarwrapper.cxx10
-rw-r--r--framework/source/uielement/newmenucontroller.cxx18
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx6
-rw-r--r--framework/source/uielement/popupmenucontroller.cxx1
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx8
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx18
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/statusindicatorinterfacewrapper.cxx4
-rw-r--r--framework/source/uielement/toolbarmanager.cxx141
-rw-r--r--framework/source/uielement/toolbarmerger.cxx42
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx4
-rw-r--r--framework/source/uielement/uicommanddescription.cxx150
-rw-r--r--framework/source/uifactory/statusbarfactory.cxx2
-rw-r--r--framework/source/uifactory/toolboxfactory.cxx2
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx30
-rw-r--r--framework/source/xml/acceleratorconfigurationwriter.cxx28
-rw-r--r--helpcompiler/inc/HelpCompiler.hxx34
-rw-r--r--helpcompiler/inc/HelpIndexer.hxx26
-rw-r--r--helpcompiler/inc/HelpLinker.hxx2
-rw-r--r--helpcompiler/inc/HelpSearch.hxx10
-rw-r--r--helpcompiler/inc/compilehelp.hxx14
-rw-r--r--helpcompiler/source/HelpCompiler.cxx2
-rw-r--r--helpcompiler/source/HelpIndexer.cxx44
-rw-r--r--helpcompiler/source/HelpIndexer_main.cxx12
-rw-r--r--helpcompiler/source/HelpLinker.cxx56
-rw-r--r--helpcompiler/source/HelpSearch.cxx10
-rw-r--r--helpcompiler/source/LuceneHelper.cxx8
-rw-r--r--helpcompiler/source/LuceneHelper.hxx4
-rw-r--r--hwpfilter/qa/cppunit/test_hwpfilter.cxx16
-rw-r--r--hwpfilter/source/hwpreader.hxx2
-rw-r--r--i18nlangtag/source/isolang/inunx.cxx2
-rw-r--r--i18nlangtag/source/languagetag/languagetag.cxx5
-rw-r--r--i18npool/inc/breakiteratorImpl.hxx50
-rw-r--r--i18npool/inc/breakiterator_cjk.hxx10
-rw-r--r--i18npool/inc/breakiterator_ctl.hxx10
-rw-r--r--i18npool/inc/breakiterator_th.hxx2
-rw-r--r--i18npool/inc/breakiterator_unicode.hxx26
-rw-r--r--i18npool/inc/calendarImpl.hxx20
-rw-r--r--i18npool/inc/calendar_gregorian.hxx22
-rw-r--r--i18npool/inc/calendar_jewish.hxx2
-rw-r--r--i18npool/inc/cclass_unicode.hxx50
-rw-r--r--i18npool/inc/chaptercollator.hxx12
-rw-r--r--i18npool/inc/characterclassificationImpl.hxx40
-rw-r--r--i18npool/inc/collatorImpl.hxx36
-rw-r--r--i18npool/inc/collator_unicode.hxx20
-rw-r--r--i18npool/inc/defaultnumberingprovider.hxx24
-rw-r--r--i18npool/inc/indexentrysupplier.hxx36
-rw-r--r--i18npool/inc/indexentrysupplier_asian.hxx14
-rw-r--r--i18npool/inc/indexentrysupplier_common.hxx34
-rw-r--r--i18npool/inc/indexentrysupplier_default.hxx30
-rw-r--r--i18npool/inc/indexentrysupplier_ja_phonetic.hxx16
-rw-r--r--i18npool/inc/inputsequencechecker.hxx10
-rw-r--r--i18npool/inc/inputsequencechecker_hi.hxx4
-rw-r--r--i18npool/inc/inputsequencechecker_th.hxx4
-rw-r--r--i18npool/inc/localedata.hxx42
-rw-r--r--i18npool/inc/nativenumbersupplier.hxx10
-rw-r--r--i18npool/inc/numberformatcode.hxx14
-rw-r--r--i18npool/inc/ordinalsuffix.hxx8
-rw-r--r--i18npool/inc/textToPronounce_zh.hxx8
-rw-r--r--i18npool/inc/textconversion.hxx42
-rw-r--r--i18npool/inc/textconversionImpl.hxx16
-rw-r--r--i18npool/inc/transliterationImpl.hxx44
-rw-r--r--i18npool/inc/transliteration_Ignore.hxx28
-rw-r--r--i18npool/inc/transliteration_Numeric.hxx18
-rw-r--r--i18npool/inc/transliteration_OneToOne.hxx20
-rw-r--r--i18npool/inc/transliteration_body.hxx18
-rw-r--r--i18npool/inc/transliteration_caseignore.hxx20
-rw-r--r--i18npool/inc/transliteration_commonclass.hxx38
-rw-r--r--i18npool/inc/unoscripttypedetector.hxx18
-rw-r--r--i18npool/inc/xdictionary.hxx8
-rw-r--r--i18npool/qa/cppunit/test_breakiterator.cxx160
-rw-r--r--i18npool/qa/cppunit/test_characterclassification.cxx20
-rw-r--r--i18npool/source/breakiterator/xdictionary.cxx4
-rw-r--r--i18npool/source/calendar/calendarImpl.cxx1
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx3
-rw-r--r--i18npool/source/calendar/calendar_jewish.cxx1
-rw-r--r--i18npool/source/characterclassification/characterclassificationImpl.cxx4
-rw-r--r--i18npool/source/characterclassification/unoscripttypedetector.cxx22
-rw-r--r--i18npool/source/collator/chaptercollator.cxx2
-rw-r--r--i18npool/source/collator/collatorImpl.cxx2
-rw-r--r--i18npool/source/collator/collator_unicode.cxx2
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx2
-rw-r--r--i18npool/source/inputchecker/inputsequencechecker_hi.cxx1
-rw-r--r--i18npool/source/inputchecker/inputsequencechecker_th.cxx1
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx74
-rw-r--r--i18npool/source/localedata/LocaleNode.hxx32
-rw-r--r--i18npool/source/localedata/filewriter.cxx26
-rw-r--r--i18npool/source/localedata/localedata.cxx2
-rw-r--r--i18npool/source/nativenumber/nativenumbersupplier.cxx2
-rw-r--r--i18npool/source/numberformatcode/numberformatcode.cxx50
-rw-r--r--i18npool/source/ordinalsuffix/ordinalsuffix.cxx2
-rw-r--r--i18npool/source/registerservices/registerservices.cxx6
-rw-r--r--i18npool/source/search/textsearch.hxx32
-rw-r--r--i18npool/source/textconversion/textconversion.cxx1
-rw-r--r--i18npool/source/textconversion/textconversionImpl.cxx1
-rw-r--r--i18npool/source/textconversion/textconversion_ko.cxx2
-rw-r--r--i18npool/source/textconversion/textconversion_zh.cxx1
-rw-r--r--i18npool/source/transliteration/fullwidthToHalfwidth.cxx1
-rw-r--r--i18npool/source/transliteration/halfwidthToFullwidth.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreKana.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreSize_ja_JP.cxx1
-rw-r--r--i18npool/source/transliteration/ignoreWidth.cxx1
-rw-r--r--i18npool/source/transliteration/textToPronounce_zh.cxx2
-rw-r--r--i18npool/source/transliteration/transliterationImpl.cxx3
-rw-r--r--i18npool/source/transliteration/transliteration_Ignore.cxx1
-rw-r--r--i18npool/source/transliteration/transliteration_Numeric.cxx1
-rw-r--r--i18npool/source/transliteration/transliteration_OneToOne.cxx1
-rw-r--r--i18npool/source/transliteration/transliteration_body.cxx6
-rw-r--r--i18npool/source/transliteration/transliteration_caseignore.cxx16
-rw-r--r--i18nutil/inc/i18nutil/paper.hxx4
-rw-r--r--i18nutil/inc/i18nutil/scripttypedetector.hxx12
-rw-r--r--i18nutil/inc/i18nutil/widthfolding.hxx4
-rw-r--r--i18nutil/source/utility/paper.cxx12
-rw-r--r--i18nutil/source/utility/scripttypedetector.cxx12
-rw-r--r--i18nutil/source/utility/widthfolding.cxx1
-rw-r--r--idl/inc/basobj.hxx4
-rw-r--r--idl/inc/bastype.hxx14
-rw-r--r--idl/inc/command.hxx2
-rw-r--r--idl/inc/database.hxx32
-rw-r--r--idl/inc/hash.hxx22
-rw-r--r--idl/inc/lex.hxx16
-rw-r--r--idl/inc/module.hxx8
-rw-r--r--idl/inc/object.hxx16
-rw-r--r--idl/inc/slot.hxx32
-rw-r--r--idl/inc/types.hxx52
-rw-r--r--idl/source/cmptools/hash.cxx14
-rw-r--r--idl/source/cmptools/lex.cxx18
-rw-r--r--idl/source/objects/basobj.cxx8
-rw-r--r--idl/source/objects/bastype.cxx12
-rw-r--r--idl/source/objects/module.cxx20
-rw-r--r--idl/source/objects/object.cxx18
-rw-r--r--idl/source/objects/slot.cxx88
-rw-r--r--idl/source/objects/types.cxx96
-rw-r--r--idl/source/prj/command.cxx24
-rw-r--r--idl/source/prj/database.cxx68
-rw-r--r--idl/source/prj/globals.cxx2
-rw-r--r--idl/source/prj/svidl.cxx40
-rw-r--r--idlc/inc/idlc/astarray.hxx4
-rw-r--r--idlc/inc/idlc/astattribute.hxx14
-rw-r--r--idlc/inc/idlc/astbasetype.hxx2
-rw-r--r--idlc/inc/idlc/astconstant.hxx4
-rw-r--r--idlc/inc/idlc/astconstants.hxx2
-rw-r--r--idlc/inc/idlc/astdeclaration.hxx28
-rw-r--r--idlc/inc/idlc/astenum.hxx2
-rw-r--r--idlc/inc/idlc/astexception.hxx2
-rw-r--r--idlc/inc/idlc/astexpression.hxx16
-rw-r--r--idlc/inc/idlc/astinterface.hxx12
-rw-r--r--idlc/inc/idlc/astinterfacemember.hxx2
-rw-r--r--idlc/inc/idlc/astmember.hxx4
-rw-r--r--idlc/inc/idlc/astmodule.hxx4
-rw-r--r--idlc/inc/idlc/astneeds.hxx2
-rw-r--r--idlc/inc/idlc/astobserves.hxx2
-rw-r--r--idlc/inc/idlc/astoperation.hxx2
-rw-r--r--idlc/inc/idlc/astparameter.hxx2
-rw-r--r--idlc/inc/idlc/astscope.hxx8
-rw-r--r--idlc/inc/idlc/astsequence.hxx4
-rw-r--r--idlc/inc/idlc/astservice.hxx4
-rw-r--r--idlc/inc/idlc/astservicemember.hxx2
-rw-r--r--idlc/inc/idlc/aststruct.hxx8
-rw-r--r--idlc/inc/idlc/asttype.hxx2
-rw-r--r--idlc/inc/idlc/asttypedef.hxx2
-rw-r--r--idlc/inc/idlc/astunion.hxx2
-rw-r--r--idlc/inc/idlc/astunionbranch.hxx2
-rw-r--r--idlc/inc/idlc/errorhandler.hxx12
-rw-r--r--idlc/inc/idlc/fehelper.hxx20
-rw-r--r--idlc/inc/idlc/idlc.hxx48
-rw-r--r--idlc/inc/idlc/idlctypes.hxx14
-rw-r--r--idlc/inc/idlc/inheritedinterface.hxx6
-rw-r--r--idlc/inc/idlc/options.hxx20
-rw-r--r--idlc/source/astconstant.cxx4
-rw-r--r--idlc/source/astdeclaration.cxx2
-rw-r--r--idlc/source/astdump.cxx26
-rw-r--r--idlc/source/astenum.cxx2
-rw-r--r--idlc/source/astexpression.cxx2
-rw-r--r--idlc/source/astinterface.cxx10
-rw-r--r--idlc/source/astoperation.cxx6
-rw-r--r--idlc/source/aststruct.cxx8
-rw-r--r--idlc/source/aststructinstance.cxx4
-rw-r--r--idlc/source/astunion.cxx4
-rw-r--r--idlc/source/attributeexceptions.hxx2
-rw-r--r--idlc/source/errorhandler.cxx10
-rw-r--r--idlc/source/fehelper.cxx6
-rw-r--r--idlc/source/idlc.cxx10
-rw-r--r--idlc/source/idlccompile.cxx12
-rw-r--r--idlc/source/idlcmain.cxx2
-rw-r--r--idlc/source/options.cxx2
-rw-r--r--javaunohelper/source/bootstrap.cxx10
-rw-r--r--javaunohelper/source/javaunohelper.cxx6
-rw-r--r--javaunohelper/source/preload.cxx1
-rw-r--r--javaunohelper/source/vm.cxx10
-rw-r--r--jvmaccess/inc/jvmaccess/classpath.hxx12
-rw-r--r--jvmaccess/source/classpath.cxx12
-rw-r--r--jvmaccess/workbench/javainfo/javainfotest.cxx3
-rw-r--r--jvmfwk/inc/jvmfwk/framework.h2
-rw-r--r--jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx19
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx9
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx3
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx51
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx9
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx30
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.hxx32
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx3
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx26
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx4
-rw-r--r--jvmfwk/source/elements.cxx134
-rw-r--r--jvmfwk/source/elements.hxx56
-rw-r--r--jvmfwk/source/framework.cxx68
-rw-r--r--jvmfwk/source/framework.hxx8
-rw-r--r--jvmfwk/source/fwkbase.cxx155
-rw-r--r--jvmfwk/source/fwkbase.hxx36
-rw-r--r--jvmfwk/source/fwkutil.cxx51
-rw-r--r--jvmfwk/source/fwkutil.hxx24
-rw-r--r--jvmfwk/source/libxmlutil.cxx16
-rw-r--r--jvmfwk/source/libxmlutil.hxx6
-rw-r--r--l10ntools/inc/cfgmerge.hxx66
-rw-r--r--l10ntools/inc/export.hxx126
-rw-r--r--l10ntools/inc/helpmerge.hxx14
-rw-r--r--l10ntools/inc/lngmerge.hxx14
-rw-r--r--l10ntools/inc/xmlparse.hxx102
-rw-r--r--l10ntools/inc/xrmmerge.hxx76
-rw-r--r--l10ntools/source/cfgmerge.cxx102
-rw-r--r--l10ntools/source/export.cxx290
-rw-r--r--l10ntools/source/helpmerge.cxx52
-rw-r--r--l10ntools/source/lngmerge.cxx62
-rw-r--r--l10ntools/source/merge.cxx70
-rw-r--r--l10ntools/source/uimerge.cxx24
-rw-r--r--l10ntools/source/xmlparse.cxx178
-rw-r--r--l10ntools/source/xrmmerge.cxx140
-rw-r--r--lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx19
-rw-r--r--lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx6
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx16
-rw-r--r--lingucomponent/source/lingutil/lingutil.cxx16
-rw-r--r--lingucomponent/source/lingutil/lingutil.hxx6
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx3
-rw-r--r--lingucomponent/source/spellcheck/spell/sspellimp.cxx15
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.cxx1
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.hxx14
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx15
-rw-r--r--linguistic/inc/iprcache.hxx6
-rw-r--r--linguistic/inc/linguistic/hyphdta.hxx44
-rw-r--r--linguistic/inc/linguistic/lngprophelp.hxx6
-rw-r--r--linguistic/inc/linguistic/misc.hxx18
-rw-r--r--linguistic/inc/linguistic/spelldta.hxx36
-rw-r--r--linguistic/source/convdic.cxx3
-rw-r--r--linguistic/source/convdic.hxx50
-rw-r--r--linguistic/source/convdiclist.cxx15
-rw-r--r--linguistic/source/convdiclist.hxx16
-rw-r--r--linguistic/source/convdicxml.cxx5
-rw-r--r--linguistic/source/convdicxml.hxx10
-rw-r--r--linguistic/source/defs.hxx18
-rw-r--r--linguistic/source/dicimp.cxx39
-rw-r--r--linguistic/source/dicimp.hxx54
-rw-r--r--linguistic/source/dlistimp.cxx55
-rw-r--r--linguistic/source/dlistimp.hxx18
-rw-r--r--linguistic/source/gciterator.cxx7
-rw-r--r--linguistic/source/gciterator.hxx28
-rw-r--r--linguistic/source/hhconvdic.cxx1
-rw-r--r--linguistic/source/hhconvdic.hxx14
-rw-r--r--linguistic/source/hyphdsp.cxx2
-rw-r--r--linguistic/source/hyphdsp.hxx12
-rw-r--r--linguistic/source/hyphdta.cxx9
-rw-r--r--linguistic/source/iprcache.cxx5
-rw-r--r--linguistic/source/lngopt.cxx1
-rw-r--r--linguistic/source/lngopt.hxx30
-rw-r--r--linguistic/source/lngprophelp.cxx5
-rw-r--r--linguistic/source/lngsvcmgr.cxx27
-rw-r--r--linguistic/source/lngsvcmgr.hxx22
-rw-r--r--linguistic/source/misc.cxx3
-rw-r--r--linguistic/source/misc2.cxx24
-rw-r--r--linguistic/source/spelldsp.cxx1
-rw-r--r--linguistic/source/spelldsp.hxx16
-rw-r--r--linguistic/source/spelldta.cxx3
-rw-r--r--linguistic/source/thesdsp.cxx1
-rw-r--r--linguistic/source/thesdsp.hxx6
-rw-r--r--linguistic/workben/sprophelp.cxx3
-rw-r--r--linguistic/workben/sspellimp.cxx5
-rw-r--r--linguistic/workben/sspellimp.hxx2
-rw-r--r--lotuswordpro/qa/cppunit/test_lotuswordpro.cxx12
-rw-r--r--lotuswordpro/source/filter/LotusWordProImportFilter.cxx8
-rw-r--r--lotuswordpro/source/filter/LotusWordProImportFilter.hxx16
-rw-r--r--lotuswordpro/source/filter/lwp9reader.cxx6
-rw-r--r--lotuswordpro/source/filter/lwpbulletstylemgr.cxx18
-rw-r--r--lotuswordpro/source/filter/lwpbulletstylemgr.hxx8
-rw-r--r--lotuswordpro/source/filter/lwpdivinfo.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpdocdata.cxx8
-rw-r--r--lotuswordpro/source/filter/lwpdocdata.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpdrawobj.cxx72
-rw-r--r--lotuswordpro/source/filter/lwpdrawobj.hxx80
-rw-r--r--lotuswordpro/source/filter/lwpfilter.cxx17
-rw-r--r--lotuswordpro/source/filter/lwpfilter.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpfrib.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpfribmark.cxx24
-rw-r--r--lotuswordpro/source/filter/lwpfribptr.cxx4
-rw-r--r--lotuswordpro/source/filter/lwpglobalmgr.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpgrfobj.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpnumericfmt.cxx12
-rw-r--r--lotuswordpro/source/filter/lwpnumericfmt.hxx80
-rw-r--r--lotuswordpro/source/filter/lwpobjid.hxx6
-rw-r--r--lotuswordpro/source/filter/lwpoleobject.hxx2
-rw-r--r--lotuswordpro/source/filter/lwppara.cxx2
-rw-r--r--lotuswordpro/source/filter/lwppara.hxx34
-rw-r--r--lotuswordpro/source/filter/lwppara1.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpsilverbullet.cxx50
-rw-r--r--lotuswordpro/source/filter/lwpsilverbullet.hxx24
-rw-r--r--lotuswordpro/source/filter/lwpstory.cxx4
-rw-r--r--lotuswordpro/source/filter/lwpstory.hxx8
-rw-r--r--lotuswordpro/source/filter/lwptblformula.cxx60
-rw-r--r--lotuswordpro/source/filter/lwptblformula.hxx16
-rw-r--r--lotuswordpro/source/filter/lwptoc.cxx2
-rw-r--r--lotuswordpro/source/filter/lwptoc.hxx2
-rw-r--r--lotuswordpro/source/filter/lwptools.cxx22
-rw-r--r--lotuswordpro/source/filter/lwptools.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/ixfattrlist.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/ixfcontent.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/ixfstream.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/ixfstyle.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfannotation.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx18
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbase64.cxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbase64.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbgimage.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbgimage.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfbookmark.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfborders.cxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfborders.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcell.cxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcell.hxx14
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcellstyle.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcellstyle.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfchange.hxx28
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcolor.cxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcolor.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcontent.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfcrossref.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdate.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdatestyle.hxx16
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdocfield.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdocfield.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawline.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawobj.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawobj.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpath.cxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpath.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfdropcap.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfendnote.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfentry.hxx26
-rw-r--r--lotuswordpro/source/filter/xfilter/xffont.cxx16
-rw-r--r--lotuswordpro/source/filter/xfilter/xffont.hxx18
-rw-r--r--lotuswordpro/source/filter/xfilter/xffontdecl.cxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xffontdecl.hxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xffootnote.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx54
-rw-r--r--lotuswordpro/source/filter/xfilter/xfframe.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfframestyle.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfglobal.cxx14
-rw-r--r--lotuswordpro/source/filter/xfilter/xfglobal.hxx14
-rw-r--r--lotuswordpro/source/filter/xfilter/xfhyperlink.hxx24
-rw-r--r--lotuswordpro/source/filter/xfilter/xfimage.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfimage.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfimagestyle.cxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfindex.cxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfindex.hxx56
-rw-r--r--lotuswordpro/source/filter/xfilter/xfinputlist.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx18
-rw-r--r--lotuswordpro/source/filter/xfilter/xfliststyle.cxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfliststyle.hxx16
-rw-r--r--lotuswordpro/source/filter/xfilter/xfmasterpage.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfmasterpage.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx26
-rw-r--r--lotuswordpro/source/filter/xfilter/xfnumfmt.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfofficemeta.cxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfofficemeta.hxx28
-rw-r--r--lotuswordpro/source/filter/xfilter/xfpagenumber.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfparastyle.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfparastyle.hxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xfplaceholder.hxx18
-rw-r--r--lotuswordpro/source/filter/xfilter/xfruby.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfrubystyle.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsaxstream.cxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsaxstream.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsection.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfsection.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xfshadow.cxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfshadow.hxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstyle.cxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstyle.hxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylecont.cxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylecont.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylemanager.cxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylemanager.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xftable.cxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xftable.hxx30
-rw-r--r--lotuswordpro/source/filter/xfilter/xftabstyle.hxx8
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextcontent.cxx12
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextcontent.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextspan.cxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextspan.hxx4
-rw-r--r--lotuswordpro/source/filter/xfilter/xftextstyle.cxx14
-rw-r--r--lotuswordpro/source/filter/xfilter/xftimestyle.hxx10
-rw-r--r--lotuswordpro/source/filter/xfilter/xfutil.cxx64
-rw-r--r--lotuswordpro/source/filter/xfilter/xfutil.hxx44
-rw-r--r--mysqlc/source/mysqlc_connection.cxx21
-rw-r--r--mysqlc/source/mysqlc_connection.hxx3
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx36
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.hxx1
-rw-r--r--mysqlc/source/mysqlc_driver.cxx21
-rw-r--r--mysqlc/source/mysqlc_driver.hxx1
-rw-r--r--mysqlc/source/mysqlc_general.cxx17
-rw-r--r--mysqlc/source/mysqlc_general.hxx6
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.cxx2
-rw-r--r--mysqlc/source/mysqlc_propertyids.cxx1
-rw-r--r--mysqlc/source/mysqlc_propertyids.hxx6
-rw-r--r--mysqlc/source/mysqlc_resultset.cxx3
-rw-r--r--mysqlc/source/mysqlc_resultset.hxx1
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.cxx3
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.hxx5
-rw-r--r--mysqlc/source/mysqlc_services.cxx1
-rw-r--r--mysqlc/source/mysqlc_statement.cxx7
-rw-r--r--mysqlc/source/mysqlc_statement.hxx1
-rw-r--r--mysqlc/source/mysqlc_subcomponent.hxx24
-rw-r--r--oox/inc/oox/core/contexthandler.hxx20
-rw-r--r--oox/inc/oox/core/contexthandler2.hxx8
-rw-r--r--oox/inc/oox/core/fastparser.hxx8
-rw-r--r--oox/inc/oox/core/fasttokenhandler.hxx10
-rw-r--r--oox/inc/oox/core/filterbase.hxx18
-rw-r--r--oox/inc/oox/core/filterdetect.hxx28
-rw-r--r--oox/inc/oox/core/fragmenthandler.hxx20
-rw-r--r--oox/inc/oox/core/fragmenthandler2.hxx6
-rw-r--r--oox/inc/oox/core/recordparser.hxx4
-rw-r--r--oox/inc/oox/core/relations.hxx30
-rw-r--r--oox/inc/oox/core/xmlfilterbase.hxx26
-rw-r--r--oox/inc/oox/drawingml/chart/chartcontextbase.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/chartspacefragment.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/chartspacemodel.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/converterbase.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/datasourcecontext.hxx4
-rw-r--r--oox/inc/oox/drawingml/chart/datasourceconverter.hxx4
-rw-r--r--oox/inc/oox/drawingml/chart/datasourcemodel.hxx4
-rw-r--r--oox/inc/oox/drawingml/chart/modelbase.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/plotareaconverter.hxx4
-rw-r--r--oox/inc/oox/drawingml/chart/seriescontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/seriesconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/seriesmodel.hxx4
-rw-r--r--oox/inc/oox/drawingml/chart/titlecontext.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/titleconverter.hxx8
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupconverter.hxx2
-rw-r--r--oox/inc/oox/drawingml/customshapeproperties.hxx12
-rw-r--r--oox/inc/oox/drawingml/diagram/diagram.hxx8
-rw-r--r--oox/inc/oox/drawingml/drawingmltypes.hxx10
-rw-r--r--oox/inc/oox/drawingml/embeddedwavaudiofile.hxx4
-rw-r--r--oox/inc/oox/drawingml/graphicshapecontext.hxx8
-rw-r--r--oox/inc/oox/drawingml/guidcontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/shape.hxx32
-rw-r--r--oox/inc/oox/drawingml/shape3dproperties.hxx28
-rw-r--r--oox/inc/oox/drawingml/shapepropertymap.hxx2
-rw-r--r--oox/inc/oox/drawingml/table/tableproperties.hxx4
-rw-r--r--oox/inc/oox/drawingml/table/tablestyle.hxx8
-rw-r--r--oox/inc/oox/drawingml/table/tablestylelist.hxx4
-rw-r--r--oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx2
-rw-r--r--oox/inc/oox/drawingml/textbodycontext.hxx2
-rw-r--r--oox/inc/oox/drawingml/textcharacterproperties.hxx2
-rw-r--r--oox/inc/oox/drawingml/textfield.hxx8
-rw-r--r--oox/inc/oox/drawingml/textfieldcontext.hxx2
-rw-r--r--oox/inc/oox/drawingml/textfont.hxx8
-rw-r--r--oox/inc/oox/drawingml/textparagraphproperties.hxx4
-rw-r--r--oox/inc/oox/drawingml/textrun.hxx6
-rw-r--r--oox/inc/oox/drawingml/theme.hxx8
-rw-r--r--oox/inc/oox/drawingml/themefragmenthandler.hxx2
-rw-r--r--oox/inc/oox/dump/dumperbase.hxx398
-rw-r--r--oox/inc/oox/dump/oledumper.hxx136
-rw-r--r--oox/inc/oox/dump/pptxdumper.hxx8
-rw-r--r--oox/inc/oox/dump/xlsbdumper.hxx14
-rw-r--r--oox/inc/oox/export/chartexport.hxx12
-rw-r--r--oox/inc/oox/export/drawingml.hxx14
-rw-r--r--oox/inc/oox/export/utils.hxx8
-rw-r--r--oox/inc/oox/export/vmlexport.hxx8
-rw-r--r--oox/inc/oox/helper/attributelist.hxx22
-rw-r--r--oox/inc/oox/helper/binaryinputstream.hxx10
-rw-r--r--oox/inc/oox/helper/binaryoutputstream.hxx6
-rw-r--r--oox/inc/oox/helper/containerhelper.hxx10
-rw-r--r--oox/inc/oox/helper/graphichelper.hxx14
-rw-r--r--oox/inc/oox/helper/helper.hxx6
-rw-r--r--oox/inc/oox/helper/modelobjecthelper.hxx30
-rw-r--r--oox/inc/oox/helper/progressbar.hxx4
-rw-r--r--oox/inc/oox/helper/propertymap.hxx4
-rw-r--r--oox/inc/oox/helper/propertyset.hxx6
-rw-r--r--oox/inc/oox/helper/storagebase.hxx32
-rw-r--r--oox/inc/oox/helper/textinputstream.hxx6
-rw-r--r--oox/inc/oox/helper/zipstorage.hxx10
-rw-r--r--oox/inc/oox/mathml/importutils.hxx14
-rw-r--r--oox/inc/oox/ole/axbinaryreader.hxx16
-rw-r--r--oox/inc/oox/ole/axbinarywriter.hxx10
-rw-r--r--oox/inc/oox/ole/axcontrol.hxx56
-rw-r--r--oox/inc/oox/ole/axcontrolfragment.hxx2
-rw-r--r--oox/inc/oox/ole/axfontdata.hxx2
-rw-r--r--oox/inc/oox/ole/olehelper.hxx20
-rw-r--r--oox/inc/oox/ole/oleobjecthelper.hxx6
-rw-r--r--oox/inc/oox/ole/olestorage.hxx12
-rw-r--r--oox/inc/oox/ole/vbacontrol.hxx20
-rw-r--r--oox/inc/oox/ole/vbahelper.hxx6
-rw-r--r--oox/inc/oox/ole/vbamodule.hxx16
-rw-r--r--oox/inc/oox/ole/vbaproject.hxx16
-rw-r--r--oox/inc/oox/ppt/animationspersist.hxx8
-rw-r--r--oox/inc/oox/ppt/comments.hxx48
-rw-r--r--oox/inc/oox/ppt/customshowlistcontext.hxx6
-rw-r--r--oox/inc/oox/ppt/dgmimport.hxx2
-rw-r--r--oox/inc/oox/ppt/dgmlayout.hxx2
-rw-r--r--oox/inc/oox/ppt/layoutfragmenthandler.hxx2
-rw-r--r--oox/inc/oox/ppt/pptimport.hxx8
-rw-r--r--oox/inc/oox/ppt/presentationfragmenthandler.hxx8
-rw-r--r--oox/inc/oox/ppt/slidefragmenthandler.hxx10
-rw-r--r--oox/inc/oox/ppt/slidepersist.hxx20
-rw-r--r--oox/inc/oox/ppt/slidetransition.hxx2
-rw-r--r--oox/inc/oox/ppt/soundactioncontext.hxx6
-rw-r--r--oox/inc/oox/ppt/timenode.hxx10
-rw-r--r--oox/inc/oox/token/namespacemap.hxx2
-rw-r--r--oox/inc/oox/token/propertynames.hxx2
-rw-r--r--oox/inc/oox/token/tokenmap.hxx6
-rw-r--r--oox/inc/oox/vml/vmldrawing.hxx26
-rw-r--r--oox/inc/oox/vml/vmldrawingfragment.hxx2
-rw-r--r--oox/inc/oox/vml/vmlformatting.hxx26
-rw-r--r--oox/inc/oox/vml/vmlinputstream.hxx10
-rw-r--r--oox/inc/oox/vml/vmlshape.hxx96
-rw-r--r--oox/inc/oox/vml/vmlshapecontainer.hxx8
-rw-r--r--oox/inc/oox/vml/vmlshapecontext.hxx20
-rw-r--r--oox/inc/oox/vml/vmltextbox.hxx12
-rw-r--r--oox/inc/oox/vml/vmltextboxcontext.hxx2
-rw-r--r--oox/source/core/contexthandler.cxx1
-rw-r--r--oox/source/core/contexthandler2.cxx2
-rw-r--r--oox/source/core/fastparser.cxx1
-rw-r--r--oox/source/core/fasttokenhandler.cxx1
-rw-r--r--oox/source/core/filterbase.cxx1
-rw-r--r--oox/source/core/filterdetect.cxx1
-rw-r--r--oox/source/core/fragmenthandler.cxx1
-rw-r--r--oox/source/core/fragmenthandler2.cxx5
-rw-r--r--oox/source/core/recordparser.cxx1
-rw-r--r--oox/source/core/relations.cxx2
-rw-r--r--oox/source/core/relationshandler.cxx2
-rw-r--r--oox/source/core/services.cxx1
-rw-r--r--oox/source/core/xmlfilterbase.cxx5
-rw-r--r--oox/source/docprop/docprophandler.hxx22
-rw-r--r--oox/source/docprop/ooxmldocpropimport.cxx1
-rw-r--r--oox/source/docprop/ooxmldocpropimport.hxx6
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.hxx8
-rw-r--r--oox/source/export/chartexport.cxx2
-rw-r--r--oox/source/helper/binaryoutputstream.cxx4
-rw-r--r--oox/source/helper/propertymap.cxx2
-rw-r--r--oox/source/mathml/importutils.cxx6
-rw-r--r--oox/source/ppt/comments.cxx2
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx2
-rw-r--r--package/inc/HashMaps.hxx16
-rw-r--r--package/inc/ZipEntry.hxx2
-rw-r--r--package/inc/ZipFile.hxx10
-rw-r--r--package/inc/ZipOutputStream.hxx2
-rw-r--r--package/inc/ZipPackage.hxx30
-rw-r--r--package/inc/ZipPackageEntry.hxx24
-rw-r--r--package/inc/ZipPackageFolder.hxx36
-rw-r--r--package/inc/ZipPackageStream.hxx10
-rw-r--r--package/inc/zipfileaccess.hxx24
-rw-r--r--package/source/manifest/ManifestExport.cxx26
-rw-r--r--package/source/manifest/ManifestImport.cxx31
-rw-r--r--package/source/manifest/ManifestImport.hxx132
-rw-r--r--package/source/manifest/ManifestReader.cxx1
-rw-r--r--package/source/manifest/ManifestReader.hxx12
-rw-r--r--package/source/manifest/ManifestWriter.hxx12
-rw-r--r--package/source/manifest/UnoRegister.cxx1
-rw-r--r--package/source/xstor/ocompinstream.cxx32
-rw-r--r--package/source/xstor/ocompinstream.hxx26
-rw-r--r--package/source/xstor/ohierarchyholder.cxx8
-rw-r--r--package/source/xstor/ohierarchyholder.hxx12
-rw-r--r--package/source/xstor/owriteablestream.cxx72
-rw-r--r--package/source/xstor/owriteablestream.hxx44
-rw-r--r--package/source/xstor/register.cxx2
-rw-r--r--package/source/xstor/selfterminatefilestream.cxx2
-rw-r--r--package/source/xstor/selfterminatefilestream.hxx4
-rw-r--r--package/source/xstor/xfactory.cxx16
-rw-r--r--package/source/xstor/xfactory.hxx10
-rw-r--r--package/source/xstor/xstorage.cxx162
-rw-r--r--package/source/xstor/xstorage.hxx130
-rw-r--r--package/source/zipapi/XUnbufferedStream.cxx3
-rw-r--r--package/source/zipapi/XUnbufferedStream.hxx2
-rw-r--r--package/source/zipapi/ZipFile.cxx15
-rw-r--r--package/source/zipapi/ZipOutputStream.cxx4
-rw-r--r--package/source/zippackage/ZipPackageFolderEnumeration.cxx1
-rw-r--r--package/source/zippackage/ZipPackageFolderEnumeration.hxx8
-rw-r--r--padmin/source/adddlg.cxx79
-rw-r--r--padmin/source/adddlg.hxx2
-rw-r--r--padmin/source/cmddlg.cxx4
-rw-r--r--padmin/source/desktopcontext.cxx1
-rw-r--r--padmin/source/desktopcontext.hxx2
-rw-r--r--padmin/source/helper.cxx4
-rw-r--r--padmin/source/newppdlg.cxx17
-rw-r--r--padmin/source/newppdlg.hxx4
-rw-r--r--padmin/source/padialog.cxx6
-rw-r--r--padmin/source/padialog.hxx2
-rw-r--r--padmin/source/pamain.cxx9
-rw-r--r--padmin/source/prtsetup.cxx9
-rw-r--r--pyuno/source/loader/pyuno_loader.cxx21
-rw-r--r--pyuno/source/module/pyuno.cxx6
-rw-r--r--pyuno/source/module/pyuno_adapter.cxx5
-rw-r--r--pyuno/source/module/pyuno_callable.cxx2
-rw-r--r--pyuno/source/module/pyuno_except.cxx3
-rw-r--r--pyuno/source/module/pyuno_gc.cxx4
-rw-r--r--pyuno/source/module/pyuno_impl.hxx44
-rw-r--r--pyuno/source/module/pyuno_module.cxx8
-rw-r--r--pyuno/source/module/pyuno_runtime.cxx11
-rw-r--r--pyuno/source/module/pyuno_type.cxx5
-rw-r--r--pyuno/source/module/pyuno_util.cxx21
-rw-r--r--registry/inc/registry/reader.hxx64
-rw-r--r--registry/inc/registry/reflread.hxx96
-rw-r--r--registry/inc/registry/reflwrit.hxx64
-rw-r--r--registry/inc/registry/registry.hxx148
-rw-r--r--registry/inc/registry/writer.hxx30
-rw-r--r--registry/source/keyimpl.cxx2
-rw-r--r--registry/source/keyimpl.hxx42
-rw-r--r--registry/source/reflwrit.cxx15
-rw-r--r--registry/source/regimpl.cxx8
-rw-r--r--registry/source/regimpl.hxx38
-rw-r--r--registry/source/regkey.cxx1
-rw-r--r--registry/test/testmerge.cxx1
-rw-r--r--registry/test/testregcpp.cxx3
-rw-r--r--registry/tools/fileurl.cxx1
-rw-r--r--registry/tools/fileurl.hxx2
-rw-r--r--registry/tools/regcompare.cxx40
-rw-r--r--registry/tools/regview.cxx1
-rw-r--r--registry/workben/regspeed.cxx2
-rw-r--r--registry/workben/regtest.cxx2
-rw-r--r--remotebridges/source/unourl_resolver/unourl_resolver.cxx1
-rw-r--r--reportdesign/inc/ReportDefinition.hxx78
-rw-r--r--reportdesign/inc/ReportHelperDefines.hxx72
-rw-r--r--reportdesign/inc/RptDef.hxx10
-rw-r--r--reportdesign/inc/RptModel.hxx2
-rw-r--r--reportdesign/inc/RptObject.hxx22
-rw-r--r--reportdesign/inc/UndoActions.hxx8
-rw-r--r--reportdesign/inc/conditionalexpression.hxx6
-rw-r--r--reportdesign/inc/reportformula.hxx26
-rw-r--r--reportdesign/source/core/api/FixedLine.cxx58
-rw-r--r--reportdesign/source/core/api/FixedText.cxx48
-rw-r--r--reportdesign/source/core/api/FormatCondition.cxx32
-rw-r--r--reportdesign/source/core/api/FormattedField.cxx48
-rw-r--r--reportdesign/source/core/api/Function.cxx40
-rw-r--r--reportdesign/source/core/api/Group.cxx42
-rw-r--r--reportdesign/source/core/api/ImageControl.cxx60
-rw-r--r--reportdesign/source/core/api/ReportComponent.cxx6
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx414
-rw-r--r--reportdesign/source/core/api/ReportEngineJFree.cxx64
-rw-r--r--reportdesign/source/core/api/Section.cxx92
-rw-r--r--reportdesign/source/core/api/Shape.cxx54
-rw-r--r--reportdesign/source/core/api/Tools.cxx6
-rw-r--r--reportdesign/source/core/inc/FixedLine.hxx26
-rw-r--r--reportdesign/source/core/inc/FixedText.hxx32
-rw-r--r--reportdesign/source/core/inc/FormatCondition.hxx30
-rw-r--r--reportdesign/source/core/inc/FormattedField.hxx26
-rw-r--r--reportdesign/source/core/inc/Function.hxx42
-rw-r--r--reportdesign/source/core/inc/Group.hxx30
-rw-r--r--reportdesign/source/core/inc/ImageControl.hxx32
-rw-r--r--reportdesign/source/core/inc/ReportComponent.hxx6
-rw-r--r--reportdesign/source/core/inc/ReportControlModel.hxx18
-rw-r--r--reportdesign/source/core/inc/ReportEngineJFree.hxx28
-rw-r--r--reportdesign/source/core/inc/ReportHelperImpl.hxx112
-rw-r--r--reportdesign/source/core/inc/Section.hxx40
-rw-r--r--reportdesign/source/core/inc/Shape.hxx42
-rw-r--r--reportdesign/source/core/inc/Tools.hxx6
-rw-r--r--reportdesign/source/core/inc/conditionupdater.hxx4
-rw-r--r--reportdesign/source/core/inc/core_resource.hxx2
-rw-r--r--reportdesign/source/core/misc/conditionalexpression.cxx30
-rw-r--r--reportdesign/source/core/misc/conditionupdater.cxx10
-rw-r--r--reportdesign/source/core/misc/reportformula.cxx28
-rw-r--r--reportdesign/source/core/resource/core_resource.cxx4
-rw-r--r--reportdesign/source/core/sdr/PropertyForward.cxx12
-rw-r--r--reportdesign/source/core/sdr/ReportDrawPage.cxx6
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx58
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx4
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx10
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.cxx16
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.hxx6
-rw-r--r--reportdesign/source/filter/xml/dbloader2.cxx26
-rw-r--r--reportdesign/source/filter/xml/dbloader2.hxx14
-rw-r--r--reportdesign/source/filter/xml/xmlAutoStyle.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx24
-rw-r--r--reportdesign/source/filter/xml/xmlCell.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.cxx8
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx34
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx252
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx60
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx98
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx22
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx32
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx50
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlImage.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx70
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx24
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.cxx14
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx18
-rw-r--r--reportdesign/source/filter/xml/xmlReport.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.hxx8
-rw-r--r--reportdesign/source/filter/xml/xmlRow.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx14
-rw-r--r--reportdesign/source/filter/xml/xmlSection.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx40
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.hxx30
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx14
-rw-r--r--reportdesign/source/filter/xml/xmlTable.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx120
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.hxx38
-rw-r--r--reportdesign/source/inc/GroupProperties.hxx2
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx20
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx6
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx22
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx2
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx6
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx18
-rw-r--r--reportdesign/source/ui/dlg/GroupExchange.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx16
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx20
-rw-r--r--reportdesign/source/ui/inc/AddField.hxx6
-rw-r--r--reportdesign/source/ui/inc/ColorListener.hxx4
-rw-r--r--reportdesign/source/ui/inc/ColumnInfo.hxx8
-rw-r--r--reportdesign/source/ui/inc/CondFormat.hxx4
-rw-r--r--reportdesign/source/ui/inc/DataProviderHandler.hxx32
-rw-r--r--reportdesign/source/ui/inc/DateTime.hxx2
-rw-r--r--reportdesign/source/ui/inc/DefaultInspection.hxx12
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx10
-rw-r--r--reportdesign/source/ui/inc/EndMarker.hxx2
-rw-r--r--reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx2
-rw-r--r--reportdesign/source/ui/inc/Formula.hxx2
-rw-r--r--reportdesign/source/ui/inc/FunctionHelper.hxx18
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx96
-rw-r--r--reportdesign/source/ui/inc/GroupsSorting.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportComponentHandler.hxx32
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx34
-rw-r--r--reportdesign/source/ui/inc/ReportSection.hxx4
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx6
-rw-r--r--reportdesign/source/ui/inc/RptUndo.hxx6
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx6
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/StartMarker.hxx2
-rw-r--r--reportdesign/source/ui/inc/UITools.hxx4
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx10
-rw-r--r--reportdesign/source/ui/inc/metadata.hxx6
-rw-r--r--reportdesign/source/ui/inc/propbrw.hxx8
-rw-r--r--reportdesign/source/ui/inc/statusbarcontroller.hxx10
-rw-r--r--reportdesign/source/ui/inc/toolboxcontroller.hxx14
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx102
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx38
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx10
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx46
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx10
-rw-r--r--reportdesign/source/ui/misc/ColorListener.cxx2
-rw-r--r--reportdesign/source/ui/misc/FunctionHelper.cxx34
-rw-r--r--reportdesign/source/ui/misc/RptUndo.cxx10
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx52
-rw-r--r--reportdesign/source/ui/misc/statusbarcontroller.cxx16
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx46
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx24
-rw-r--r--reportdesign/source/ui/report/EndMarker.cxx2
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx10
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx206
-rw-r--r--reportdesign/source/ui/report/ReportControllerObserver.cxx8
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx20
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx6
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx6
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx8
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx2
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx8
-rw-r--r--reportdesign/source/ui/report/dlgedclip.cxx2
-rw-r--r--reportdesign/source/ui/report/dlgedfac.cxx10
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx2
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx42
-rw-r--r--rsc/inc/rscall.h12
-rw-r--r--rsc/inc/rscconst.hxx2
-rw-r--r--rsc/inc/rscdb.hxx24
-rw-r--r--rsc/inc/rscdef.hxx34
-rw-r--r--rsc/inc/rschash.hxx8
-rw-r--r--rsc/inc/rsclex.hxx2
-rw-r--r--rsc/inc/rscrsc.hxx24
-rw-r--r--rsc/inc/rsctools.hxx10
-rw-r--r--rsc/inc/rsctop.hxx10
-rw-r--r--rsc/inc/rsctree.hxx6
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--rsc/source/parser/rscdb.cxx10
-rw-r--r--rsc/source/parser/rscibas.cxx10
-rw-r--r--rsc/source/parser/rscicpx.cxx2
-rw-r--r--rsc/source/parser/rsclex.cxx5
-rw-r--r--rsc/source/prj/start.cxx26
-rw-r--r--rsc/source/res/rscall.cxx12
-rw-r--r--rsc/source/res/rscmgr.cxx2
-rw-r--r--rsc/source/res/rscstr.cxx2
-rw-r--r--rsc/source/res/rsctop.cxx4
-rw-r--r--rsc/source/rsc/rsc.cxx82
-rw-r--r--rsc/source/tools/rscdef.cxx36
-rw-r--r--rsc/source/tools/rschash.cxx2
-rw-r--r--rsc/source/tools/rsctools.cxx8
-rw-r--r--sax/inc/sax/fastattribs.hxx22
-rw-r--r--sax/inc/sax/fshelper.hxx4
-rw-r--r--sax/inc/sax/tools/converter.hxx75
-rw-r--r--sax/inc/sax/tools/documenthandleradapter.hxx24
-rw-r--r--sax/inc/xml2utf.hxx8
-rw-r--r--sax/qa/cppunit/test_converter.cxx52
-rw-r--r--sax/source/expatwrap/attrlistimpl.hxx14
-rw-r--r--sax/source/expatwrap/sax_expat.cxx2
-rw-r--r--sax/source/expatwrap/saxwriter.cxx20
-rw-r--r--sax/source/expatwrap/xml2utf.cxx1
-rw-r--r--sax/source/fastparser/facreg.cxx1
-rw-r--r--sax/source/fastparser/fastparser.cxx5
-rw-r--r--sax/source/fastparser/fastparser.hxx30
-rw-r--r--sax/source/tools/converter.cxx60
-rw-r--r--sax/source/tools/fastattribs.cxx2
-rw-r--r--sax/source/tools/fastserializer.cxx6
-rw-r--r--sax/source/tools/fastserializer.hxx6
-rw-r--r--sax/source/tools/fshelper.cxx16
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx8
-rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx8
-rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx4
-rw-r--r--sc/inc/addincfg.hxx6
-rw-r--r--sc/inc/addincol.hxx58
-rw-r--r--sc/inc/address.hxx12
-rw-r--r--sc/inc/addruno.hxx18
-rw-r--r--sc/inc/afmtuno.hxx64
-rw-r--r--sc/inc/appluno.hxx48
-rw-r--r--sc/inc/appoptio.hxx14
-rw-r--r--sc/inc/autoform.hxx12
-rw-r--r--sc/inc/callform.hxx24
-rw-r--r--sc/inc/cell.hxx10
-rw-r--r--sc/inc/cellform.hxx2
-rw-r--r--sc/inc/cellsuno.hxx206
-rw-r--r--sc/inc/chart2uno.hxx58
-rw-r--r--sc/inc/chartarr.hxx22
-rw-r--r--sc/inc/charthelper.hxx8
-rw-r--r--sc/inc/chartlis.hxx18
-rw-r--r--sc/inc/chartuno.hxx28
-rw-r--r--sc/inc/chgtrack.hxx70
-rw-r--r--sc/inc/chgviset.hxx14
-rw-r--r--sc/inc/colorscale.hxx4
-rw-r--r--sc/inc/column.hxx6
-rw-r--r--sc/inc/compiler.hxx18
-rw-r--r--sc/inc/conditio.hxx56
-rw-r--r--sc/inc/confuno.hxx18
-rw-r--r--sc/inc/cursuno.hxx8
-rw-r--r--sc/inc/dapiuno.hxx208
-rw-r--r--sc/inc/datauno.hxx88
-rw-r--r--sc/inc/dbdata.hxx18
-rw-r--r--sc/inc/defaultsoptions.hxx10
-rw-r--r--sc/inc/defltuno.hxx26
-rw-r--r--sc/inc/dispuno.hxx2
-rw-r--r--sc/inc/dociter.hxx2
-rw-r--r--sc/inc/docoptio.hxx4
-rw-r--r--sc/inc/document.hxx152
-rw-r--r--sc/inc/docuno.hxx164
-rw-r--r--sc/inc/dpcache.hxx16
-rw-r--r--sc/inc/dpdimsave.hxx86
-rw-r--r--sc/inc/dpfilteredcache.hxx2
-rw-r--r--sc/inc/dpgroup.hxx10
-rw-r--r--sc/inc/dpitemdata.hxx12
-rw-r--r--sc/inc/dpobject.hxx72
-rw-r--r--sc/inc/dpoutput.hxx8
-rw-r--r--sc/inc/dpsave.hxx76
-rw-r--r--sc/inc/dpsdbtab.hxx6
-rw-r--r--sc/inc/dpshttab.hxx8
-rw-r--r--sc/inc/dptabdat.hxx4
-rw-r--r--sc/inc/dptabres.hxx6
-rw-r--r--sc/inc/dptabsrc.hxx174
-rw-r--r--sc/inc/dptypes.hxx2
-rw-r--r--sc/inc/dputil.hxx10
-rw-r--r--sc/inc/dragdata.hxx10
-rw-r--r--sc/inc/eventuno.hxx14
-rw-r--r--sc/inc/externalrefmgr.hxx98
-rw-r--r--sc/inc/fielduno.hxx46
-rw-r--r--sc/inc/filtopt.hxx4
-rw-r--r--sc/inc/filtuno.hxx18
-rw-r--r--sc/inc/fmtuno.hxx56
-rw-r--r--sc/inc/formulacell.hxx16
-rw-r--r--sc/inc/formulaopt.hxx24
-rw-r--r--sc/inc/formulaparserpool.hxx10
-rw-r--r--sc/inc/formularesult.hxx2
-rw-r--r--sc/inc/funcdesc.hxx38
-rw-r--r--sc/inc/funcuno.hxx24
-rw-r--r--sc/inc/global.hxx8
-rw-r--r--sc/inc/inputopt.hxx4
-rw-r--r--sc/inc/linkuno.hxx150
-rw-r--r--sc/inc/macromgr.hxx10
-rw-r--r--sc/inc/miscuno.hxx50
-rw-r--r--sc/inc/nameuno.hxx72
-rw-r--r--sc/inc/notesuno.hxx16
-rw-r--r--sc/inc/optuno.hxx8
-rw-r--r--sc/inc/optutil.hxx10
-rw-r--r--sc/inc/orcusfilters.hxx6
-rw-r--r--sc/inc/orcusxml.hxx6
-rw-r--r--sc/inc/pageuno.hxx6
-rw-r--r--sc/inc/pivot.hxx22
-rw-r--r--sc/inc/postit.hxx20
-rw-r--r--sc/inc/printopt.hxx4
-rw-r--r--sc/inc/queryentry.hxx2
-rw-r--r--sc/inc/queryparam.hxx2
-rw-r--r--sc/inc/rangelst.hxx2
-rw-r--r--sc/inc/rangenam.hxx30
-rw-r--r--sc/inc/rangeutl.hxx54
-rw-r--r--sc/inc/reftokenhelper.hxx2
-rw-r--r--sc/inc/scabstdlg.hxx22
-rw-r--r--sc/inc/scmatrix.hxx16
-rw-r--r--sc/inc/scmod.hxx4
-rw-r--r--sc/inc/servuno.hxx2
-rw-r--r--sc/inc/shapeuno.hxx32
-rw-r--r--sc/inc/sheetdata.hxx36
-rw-r--r--sc/inc/sheetevents.hxx8
-rw-r--r--sc/inc/sortparam.hxx2
-rw-r--r--sc/inc/srchuno.hxx26
-rw-r--r--sc/inc/stringutil.hxx2
-rw-r--r--sc/inc/styleuno.hxx98
-rw-r--r--sc/inc/table.hxx74
-rw-r--r--sc/inc/tablink.hxx26
-rw-r--r--sc/inc/tabprotection.hxx4
-rw-r--r--sc/inc/targuno.hxx42
-rw-r--r--sc/inc/textuno.hxx18
-rw-r--r--sc/inc/tokenuno.hxx22
-rw-r--r--sc/inc/typedstrdata.hxx6
-rw-r--r--sc/inc/undorangename.hxx14
-rw-r--r--sc/inc/unitconv.hxx16
-rw-r--r--sc/inc/userdat.hxx12
-rw-r--r--sc/inc/userlist.hxx26
-rw-r--r--sc/inc/viewopti.hxx6
-rw-r--r--sc/inc/viewuno.hxx24
-rw-r--r--sc/inc/xmlwrap.hxx4
-rw-r--r--sc/qa/extras/macros-test.cxx92
-rw-r--r--sc/qa/extras/regression-test.cxx24
-rw-r--r--sc/qa/extras/scannotationobj.cxx4
-rw-r--r--sc/qa/extras/scannotationsobj.cxx4
-rw-r--r--sc/qa/extras/sccellrangeobj.cxx16
-rw-r--r--sc/qa/extras/scdatabaserangeobj.cxx8
-rw-r--r--sc/qa/extras/scdatapilotfieldobj.cxx8
-rw-r--r--sc/qa/extras/scdatapilottableobj.cxx12
-rw-r--r--sc/qa/extras/sceditfieldobj-cell.cxx4
-rw-r--r--sc/qa/extras/scmodelobj.cxx4
-rw-r--r--sc/qa/extras/scnamedrangeobj.cxx14
-rw-r--r--sc/qa/extras/scnamedrangesobj.cxx6
-rw-r--r--sc/qa/extras/scoutlineobj.cxx4
-rw-r--r--sc/qa/extras/sctablesheetobj.cxx8
-rw-r--r--sc/qa/extras/sctablesheetsobj.cxx14
-rw-r--r--sc/qa/unit/helper/csv_handler.hxx44
-rw-r--r--sc/qa/unit/helper/debughelper.hxx2
-rw-r--r--sc/qa/unit/helper/qahelper.hxx2
-rw-r--r--sc/qa/unit/ucalc.cxx6
-rw-r--r--sc/source/core/data/attarray.cxx2
-rw-r--r--sc/source/core/data/attrib.cxx6
-rw-r--r--sc/source/core/data/cell.cxx6
-rw-r--r--sc/source/core/data/cell2.cxx4
-rw-r--r--sc/source/core/data/colorscale.cxx6
-rw-r--r--sc/source/core/data/column.cxx2
-rw-r--r--sc/source/core/data/column2.cxx4
-rw-r--r--sc/source/core/data/column3.cxx30
-rw-r--r--sc/source/core/data/conditio.cxx72
-rw-r--r--sc/source/core/data/dociter.cxx4
-rw-r--r--sc/source/core/data/docpool.cxx6
-rw-r--r--sc/source/core/data/documen4.cxx18
-rw-r--r--sc/source/core/data/documen6.cxx4
-rw-r--r--sc/source/core/data/documen8.cxx46
-rw-r--r--sc/source/core/data/documen9.cxx4
-rw-r--r--sc/source/core/data/document.cxx1
-rw-r--r--sc/source/core/data/dpcache.cxx40
-rw-r--r--sc/source/core/data/dpdimsave.cxx90
-rw-r--r--sc/source/core/data/dpfilteredcache.cxx3
-rw-r--r--sc/source/core/data/dpgroup.cxx6
-rw-r--r--sc/source/core/data/dpitemdata.cxx28
-rw-r--r--sc/source/core/data/dpobject.cxx1
-rw-r--r--sc/source/core/data/dpoutput.cxx89
-rw-r--r--sc/source/core/data/dpsave.cxx3
-rw-r--r--sc/source/core/data/dpsdbtab.cxx2
-rw-r--r--sc/source/core/data/dpshttab.cxx5
-rw-r--r--sc/source/core/data/dptabdat.cxx2
-rw-r--r--sc/source/core/data/dptabres.cxx25
-rw-r--r--sc/source/core/data/dptabsrc.cxx1
-rw-r--r--sc/source/core/data/dputil.cxx40
-rw-r--r--sc/source/core/data/drwlayer.cxx14
-rw-r--r--sc/source/core/data/formulacell.cxx50
-rw-r--r--sc/source/core/data/funcdesc.cxx4
-rw-r--r--sc/source/core/data/global.cxx18
-rw-r--r--sc/source/core/data/global2.cxx2
-rw-r--r--sc/source/core/data/globalx.cxx12
-rw-r--r--sc/source/core/data/pivot2.cxx1
-rw-r--r--sc/source/core/data/postit.cxx4
-rw-r--r--sc/source/core/data/sheetevents.cxx18
-rw-r--r--sc/source/core/data/sortparam.cxx2
-rw-r--r--sc/source/core/data/stlpool.cxx4
-rw-r--r--sc/source/core/data/stlsheet.cxx2
-rw-r--r--sc/source/core/data/table1.cxx10
-rw-r--r--sc/source/core/data/table2.cxx14
-rw-r--r--sc/source/core/data/table4.cxx10
-rw-r--r--sc/source/core/data/table5.cxx4
-rw-r--r--sc/source/core/data/table6.cxx30
-rw-r--r--sc/source/core/data/tabprotection.cxx2
-rw-r--r--sc/source/core/data/validat.cxx4
-rw-r--r--sc/source/core/inc/addinhelpid.hxx6
-rw-r--r--sc/source/core/inc/addinlis.hxx6
-rw-r--r--sc/source/core/inc/cellkeytranslator.hxx2
-rw-r--r--sc/source/core/inc/doubleref.hxx12
-rw-r--r--sc/source/core/tool/addincol.cxx182
-rw-r--r--sc/source/core/tool/addinhelpid.cxx10
-rw-r--r--sc/source/core/tool/address.cxx11
-rw-r--r--sc/source/core/tool/appoptio.cxx1
-rw-r--r--sc/source/core/tool/cellkeytranslator.cxx15
-rw-r--r--sc/source/core/tool/chartarr.cxx2
-rw-r--r--sc/source/core/tool/chartlis.cxx22
-rw-r--r--sc/source/core/tool/chgtrack.cxx104
-rw-r--r--sc/source/core/tool/chgviset.cxx4
-rw-r--r--sc/source/core/tool/compiler.cxx1
-rw-r--r--sc/source/core/tool/defaultsoptions.cxx1
-rw-r--r--sc/source/core/tool/docoptio.cxx1
-rw-r--r--sc/source/core/tool/doubleref.cxx3
-rw-r--r--sc/source/core/tool/editutil.cxx10
-rw-r--r--sc/source/core/tool/filtopt.cxx1
-rw-r--r--sc/source/core/tool/formulaopt.cxx1
-rw-r--r--sc/source/core/tool/formulaparserpool.cxx2
-rw-r--r--sc/source/core/tool/formularesult.cxx2
-rw-r--r--sc/source/core/tool/inputopt.cxx1
-rw-r--r--sc/source/core/tool/interpr1.cxx1
-rw-r--r--sc/source/core/tool/interpr2.cxx16
-rw-r--r--sc/source/core/tool/interpr4.cxx6
-rw-r--r--sc/source/core/tool/optutil.cxx6
-rw-r--r--sc/source/core/tool/parclass.cxx10
-rw-r--r--sc/source/core/tool/printopt.cxx1
-rw-r--r--sc/source/core/tool/queryentry.cxx6
-rw-r--r--sc/source/core/tool/queryparam.cxx2
-rw-r--r--sc/source/core/tool/rangelst.cxx4
-rw-r--r--sc/source/core/tool/rangenam.cxx13
-rw-r--r--sc/source/core/tool/rangeseq.cxx22
-rw-r--r--sc/source/core/tool/rangeutl.cxx20
-rw-r--r--sc/source/core/tool/reftokenhelper.cxx1
-rw-r--r--sc/source/core/tool/scmatrix.cxx50
-rw-r--r--sc/source/core/tool/token.cxx22
-rw-r--r--sc/source/core/tool/typedstrdata.cxx4
-rw-r--r--sc/source/core/tool/unitconv.cxx1
-rw-r--r--sc/source/core/tool/userlist.cxx2
-rw-r--r--sc/source/core/tool/viewopti.cxx1
-rw-r--r--sc/source/filter/dif/difexp.cxx22
-rw-r--r--sc/source/filter/dif/difimp.cxx14
-rw-r--r--sc/source/filter/excel/excdoc.cxx5
-rw-r--r--sc/source/filter/excel/excform8.cxx2
-rw-r--r--sc/source/filter/excel/excimp8.cxx29
-rw-r--r--sc/source/filter/excel/excrecds.cxx11
-rw-r--r--sc/source/filter/excel/expop2.cxx2
-rw-r--r--sc/source/filter/excel/impop.cxx2
-rw-r--r--sc/source/filter/excel/read.cxx18
-rw-r--r--sc/source/filter/excel/xechart.cxx5
-rw-r--r--sc/source/filter/excel/xecontent.cxx31
-rw-r--r--sc/source/filter/excel/xeescher.cxx7
-rw-r--r--sc/source/filter/excel/xeextlst.cxx12
-rw-r--r--sc/source/filter/excel/xeformula.cxx4
-rw-r--r--sc/source/filter/excel/xehelper.cxx31
-rw-r--r--sc/source/filter/excel/xelink.cxx11
-rw-r--r--sc/source/filter/excel/xename.cxx1
-rw-r--r--sc/source/filter/excel/xepage.cxx1
-rw-r--r--sc/source/filter/excel/xepivot.cxx41
-rw-r--r--sc/source/filter/excel/xerecord.cxx2
-rw-r--r--sc/source/filter/excel/xeroot.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx5
-rw-r--r--sc/source/filter/excel/xestring.cxx8
-rw-r--r--sc/source/filter/excel/xestyle.cxx12
-rw-r--r--sc/source/filter/excel/xetable.cxx3
-rw-r--r--sc/source/filter/excel/xeview.cxx1
-rw-r--r--sc/source/filter/excel/xichart.cxx4
-rw-r--r--sc/source/filter/excel/xicontent.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx28
-rw-r--r--sc/source/filter/excel/xihelper.cxx4
-rw-r--r--sc/source/filter/excel/xilink.cxx2
-rw-r--r--sc/source/filter/excel/xipage.cxx4
-rw-r--r--sc/source/filter/excel/xipivot.cxx44
-rw-r--r--sc/source/filter/excel/xiroot.cxx2
-rw-r--r--sc/source/filter/excel/xistream.cxx9
-rw-r--r--sc/source/filter/excel/xlchart.cxx1
-rw-r--r--sc/source/filter/excel/xlescher.cxx1
-rw-r--r--sc/source/filter/excel/xlpivot.cxx28
-rw-r--r--sc/source/filter/excel/xlroot.cxx3
-rw-r--r--sc/source/filter/excel/xltoolbar.cxx36
-rw-r--r--sc/source/filter/excel/xltoolbar.hxx4
-rw-r--r--sc/source/filter/excel/xltools.cxx17
-rw-r--r--sc/source/filter/excel/xltracer.cxx1
-rw-r--r--sc/source/filter/ftools/fapihelper.cxx11
-rw-r--r--sc/source/filter/ftools/ftools.cxx4
-rw-r--r--sc/source/filter/html/htmlexp.cxx24
-rw-r--r--sc/source/filter/html/htmlexp2.cxx6
-rw-r--r--sc/source/filter/html/htmlpars.cxx68
-rw-r--r--sc/source/filter/inc/addressconverter.hxx16
-rw-r--r--sc/source/filter/inc/autofilterbuffer.hxx6
-rw-r--r--sc/source/filter/inc/biffcodec.hxx8
-rw-r--r--sc/source/filter/inc/biffhelper.hxx6
-rw-r--r--sc/source/filter/inc/biffinputstream.hxx10
-rw-r--r--sc/source/filter/inc/chartsheetfragment.hxx4
-rw-r--r--sc/source/filter/inc/commentsbuffer.hxx6
-rw-r--r--sc/source/filter/inc/commentsfragment.hxx4
-rw-r--r--sc/source/filter/inc/condformatbuffer.hxx8
-rw-r--r--sc/source/filter/inc/condformatcontext.hxx2
-rw-r--r--sc/source/filter/inc/connectionsbuffer.hxx16
-rw-r--r--sc/source/filter/inc/connectionsfragment.hxx2
-rw-r--r--sc/source/filter/inc/defnamesbuffer.hxx20
-rw-r--r--sc/source/filter/inc/dif.hxx4
-rw-r--r--sc/source/filter/inc/drawingbase.hxx4
-rw-r--r--sc/source/filter/inc/drawingfragment.hxx24
-rw-r--r--sc/source/filter/inc/drawingmanager.hxx6
-rw-r--r--sc/source/filter/inc/eeparser.hxx12
-rw-r--r--sc/source/filter/inc/excelfilter.hxx2
-rw-r--r--sc/source/filter/inc/excelhandlers.hxx8
-rw-r--r--sc/source/filter/inc/excform.hxx2
-rw-r--r--sc/source/filter/inc/excimp8.hxx4
-rw-r--r--sc/source/filter/inc/excrecds.hxx4
-rw-r--r--sc/source/filter/inc/externallinkbuffer.hxx26
-rw-r--r--sc/source/filter/inc/externallinkfragment.hxx8
-rw-r--r--sc/source/filter/inc/extlstcontext.hxx2
-rw-r--r--sc/source/filter/inc/fapihelper.hxx42
-rw-r--r--sc/source/filter/inc/formulabase.hxx26
-rw-r--r--sc/source/filter/inc/formulabuffer.hxx16
-rw-r--r--sc/source/filter/inc/formulaparser.hxx12
-rw-r--r--sc/source/filter/inc/ftools.hxx8
-rw-r--r--sc/source/filter/inc/htmlexp.hxx4
-rw-r--r--sc/source/filter/inc/htmlpars.hxx30
-rw-r--r--sc/source/filter/inc/numberformatsbuffer.hxx8
-rw-r--r--sc/source/filter/inc/orcusfiltersimpl.hxx12
-rw-r--r--sc/source/filter/inc/pagesettings.hxx26
-rw-r--r--sc/source/filter/inc/pivotcachebuffer.hxx48
-rw-r--r--sc/source/filter/inc/pivotcachefragment.hxx6
-rw-r--r--sc/source/filter/inc/pivottablebuffer.hxx42
-rw-r--r--sc/source/filter/inc/pivottablefragment.hxx2
-rw-r--r--sc/source/filter/inc/querytablebuffer.hxx2
-rw-r--r--sc/source/filter/inc/querytablefragment.hxx2
-rw-r--r--sc/source/filter/inc/richstring.hxx16
-rw-r--r--sc/source/filter/inc/richstringcontext.hxx2
-rw-r--r--sc/source/filter/inc/scenariobuffer.hxx8
-rw-r--r--sc/source/filter/inc/sharedstringsfragment.hxx2
-rw-r--r--sc/source/filter/inc/sheetdatabuffer.hxx8
-rw-r--r--sc/source/filter/inc/sheetdatacontext.hxx6
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx28
-rw-r--r--sc/source/filter/inc/stylesfragment.hxx2
-rw-r--r--sc/source/filter/inc/tablebuffer.hxx12
-rw-r--r--sc/source/filter/inc/tablefragment.hxx2
-rw-r--r--sc/source/filter/inc/unitconverter.hxx8
-rw-r--r--sc/source/filter/inc/workbookfragment.hxx6
-rw-r--r--sc/source/filter/inc/workbookhelper.hxx14
-rw-r--r--sc/source/filter/inc/workbooksettings.hxx4
-rw-r--r--sc/source/filter/inc/worksheetbuffer.hxx28
-rw-r--r--sc/source/filter/inc/worksheetfragment.hxx8
-rw-r--r--sc/source/filter/inc/worksheethelper.hxx24
-rw-r--r--sc/source/filter/inc/worksheetsettings.hxx2
-rw-r--r--sc/source/filter/inc/xechart.hxx10
-rw-r--r--sc/source/filter/inc/xecontent.hxx8
-rw-r--r--sc/source/filter/inc/xeescher.hxx2
-rw-r--r--sc/source/filter/inc/xeextlst.hxx10
-rw-r--r--sc/source/filter/inc/xehelper.hxx6
-rw-r--r--sc/source/filter/inc/xelink.hxx4
-rw-r--r--sc/source/filter/inc/xepivot.hxx24
-rw-r--r--sc/source/filter/inc/xerecord.hxx2
-rw-r--r--sc/source/filter/inc/xeroot.hxx2
-rw-r--r--sc/source/filter/inc/xestream.hxx58
-rw-r--r--sc/source/filter/inc/xestring.hxx4
-rw-r--r--sc/source/filter/inc/xestyle.hxx8
-rw-r--r--sc/source/filter/inc/xichart.hxx10
-rw-r--r--sc/source/filter/inc/xiescher.hxx44
-rw-r--r--sc/source/filter/inc/xihelper.hxx4
-rw-r--r--sc/source/filter/inc/xilink.hxx4
-rw-r--r--sc/source/filter/inc/xipivot.hxx16
-rw-r--r--sc/source/filter/inc/xistream.hxx8
-rw-r--r--sc/source/filter/inc/xlchart.hxx16
-rw-r--r--sc/source/filter/inc/xlpivot.hxx26
-rw-r--r--sc/source/filter/inc/xltools.hxx40
-rw-r--r--sc/source/filter/lotus/lotform.cxx12
-rw-r--r--sc/source/filter/lotus/lotread.cxx6
-rw-r--r--sc/source/filter/oox/addressconverter.cxx4
-rw-r--r--sc/source/filter/oox/autofilterbuffer.cxx4
-rw-r--r--sc/source/filter/oox/autofiltercontext.cxx1
-rw-r--r--sc/source/filter/oox/biffcodec.cxx3
-rw-r--r--sc/source/filter/oox/biffhelper.cxx2
-rw-r--r--sc/source/filter/oox/biffinputstream.cxx4
-rw-r--r--sc/source/filter/oox/chartsheetfragment.cxx1
-rw-r--r--sc/source/filter/oox/commentsbuffer.cxx1
-rw-r--r--sc/source/filter/oox/commentsfragment.cxx1
-rw-r--r--sc/source/filter/oox/condformatbuffer.cxx10
-rw-r--r--sc/source/filter/oox/condformatcontext.cxx1
-rw-r--r--sc/source/filter/oox/connectionsbuffer.cxx2
-rw-r--r--sc/source/filter/oox/connectionsfragment.cxx1
-rw-r--r--sc/source/filter/oox/defnamesbuffer.cxx2
-rw-r--r--sc/source/filter/oox/drawingbase.cxx1
-rw-r--r--sc/source/filter/oox/drawingfragment.cxx5
-rw-r--r--sc/source/filter/oox/drawingmanager.cxx1
-rw-r--r--sc/source/filter/oox/excelchartconverter.cxx1
-rw-r--r--sc/source/filter/oox/excelfilter.cxx1
-rw-r--r--sc/source/filter/oox/excelhandlers.cxx1
-rw-r--r--sc/source/filter/oox/excelvbaproject.cxx2
-rw-r--r--sc/source/filter/oox/externallinkbuffer.cxx4
-rw-r--r--sc/source/filter/oox/externallinkfragment.cxx1
-rw-r--r--sc/source/filter/oox/extlstcontext.cxx10
-rw-r--r--sc/source/filter/oox/formulabase.cxx6
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx12
-rw-r--r--sc/source/filter/oox/formulaparser.cxx3
-rw-r--r--sc/source/filter/oox/numberformatsbuffer.cxx5
-rw-r--r--sc/source/filter/oox/pagesettings.cxx4
-rw-r--r--sc/source/filter/oox/pivotcachebuffer.cxx2
-rw-r--r--sc/source/filter/oox/pivotcachefragment.cxx1
-rw-r--r--sc/source/filter/oox/pivottablebuffer.cxx1
-rw-r--r--sc/source/filter/oox/pivottablefragment.cxx1
-rw-r--r--sc/source/filter/oox/querytablebuffer.cxx2
-rw-r--r--sc/source/filter/oox/querytablefragment.cxx1
-rw-r--r--sc/source/filter/oox/richstring.cxx5
-rw-r--r--sc/source/filter/oox/richstringcontext.cxx1
-rw-r--r--sc/source/filter/oox/scenariobuffer.cxx1
-rw-r--r--sc/source/filter/oox/sharedstringsfragment.cxx1
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx2
-rw-r--r--sc/source/filter/oox/sheetdatacontext.cxx3
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx8
-rw-r--r--sc/source/filter/oox/stylesfragment.cxx1
-rw-r--r--sc/source/filter/oox/tablebuffer.cxx1
-rw-r--r--sc/source/filter/oox/tablefragment.cxx1
-rw-r--r--sc/source/filter/oox/unitconverter.cxx1
-rw-r--r--sc/source/filter/oox/viewsettings.cxx1
-rw-r--r--sc/source/filter/oox/workbookfragment.cxx1
-rw-r--r--sc/source/filter/oox/workbookhelper.cxx11
-rw-r--r--sc/source/filter/oox/workbooksettings.cxx1
-rw-r--r--sc/source/filter/oox/worksheetbuffer.cxx4
-rw-r--r--sc/source/filter/oox/worksheetfragment.cxx2
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx8
-rw-r--r--sc/source/filter/oox/worksheetsettings.cxx1
-rw-r--r--sc/source/filter/orcus/orcusfiltersimpl.cxx4
-rw-r--r--sc/source/filter/orcus/xmlcontext.cxx4
-rw-r--r--sc/source/filter/qpro/qproform.cxx4
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx2
-rw-r--r--sc/source/filter/rtf/rtfexp.cxx4
-rw-r--r--sc/source/filter/starcalc/scfobj.cxx2
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx9
-rw-r--r--sc/source/filter/xcl97/XclImpChangeTrack.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97esc.cxx5
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx6
-rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.cxx48
-rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.hxx12
-rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.cxx3
-rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.hxx12
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx34
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx4
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx12
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx14
-rw-r--r--sc/source/filter/xml/XMLCodeNameProvider.cxx11
-rw-r--r--sc/source/filter/xml/XMLCodeNameProvider.hxx10
-rw-r--r--sc/source/filter/xml/XMLColumnRowGroupExport.hxx2
-rw-r--r--sc/source/filter/xml/XMLConsolidationContext.cxx5
-rw-r--r--sc/source/filter/xml/XMLConsolidationContext.hxx8
-rw-r--r--sc/source/filter/xml/XMLConverter.cxx4
-rw-r--r--sc/source/filter/xml/XMLConverter.hxx32
-rw-r--r--sc/source/filter/xml/XMLDDELinksContext.cxx46
-rw-r--r--sc/source/filter/xml/XMLDDELinksContext.hxx44
-rw-r--r--sc/source/filter/xml/XMLDetectiveContext.cxx9
-rw-r--r--sc/source/filter/xml/XMLDetectiveContext.hxx12
-rw-r--r--sc/source/filter/xml/XMLEmptyContext.cxx4
-rw-r--r--sc/source/filter/xml/XMLEmptyContext.hxx6
-rw-r--r--sc/source/filter/xml/XMLExportDDELinks.cxx3
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx71
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.hxx4
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx20
-rw-r--r--sc/source/filter/xml/XMLExportIterator.cxx1
-rw-r--r--sc/source/filter/xml/XMLExportIterator.hxx12
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx94
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.hxx76
-rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.cxx28
-rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.hxx42
-rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.hxx20
-rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.cxx23
-rw-r--r--sc/source/filter/xml/XMLTableShapeImportHelper.cxx28
-rw-r--r--sc/source/filter/xml/XMLTableShapeImportHelper.hxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.cxx11
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.hxx8
-rw-r--r--sc/source/filter/xml/XMLTableShapesContext.cxx4
-rw-r--r--sc/source/filter/xml/XMLTableShapesContext.hxx4
-rw-r--r--sc/source/filter/xml/XMLTableSourceContext.cxx10
-rw-r--r--sc/source/filter/xml/XMLTableSourceContext.hxx12
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx293
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.hxx4
-rw-r--r--sc/source/filter/xml/sheetdata.cxx18
-rw-r--r--sc/source/filter/xml/xmlannoi.cxx16
-rw-r--r--sc/source/filter/xml/xmlannoi.hxx32
-rw-r--r--sc/source/filter/xml/xmlbodyi.cxx11
-rw-r--r--sc/source/filter/xml/xmlbodyi.hxx8
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx24
-rw-r--r--sc/source/filter/xml/xmlcelli.hxx10
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx24
-rw-r--r--sc/source/filter/xml/xmlcoli.hxx14
-rw-r--r--sc/source/filter/xml/xmlcondformat.cxx118
-rw-r--r--sc/source/filter/xml/xmlcondformat.hxx28
-rw-r--r--sc/source/filter/xml/xmlconti.cxx14
-rw-r--r--sc/source/filter/xml/xmlconti.hxx12
-rw-r--r--sc/source/filter/xml/xmlcvali.cxx103
-rw-r--r--sc/source/filter/xml/xmlcvali.hxx4
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx186
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx152
-rw-r--r--sc/source/filter/xml/xmldrani.cxx99
-rw-r--r--sc/source/filter/xml/xmldrani.hxx66
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx486
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx46
-rw-r--r--sc/source/filter/xml/xmlexternaltabi.cxx15
-rw-r--r--sc/source/filter/xml/xmlexternaltabi.hxx36
-rw-r--r--sc/source/filter/xml/xmlfilti.cxx70
-rw-r--r--sc/source/filter/xml/xmlfilti.hxx52
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx130
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx94
-rw-r--r--sc/source/filter/xml/xmllabri.cxx5
-rw-r--r--sc/source/filter/xml/xmllabri.hxx12
-rw-r--r--sc/source/filter/xml/xmlnexpi.cxx24
-rw-r--r--sc/source/filter/xml/xmlnexpi.hxx12
-rw-r--r--sc/source/filter/xml/xmlrowi.cxx26
-rw-r--r--sc/source/filter/xml/xmlrowi.hxx12
-rw-r--r--sc/source/filter/xml/xmlsceni.cxx6
-rw-r--r--sc/source/filter/xml/xmlsceni.hxx6
-rw-r--r--sc/source/filter/xml/xmlsorti.cxx42
-rw-r--r--sc/source/filter/xml/xmlsorti.hxx22
-rw-r--r--sc/source/filter/xml/xmlstyle.cxx105
-rw-r--r--sc/source/filter/xml/xmlstyle.hxx58
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx40
-rw-r--r--sc/source/filter/xml/xmlstyli.hxx46
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx12
-rw-r--r--sc/source/filter/xml/xmlsubti.hxx20
-rw-r--r--sc/source/filter/xml/xmltabi.cxx23
-rw-r--r--sc/source/filter/xml/xmltabi.hxx10
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx122
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx16
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx18
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx30
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx38
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx20
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx16
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenu.cxx1
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx1
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx1
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx20
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx20
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx24
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx30
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx22
-rw-r--r--sc/source/ui/Accessibility/DrawModelBroadcaster.cxx4
-rw-r--r--sc/source/ui/app/drwtrans.cxx10
-rw-r--r--sc/source/ui/app/inputhdl.cxx104
-rw-r--r--sc/source/ui/app/inputwin.cxx24
-rw-r--r--sc/source/ui/app/msgpool.cxx2
-rw-r--r--sc/source/ui/app/scdll.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx22
-rw-r--r--sc/source/ui/app/scmod2.cxx2
-rw-r--r--sc/source/ui/app/seltrans.cxx2
-rw-r--r--sc/source/ui/app/transobj.cxx6
-rw-r--r--sc/source/ui/app/uiitems.cxx18
-rw-r--r--sc/source/ui/attrdlg/scabstdlg.cxx3
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx22
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx22
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx2
-rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx1
-rw-r--r--sc/source/ui/cctrl/editfield.cxx2
-rw-r--r--sc/source/ui/cctrl/tbinsert.cxx10
-rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx8
-rw-r--r--sc/source/ui/collab/sccollaboration.cxx4
-rw-r--r--sc/source/ui/collab/sendfunc.cxx34
-rw-r--r--sc/source/ui/collab/sendfunc.hxx2
-rw-r--r--sc/source/ui/condformat/colorformat.cxx6
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx12
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx52
-rw-r--r--sc/source/ui/condformat/condformathelper.cxx42
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx2
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx8
-rw-r--r--sc/source/ui/dbgui/csvruler.cxx1
-rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx4
-rw-r--r--sc/source/ui/dbgui/dapidata.cxx8
-rw-r--r--sc/source/ui/dbgui/dapitype.cxx5
-rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx14
-rw-r--r--sc/source/ui/dbgui/fieldwnd.cxx23
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx22
-rw-r--r--sc/source/ui/dbgui/foptmgr.cxx10
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx26
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx1
-rw-r--r--sc/source/ui/dbgui/pvlaydlg.cxx25
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx4
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx7
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx4
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx34
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx4
-rw-r--r--sc/source/ui/dbgui/validate.cxx2
-rw-r--r--sc/source/ui/docshell/arealink.cxx2
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx10
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx10
-rw-r--r--sc/source/ui/docshell/docfunc.cxx36
-rw-r--r--sc/source/ui/docshell/docsh.cxx150
-rw-r--r--sc/source/ui/docshell/docsh3.cxx20
-rw-r--r--sc/source/ui/docshell/docsh4.cxx36
-rw-r--r--sc/source/ui/docshell/docsh5.cxx24
-rw-r--r--sc/source/ui/docshell/docsh6.cxx9
-rw-r--r--sc/source/ui/docshell/docsh8.cxx66
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx11
-rw-r--r--sc/source/ui/docshell/impex.cxx76
-rw-r--r--sc/source/ui/docshell/macromgr.cxx6
-rw-r--r--sc/source/ui/docshell/servobj.cxx2
-rw-r--r--sc/source/ui/docshell/tablink.cxx22
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx10
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx26
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx6
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx44
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx4
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx2
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx12
-rw-r--r--sc/source/ui/formdlg/formula.cxx8
-rw-r--r--sc/source/ui/inc/AccessibleCell.hxx4
-rw-r--r--sc/source/ui/inc/AccessibleCellBase.hxx6
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx22
-rw-r--r--sc/source/ui/inc/AccessibleCsvControl.hxx32
-rw-r--r--sc/source/ui/inc/AccessibleDataPilotControl.hxx6
-rw-r--r--sc/source/ui/inc/AccessibleDocument.hxx12
-rw-r--r--sc/source/ui/inc/AccessibleDocumentPagePreview.hxx8
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx10
-rw-r--r--sc/source/ui/inc/AccessiblePageHeader.hxx8
-rw-r--r--sc/source/ui/inc/AccessiblePageHeaderArea.hxx8
-rw-r--r--sc/source/ui/inc/AccessiblePreviewCell.hxx4
-rw-r--r--sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx8
-rw-r--r--sc/source/ui/inc/AccessiblePreviewTable.hxx12
-rw-r--r--sc/source/ui/inc/AccessibleSpreadsheet.hxx4
-rw-r--r--sc/source/ui/inc/AccessibleTableBase.hxx10
-rw-r--r--sc/source/ui/inc/ChartRangeSelectionListener.hxx6
-rw-r--r--sc/source/ui/inc/acredlin.hxx36
-rw-r--r--sc/source/ui/inc/areasave.hxx8
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx18
-rw-r--r--sc/source/ui/inc/colorformat.hxx2
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx18
-rw-r--r--sc/source/ui/inc/condformathelper.hxx6
-rw-r--r--sc/source/ui/inc/csvgrid.hxx4
-rw-r--r--sc/source/ui/inc/csvtablebox.hxx2
-rw-r--r--sc/source/ui/inc/dapitype.hxx6
-rw-r--r--sc/source/ui/inc/dbdocfun.hxx6
-rw-r--r--sc/source/ui/inc/dbfunc.hxx6
-rw-r--r--sc/source/ui/inc/docfunc.hxx2
-rw-r--r--sc/source/ui/inc/docsh.hxx6
-rw-r--r--sc/source/ui/inc/dpcontrol.hxx4
-rw-r--r--sc/source/ui/inc/drawsh.hxx2
-rw-r--r--sc/source/ui/inc/fieldwnd.hxx22
-rw-r--r--sc/source/ui/inc/filldlg.hxx8
-rw-r--r--sc/source/ui/inc/filtdlg.hxx16
-rw-r--r--sc/source/ui/inc/fuconcustomshape.hxx2
-rw-r--r--sc/source/ui/inc/impex.hxx10
-rw-r--r--sc/source/ui/inc/inputhdl.hxx14
-rw-r--r--sc/source/ui/inc/linkarea.hxx10
-rw-r--r--sc/source/ui/inc/mvtabdlg.hxx12
-rw-r--r--sc/source/ui/inc/namedefdlg.hxx6
-rw-r--r--sc/source/ui/inc/namedlg.hxx20
-rw-r--r--sc/source/ui/inc/namemgrtable.hxx12
-rw-r--r--sc/source/ui/inc/namepast.hxx6
-rw-r--r--sc/source/ui/inc/navipi.hxx2
-rw-r--r--sc/source/ui/inc/optsolver.hxx4
-rw-r--r--sc/source/ui/inc/pfiltdlg.hxx12
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx12
-rw-r--r--sc/source/ui/inc/pvlaydlg.hxx16
-rw-r--r--sc/source/ui/inc/retypepassdlg.hxx2
-rw-r--r--sc/source/ui/inc/scendlg.hxx4
-rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx4
-rw-r--r--sc/source/ui/inc/scuiautofmt.hxx2
-rw-r--r--sc/source/ui/inc/shtabdlg.hxx2
-rw-r--r--sc/source/ui/inc/solveroptions.hxx8
-rw-r--r--sc/source/ui/inc/solverutil.hxx8
-rw-r--r--sc/source/ui/inc/strindlg.hxx4
-rw-r--r--sc/source/ui/inc/tabbgcolordlg.hxx4
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx6
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx2
-rw-r--r--sc/source/ui/inc/tpformula.hxx4
-rw-r--r--sc/source/ui/inc/tpsubt.hxx4
-rw-r--r--sc/source/ui/inc/undoblk.hxx62
-rw-r--r--sc/source/ui/inc/undocell.hxx20
-rw-r--r--sc/source/ui/inc/undodat.hxx38
-rw-r--r--sc/source/ui/inc/undostyl.hxx4
-rw-r--r--sc/source/ui/inc/undotab.hxx50
-rw-r--r--sc/source/ui/inc/viewfunc.hxx8
-rw-r--r--sc/source/ui/inc/xmlsourcedlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx32
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/datafdlg.cxx1
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx8
-rw-r--r--sc/source/ui/miscdlgs/highred.cxx4
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx8
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx36
-rw-r--r--sc/source/ui/miscdlgs/mtrindlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/mvtabdlg.cxx18
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx10
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx2
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx8
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.cxx12
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx16
-rw-r--r--sc/source/ui/miscdlgs/solverutil.cxx18
-rw-r--r--sc/source/ui/miscdlgs/strindlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx2
-rw-r--r--sc/source/ui/namedlg/namedefdlg.cxx20
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx32
-rw-r--r--sc/source/ui/namedlg/namemgrtable.cxx12
-rw-r--r--sc/source/ui/namedlg/namepast.cxx8
-rw-r--r--sc/source/ui/navipi/content.cxx26
-rw-r--r--sc/source/ui/navipi/navipi.cxx8
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.cxx16
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.hxx24
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx1
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx5
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx2
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx1
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx2
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx2
-rw-r--r--sc/source/ui/undo/undobase.cxx4
-rw-r--r--sc/source/ui/undo/undoblk.cxx34
-rw-r--r--sc/source/ui/undo/undoblk2.cxx2
-rw-r--r--sc/source/ui/undo/undoblk3.cxx34
-rw-r--r--sc/source/ui/undo/undocell.cxx24
-rw-r--r--sc/source/ui/undo/undodat.cxx36
-rw-r--r--sc/source/ui/undo/undodraw.cxx4
-rw-r--r--sc/source/ui/undo/undorangename.cxx14
-rw-r--r--sc/source/ui/undo/undostyl.cxx4
-rw-r--r--sc/source/ui/undo/undotab.cxx59
-rw-r--r--sc/source/ui/undo/undoutil.cxx4
-rw-r--r--sc/source/ui/unoobj/ChartRangeSelectionListener.cxx1
-rw-r--r--sc/source/ui/unoobj/addruno.cxx46
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx64
-rw-r--r--sc/source/ui/unoobj/appluno.cxx146
-rw-r--r--sc/source/ui/unoobj/celllistsource.cxx34
-rw-r--r--sc/source/ui/unoobj/celllistsource.hxx12
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx486
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.cxx42
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.hxx6
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx98
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx42
-rw-r--r--sc/source/ui/unoobj/confuno.cxx32
-rw-r--r--sc/source/ui/unoobj/cursuno.cxx22
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx43
-rw-r--r--sc/source/ui/unoobj/datauno.cxx88
-rw-r--r--sc/source/ui/unoobj/defltuno.cxx26
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx6
-rw-r--r--sc/source/ui/unoobj/docuno.cxx226
-rw-r--r--sc/source/ui/unoobj/eventuno.cxx24
-rw-r--r--sc/source/ui/unoobj/exceldetect.hxx4
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx54
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx17
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx84
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx54
-rw-r--r--sc/source/ui/unoobj/linkuno.cxx157
-rw-r--r--sc/source/ui/unoobj/miscuno.cxx21
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx64
-rw-r--r--sc/source/ui/unoobj/notesuno.cxx14
-rw-r--r--sc/source/ui/unoobj/optuno.cxx8
-rw-r--r--sc/source/ui/unoobj/pageuno.cxx14
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx29
-rw-r--r--sc/source/ui/unoobj/scdetect.hxx6
-rw-r--r--sc/source/ui/unoobj/servuno.cxx42
-rw-r--r--sc/source/ui/unoobj/shapeuno.cxx84
-rw-r--r--sc/source/ui/unoobj/srchuno.cxx28
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx190
-rw-r--r--sc/source/ui/unoobj/targuno.cxx24
-rw-r--r--sc/source/ui/unoobj/textuno.cxx10
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx18
-rw-r--r--sc/source/ui/unoobj/unodoc.cxx10
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx48
-rw-r--r--sc/source/ui/unoobj/warnpassword.cxx1
-rw-r--r--sc/source/ui/vba/excelvbahelper.cxx28
-rw-r--r--sc/source/ui/vba/excelvbahelper.hxx2
-rw-r--r--sc/source/ui/vba/testvba/testvba.cxx77
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx123
-rw-r--r--sc/source/ui/vba/vbaapplication.hxx34
-rw-r--r--sc/source/ui/vba/vbaassistant.cxx12
-rw-r--r--sc/source/ui/vba/vbaassistant.hxx8
-rw-r--r--sc/source/ui/vba/vbaaxes.cxx26
-rw-r--r--sc/source/ui/vba/vbaaxes.hxx4
-rw-r--r--sc/source/ui/vba/vbaaxis.cxx120
-rw-r--r--sc/source/ui/vba/vbaaxis.hxx4
-rw-r--r--sc/source/ui/vba/vbaaxistitle.cxx12
-rw-r--r--sc/source/ui/vba/vbaaxistitle.hxx4
-rw-r--r--sc/source/ui/vba/vbaborders.cxx36
-rw-r--r--sc/source/ui/vba/vbaborders.hxx4
-rw-r--r--sc/source/ui/vba/vbacharacters.cxx24
-rw-r--r--sc/source/ui/vba/vbacharacters.hxx14
-rw-r--r--sc/source/ui/vba/vbachart.cxx108
-rw-r--r--sc/source/ui/vba/vbachart.hxx10
-rw-r--r--sc/source/ui/vba/vbachartobject.cxx26
-rw-r--r--sc/source/ui/vba/vbachartobject.hxx12
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx38
-rw-r--r--sc/source/ui/vba/vbachartobjects.hxx14
-rw-r--r--sc/source/ui/vba/vbacharttitle.cxx12
-rw-r--r--sc/source/ui/vba/vbacharttitle.hxx4
-rw-r--r--sc/source/ui/vba/vbacomment.cxx24
-rw-r--r--sc/source/ui/vba/vbacomment.hxx10
-rw-r--r--sc/source/ui/vba/vbacomments.cxx10
-rw-r--r--sc/source/ui/vba/vbacomments.hxx4
-rw-r--r--sc/source/ui/vba/vbacondition.cxx10
-rw-r--r--sc/source/ui/vba/vbacondition.hxx4
-rw-r--r--sc/source/ui/vba/vbadialog.cxx66
-rw-r--r--sc/source/ui/vba/vbadialog.hxx6
-rw-r--r--sc/source/ui/vba/vbadialogs.cxx10
-rw-r--r--sc/source/ui/vba/vbadialogs.hxx4
-rw-r--r--sc/source/ui/vba/vbaeventshelper.cxx3
-rw-r--r--sc/source/ui/vba/vbaeventshelper.hxx2
-rw-r--r--sc/source/ui/vba/vbafont.cxx56
-rw-r--r--sc/source/ui/vba/vbafont.hxx4
-rw-r--r--sc/source/ui/vba/vbaformat.cxx140
-rw-r--r--sc/source/ui/vba/vbaformat.hxx6
-rw-r--r--sc/source/ui/vba/vbaformatcondition.cxx20
-rw-r--r--sc/source/ui/vba/vbaformatcondition.hxx6
-rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx52
-rw-r--r--sc/source/ui/vba/vbaformatconditions.hxx10
-rw-r--r--sc/source/ui/vba/vbaglobals.cxx40
-rw-r--r--sc/source/ui/vba/vbaglobals.hxx8
-rw-r--r--sc/source/ui/vba/vbahyperlink.cxx2
-rw-r--r--sc/source/ui/vba/vbahyperlink.hxx24
-rw-r--r--sc/source/ui/vba/vbahyperlinks.cxx3
-rw-r--r--sc/source/ui/vba/vbainterior.cxx36
-rw-r--r--sc/source/ui/vba/vbainterior.hxx8
-rw-r--r--sc/source/ui/vba/vbamenu.cxx14
-rw-r--r--sc/source/ui/vba/vbamenu.hxx8
-rw-r--r--sc/source/ui/vba/vbamenubar.cxx10
-rw-r--r--sc/source/ui/vba/vbamenubar.hxx4
-rw-r--r--sc/source/ui/vba/vbamenubars.cxx14
-rw-r--r--sc/source/ui/vba/vbamenubars.hxx4
-rw-r--r--sc/source/ui/vba/vbamenuitem.cxx18
-rw-r--r--sc/source/ui/vba/vbamenuitem.hxx12
-rw-r--r--sc/source/ui/vba/vbamenuitems.cxx14
-rw-r--r--sc/source/ui/vba/vbamenuitems.hxx6
-rw-r--r--sc/source/ui/vba/vbamenus.cxx12
-rw-r--r--sc/source/ui/vba/vbamenus.hxx6
-rw-r--r--sc/source/ui/vba/vbaname.hxx32
-rw-r--r--sc/source/ui/vba/vbanames.hxx4
-rw-r--r--sc/source/ui/vba/vbaoleobject.cxx20
-rw-r--r--sc/source/ui/vba/vbaoleobject.hxx8
-rw-r--r--sc/source/ui/vba/vbaoleobjects.cxx12
-rw-r--r--sc/source/ui/vba/vbaoleobjects.hxx6
-rw-r--r--sc/source/ui/vba/vbaoutline.cxx10
-rw-r--r--sc/source/ui/vba/vbaoutline.hxx4
-rw-r--r--sc/source/ui/vba/vbapagebreak.cxx40
-rw-r--r--sc/source/ui/vba/vbapagebreak.hxx12
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx26
-rw-r--r--sc/source/ui/vba/vbapagebreaks.hxx8
-rw-r--r--sc/source/ui/vba/vbapagesetup.cxx144
-rw-r--r--sc/source/ui/vba/vbapagesetup.hxx32
-rw-r--r--sc/source/ui/vba/vbapalette.cxx4
-rw-r--r--sc/source/ui/vba/vbapane.cxx24
-rw-r--r--sc/source/ui/vba/vbapivotcache.cxx10
-rw-r--r--sc/source/ui/vba/vbapivotcache.hxx4
-rw-r--r--sc/source/ui/vba/vbapivottable.cxx10
-rw-r--r--sc/source/ui/vba/vbapivottable.hxx4
-rw-r--r--sc/source/ui/vba/vbapivottables.cxx10
-rw-r--r--sc/source/ui/vba/vbapivottables.hxx4
-rw-r--r--sc/source/ui/vba/vbapropvalue.hxx2
-rw-r--r--sc/source/ui/vba/vbarange.cxx298
-rw-r--r--sc/source/ui/vba/vbarange.hxx20
-rw-r--r--sc/source/ui/vba/vbasheetobject.cxx3
-rw-r--r--sc/source/ui/vba/vbasheetobject.hxx38
-rw-r--r--sc/source/ui/vba/vbasheetobjects.cxx1
-rw-r--r--sc/source/ui/vba/vbasheetobjects.hxx2
-rw-r--r--sc/source/ui/vba/vbastyle.cxx46
-rw-r--r--sc/source/ui/vba/vbastyle.hxx14
-rw-r--r--sc/source/ui/vba/vbastyles.cxx32
-rw-r--r--sc/source/ui/vba/vbastyles.hxx10
-rw-r--r--sc/source/ui/vba/vbatextboxshape.cxx6
-rw-r--r--sc/source/ui/vba/vbatextboxshape.hxx4
-rw-r--r--sc/source/ui/vba/vbatextframe.cxx10
-rw-r--r--sc/source/ui/vba/vbatextframe.hxx4
-rw-r--r--sc/source/ui/vba/vbatitle.hxx32
-rw-r--r--sc/source/ui/vba/vbavalidation.cxx78
-rw-r--r--sc/source/ui/vba/vbavalidation.hxx24
-rw-r--r--sc/source/ui/vba/vbawindow.cxx78
-rw-r--r--sc/source/ui/vba/vbawindow.hxx4
-rw-r--r--sc/source/ui/vba/vbawindows.cxx28
-rw-r--r--sc/source/ui/vba/vbawindows.hxx4
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx26
-rw-r--r--sc/source/ui/vba/vbaworkbook.hxx8
-rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx74
-rw-r--r--sc/source/ui/vba/vbaworkbooks.hxx12
-rw-r--r--sc/source/ui/vba/vbaworksheet.cxx80
-rw-r--r--sc/source/ui/vba/vbaworksheet.hxx26
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx32
-rw-r--r--sc/source/ui/vba/vbaworksheets.hxx8
-rw-r--r--sc/source/ui/vba/vbawsfunction.cxx38
-rw-r--r--sc/source/ui/vba/vbawsfunction.hxx16
-rw-r--r--sc/source/ui/view/auditsh.cxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx8
-rw-r--r--sc/source/ui/view/cellsh1.cxx33
-rw-r--r--sc/source/ui/view/cellsh2.cxx2
-rw-r--r--sc/source/ui/view/cellsh3.cxx6
-rw-r--r--sc/source/ui/view/dbfunc.cxx2
-rw-r--r--sc/source/ui/view/dbfunc3.cxx51
-rw-r--r--sc/source/ui/view/editsh.cxx12
-rw-r--r--sc/source/ui/view/formatsh.cxx6
-rw-r--r--sc/source/ui/view/gridwin.cxx39
-rw-r--r--sc/source/ui/view/gridwin2.cxx8
-rw-r--r--sc/source/ui/view/gridwin4.cxx4
-rw-r--r--sc/source/ui/view/gridwin5.cxx2
-rw-r--r--sc/source/ui/view/hdrcont.cxx4
-rw-r--r--sc/source/ui/view/output.cxx6
-rw-r--r--sc/source/ui/view/output2.cxx28
-rw-r--r--sc/source/ui/view/pgbrksh.cxx2
-rw-r--r--sc/source/ui/view/pivotsh.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx16
-rw-r--r--sc/source/ui/view/printfun.cxx6
-rw-r--r--sc/source/ui/view/tabcont.cxx8
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh9.cxx2
-rw-r--r--sc/source/ui/view/tabvwshb.cxx2
-rw-r--r--sc/source/ui/view/tabvwshc.cxx8
-rw-r--r--sc/source/ui/view/tabvwshe.cxx2
-rw-r--r--sc/source/ui/view/tabvwshf.cxx18
-rw-r--r--sc/source/ui/view/tabvwshg.cxx16
-rw-r--r--sc/source/ui/view/viewdata.cxx90
-rw-r--r--sc/source/ui/view/viewfun2.cxx56
-rw-r--r--sc/source/ui/view/viewfun3.cxx12
-rw-r--r--sc/source/ui/view/viewfun4.cxx10
-rw-r--r--sc/source/ui/view/viewfun5.cxx28
-rw-r--r--sc/source/ui/view/viewfun6.cxx2
-rw-r--r--sc/source/ui/view/viewfun7.cxx8
-rw-r--r--sc/source/ui/view/viewfunc.cxx22
-rw-r--r--sc/source/ui/view/viewutil.cxx6
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx4
-rw-r--r--sc/workben/addin.cxx34
-rw-r--r--sc/workben/addin.hxx32
-rw-r--r--sc/workben/result.cxx2
-rw-r--r--scaddins/source/analysis/analysishelper.cxx2
-rw-r--r--scaddins/source/analysis/analysishelper.hxx12
-rw-r--r--scaddins/source/datefunc/datefunc.hxx74
-rw-r--r--scaddins/source/pricing/pricing.hxx70
-rw-r--r--sccomp/source/solver/solver.cxx1
-rw-r--r--sccomp/source/solver/solver.hxx14
-rw-r--r--scripting/source/basprov/baslibnode.cxx10
-rw-r--r--scripting/source/basprov/baslibnode.hxx10
-rw-r--r--scripting/source/basprov/basmethnode.cxx54
-rw-r--r--scripting/source/basprov/basmethnode.hxx18
-rw-r--r--scripting/source/basprov/basmodnode.cxx6
-rw-r--r--scripting/source/basprov/basmodnode.hxx6
-rw-r--r--scripting/source/basprov/basprov.cxx92
-rw-r--r--scripting/source/basprov/basprov.hxx16
-rw-r--r--scripting/source/basprov/basscript.cxx10
-rw-r--r--scripting/source/basprov/basscript.hxx6
-rw-r--r--scripting/source/dlgprov/DialogModelProvider.cxx38
-rw-r--r--scripting/source/dlgprov/DialogModelProvider.hxx30
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx78
-rw-r--r--scripting/source/dlgprov/dlgevtatt.hxx20
-rw-r--r--scripting/source/dlgprov/dlgprov.cxx118
-rw-r--r--scripting/source/dlgprov/dlgprov.hxx22
-rw-r--r--scripting/source/inc/util/MiscUtils.hxx20
-rw-r--r--scripting/source/inc/util/scriptingconstants.hxx12
-rw-r--r--scripting/source/protocolhandler/scripthandler.cxx38
-rw-r--r--scripting/source/protocolhandler/scripthandler.hxx12
-rw-r--r--scripting/source/provider/ActiveMSPList.cxx20
-rw-r--r--scripting/source/provider/ActiveMSPList.hxx16
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx58
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.hxx6
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx130
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx36
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.cxx20
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.hxx6
-rw-r--r--scripting/source/provider/ProviderCache.cxx14
-rw-r--r--scripting/source/provider/ProviderCache.hxx12
-rw-r--r--scripting/source/provider/ScriptImpl.cxx10
-rw-r--r--scripting/source/provider/ScriptImpl.hxx4
-rw-r--r--scripting/source/provider/ScriptingContext.cxx2
-rw-r--r--scripting/source/provider/URIHelper.cxx15
-rw-r--r--scripting/source/provider/URIHelper.hxx28
-rw-r--r--scripting/source/stringresource/stringresource.cxx406
-rw-r--r--scripting/source/stringresource/stringresource.hxx190
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx174
-rw-r--r--scripting/source/vbaevents/service.cxx8
-rw-r--r--sd/inc/CustomAnimationEffect.hxx22
-rw-r--r--sd/inc/CustomAnimationPreset.hxx42
-rw-r--r--sd/inc/EffectMigration.hxx6
-rw-r--r--sd/inc/TransitionPreset.hxx10
-rw-r--r--sd/inc/drawdoc.hxx18
-rw-r--r--sd/inc/sdabstdlg.hxx4
-rw-r--r--sd/inc/sdattr.hxx4
-rw-r--r--sd/inc/sdfilter.hxx4
-rw-r--r--sd/inc/sdundo.hxx2
-rw-r--r--sd/inc/stlfamily.hxx36
-rw-r--r--sd/inc/stlpool.hxx14
-rw-r--r--sd/inc/stlsheet.hxx46
-rw-r--r--sd/inc/strmname.h10
-rw-r--r--sd/inc/undoanim.hxx6
-rw-r--r--sd/qa/unit/filters-test.cxx34
-rw-r--r--sd/qa/unit/regression-test.cxx48
-rw-r--r--sd/source/core/CustomAnimationCloner.cxx8
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx7
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx23
-rw-r--r--sd/source/core/EffectMigration.cxx1
-rw-r--r--sd/source/core/TransitionPreset.cxx7
-rw-r--r--sd/source/core/anminfo.cxx2
-rw-r--r--sd/source/core/annotations/Annotation.cxx5
-rw-r--r--sd/source/core/drawdoc.cxx3
-rw-r--r--sd/source/core/drawdoc2.cxx2
-rw-r--r--sd/source/core/drawdoc3.cxx38
-rw-r--r--sd/source/core/drawdoc4.cxx1
-rw-r--r--sd/source/core/pglink.cxx2
-rw-r--r--sd/source/core/sdpage.cxx10
-rw-r--r--sd/source/core/sdpage2.cxx4
-rw-r--r--sd/source/core/sdpage_animations.cxx1
-rw-r--r--sd/source/core/stlfamily.cxx5
-rw-r--r--sd/source/core/stlpool.cxx5
-rw-r--r--sd/source/core/stlsheet.cxx2
-rw-r--r--sd/source/core/text/textapi.cxx1
-rw-r--r--sd/source/core/undoanim.cxx10
-rw-r--r--sd/source/filter/cgm/sdcgmfilter.cxx10
-rw-r--r--sd/source/filter/eppt/eppt.cxx114
-rw-r--r--sd/source/filter/eppt/eppt.hxx4
-rw-r--r--sd/source/filter/eppt/epptbase.hxx6
-rw-r--r--sd/source/filter/eppt/epptooxml.hxx10
-rw-r--r--sd/source/filter/eppt/epptso.cxx146
-rw-r--r--sd/source/filter/eppt/escherex.cxx2
-rw-r--r--sd/source/filter/eppt/escherex.hxx2
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx58
-rw-r--r--sd/source/filter/eppt/pptexanimations.hxx12
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx24
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.hxx12
-rw-r--r--sd/source/filter/eppt/pptx-epptbase.cxx44
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx13
-rw-r--r--sd/source/filter/eppt/pptx-stylesheet.cxx6
-rw-r--r--sd/source/filter/eppt/pptx-text.cxx106
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx9
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx32
-rw-r--r--sd/source/filter/html/buttonset.cxx19
-rw-r--r--sd/source/filter/html/buttonset.hxx4
-rw-r--r--sd/source/filter/html/htmlex.cxx26
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/filter/html/pubdlg.cxx5
-rw-r--r--sd/source/filter/ppt/ppt97animations.cxx8
-rw-r--r--sd/source/filter/ppt/ppt97animations.hxx12
-rw-r--r--sd/source/filter/ppt/pptanimations.hxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx26
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx58
-rw-r--r--sd/source/filter/ppt/pptinanimations.hxx6
-rw-r--r--sd/source/filter/sdfilter.cxx8
-rw-r--r--sd/source/filter/sdpptwrp.cxx6
-rw-r--r--sd/source/filter/xml/sdtransform.cxx1
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx29
-rw-r--r--sd/source/helper/simplereferencecomponent.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx17
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx21
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx8
-rw-r--r--sd/source/ui/accessibility/AccessiblePageShape.cxx17
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx10
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx10
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationShape.cxx10
-rw-r--r--sd/source/ui/accessibility/AccessibleScrollPanel.cxx5
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx11
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx11
-rw-r--r--sd/source/ui/accessibility/AccessibleTreeNode.cxx11
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx5
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx13
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.hxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx1
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx1
-rw-r--r--sd/source/ui/animations/STLPropertySet.cxx1
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx3
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx5
-rw-r--r--sd/source/ui/animations/motionpathtag.hxx2
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx13
-rw-r--r--sd/source/ui/annotations/annotationmanagerimpl.hxx2
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx1
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx5
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx2
-rw-r--r--sd/source/ui/app/optsitem.cxx2
-rw-r--r--sd/source/ui/app/sdmod.cxx4
-rw-r--r--sd/source/ui/app/sdmod1.cxx6
-rw-r--r--sd/source/ui/app/sdxfer.cxx4
-rw-r--r--sd/source/ui/app/tbxww.cxx8
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx5
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.hxx6
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx6
-rw-r--r--sd/source/ui/dlg/PaneDockingWindow.cxx2
-rw-r--r--sd/source/ui/dlg/PaneShells.cxx6
-rw-r--r--sd/source/ui/dlg/TemplateScanner.cxx50
-rw-r--r--sd/source/ui/dlg/animobjs.cxx6
-rw-r--r--sd/source/ui/dlg/dlgass.cxx34
-rw-r--r--sd/source/ui/dlg/filedlg.cxx18
-rw-r--r--sd/source/ui/dlg/inspagob.cxx4
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx4
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/dlg/present.cxx1
-rw-r--r--sd/source/ui/dlg/sdabstdlg.cxx2
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx4
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx8
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/dlg/tpoption.cxx2
-rw-r--r--sd/source/ui/dlg/unchss.cxx2
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx4
-rw-r--r--sd/source/ui/docshell/docshel2.cxx2
-rw-r--r--sd/source/ui/docshell/docshel4.cxx16
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx2
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx7
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationClassifier.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx7
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx3
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx8
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationTracer.cxx6
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx1
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx1
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx4
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.hxx14
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx11
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.cxx1
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.hxx4
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx11
-rw-r--r--sd/source/ui/framework/factories/BasicToolBarFactory.cxx10
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx11
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx1
-rw-r--r--sd/source/ui/framework/factories/Pane.cxx1
-rw-r--r--sd/source/ui/framework/factories/PresentationFactory.cxx13
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.cxx23
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx1
-rw-r--r--sd/source/ui/framework/module/CenterViewFocusModule.cxx1
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx33
-rw-r--r--sd/source/ui/framework/module/ResourceManager.cxx1
-rw-r--r--sd/source/ui/framework/module/ResourceManager.hxx8
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.cxx1
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.cxx1
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.hxx2
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.cxx1
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.cxx1
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.hxx2
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.cxx1
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx31
-rw-r--r--sd/source/ui/func/fubullet.cxx2
-rw-r--r--sd/source/ui/func/fuconcs.cxx2
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx16
-rw-r--r--sd/source/ui/func/fuinsfil.cxx15
-rw-r--r--sd/source/ui/func/fupoor.cxx4
-rw-r--r--sd/source/ui/func/fusldlg.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx1
-rw-r--r--sd/source/ui/func/futext.cxx1
-rw-r--r--sd/source/ui/func/futhes.cxx1
-rw-r--r--sd/source/ui/func/unmovss.cxx4
-rw-r--r--sd/source/ui/func/unprlout.cxx2
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx8
-rw-r--r--sd/source/ui/inc/AccessibleDrawDocumentView.hxx8
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx6
-rw-r--r--sd/source/ui/inc/AccessiblePageShape.hxx10
-rw-r--r--sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx6
-rw-r--r--sd/source/ui/inc/AccessiblePresentationOLEShape.hxx6
-rw-r--r--sd/source/ui/inc/AccessiblePresentationShape.hxx6
-rw-r--r--sd/source/ui/inc/AccessibleScrollPanel.hxx6
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterObject.hxx10
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx10
-rw-r--r--sd/source/ui/inc/AccessibleTreeNode.hxx18
-rw-r--r--sd/source/ui/inc/DrawController.hxx6
-rw-r--r--sd/source/ui/inc/DrawSubController.hxx6
-rw-r--r--sd/source/ui/inc/PaneChildWindows.hxx2
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx2
-rw-r--r--sd/source/ui/inc/RemoteServer.hxx8
-rw-r--r--sd/source/ui/inc/SdUnoDrawView.hxx6
-rw-r--r--sd/source/ui/inc/SdUnoOutlineView.hxx6
-rw-r--r--sd/source/ui/inc/SdUnoSlideView.hxx6
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx36
-rw-r--r--sd/source/ui/inc/View.hxx6
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx6
-rw-r--r--sd/source/ui/inc/Window.hxx2
-rw-r--r--sd/source/ui/inc/framework/Configuration.hxx6
-rw-r--r--sd/source/ui/inc/framework/ConfigurationController.hxx8
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx96
-rw-r--r--sd/source/ui/inc/framework/ModuleController.hxx2
-rw-r--r--sd/source/ui/inc/framework/PresentationFactory.hxx2
-rw-r--r--sd/source/ui/inc/framework/ResourceId.hxx36
-rw-r--r--sd/source/ui/inc/fuconcs.hxx2
-rw-r--r--sd/source/ui/inc/fuinsfil.hxx2
-rw-r--r--sd/source/ui/inc/inspagob.hxx2
-rw-r--r--sd/source/ui/inc/optsitem.hxx16
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx4
-rw-r--r--sd/source/ui/inc/sdxfer.hxx6
-rw-r--r--sd/source/ui/inc/slideshow.hxx20
-rw-r--r--sd/source/ui/inc/taskpane/PanelId.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx6
-rw-r--r--sd/source/ui/inc/tools/ConfigurationAccess.hxx18
-rw-r--r--sd/source/ui/inc/tools/PropertySet.hxx20
-rw-r--r--sd/source/ui/inc/tools/SlotStateListener.hxx6
-rw-r--r--sd/source/ui/inc/unchss.hxx2
-rw-r--r--sd/source/ui/inc/unmodpg.hxx4
-rw-r--r--sd/source/ui/inc/unmovss.hxx2
-rw-r--r--sd/source/ui/inc/unomodel.hxx62
-rw-r--r--sd/source/ui/inc/unosrch.hxx26
-rw-r--r--sd/source/ui/inc/unprlout.hxx2
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.cxx1
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx9
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx9
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx4
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx9
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx15
-rw-r--r--sd/source/ui/presenter/PresenterTextView.hxx4
-rw-r--r--sd/source/ui/presenter/SlideRenderer.cxx11
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx2
-rw-r--r--sd/source/ui/remotecontrol/IBluetoothSocket.hxx2
-rw-r--r--sd/source/ui/remotecontrol/ImagePreparer.cxx12
-rw-r--r--sd/source/ui/remotecontrol/ImagePreparer.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Listener.cxx4
-rw-r--r--sd/source/ui/remotecontrol/Listener.hxx2
-rw-r--r--sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx2
-rw-r--r--sd/source/ui/remotecontrol/Receiver.cxx4
-rw-r--r--sd/source/ui/remotecontrol/Receiver.hxx6
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx11
-rw-r--r--sd/source/ui/remotecontrol/Transmitter.cxx1
-rw-r--r--sd/source/ui/remotecontrol/Transmitter.hxx6
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.cxx1
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx5
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx44
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx18
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.cxx1
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx18
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx10
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx12
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx9
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx10
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx2
-rw-r--r--sd/source/ui/table/tablefunction.cxx1
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.cxx4
-rw-r--r--sd/source/ui/toolpanel/ScrollPanel.cxx4
-rw-r--r--sd/source/ui/toolpanel/SubToolPanel.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelFactory.cxx30
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.cxx6
-rw-r--r--sd/source/ui/toolpanel/ToolPanelUIElement.hxx6
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx50
-rw-r--r--sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/DocumentHelper.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.hxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx20
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx10
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx14
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageObserver.cxx8
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx2
-rw-r--r--sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx9
-rw-r--r--sd/source/ui/tools/ConfigurationAccess.cxx7
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx9
-rw-r--r--sd/source/ui/tools/PropertySet.cxx13
-rw-r--r--sd/source/ui/tools/SlotStateListener.cxx4
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx3
-rw-r--r--sd/source/ui/unoidl/SdUnoDrawView.cxx1
-rw-r--r--sd/source/ui/unoidl/SdUnoOutlineView.cxx1
-rw-r--r--sd/source/ui/unoidl/SdUnoSlideView.cxx1
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx47
-rw-r--r--sd/source/ui/unoidl/facreg.cxx3
-rw-r--r--sd/source/ui/unoidl/randomnode.cxx1
-rw-r--r--sd/source/ui/unoidl/sddetect.hxx2
-rw-r--r--sd/source/ui/unoidl/unocpres.hxx30
-rw-r--r--sd/source/ui/unoidl/unodoc.cxx16
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx2
-rw-r--r--sd/source/ui/unoidl/unolayer.hxx34
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx23
-rw-r--r--sd/source/ui/unoidl/unomodule.hxx8
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx24
-rw-r--r--sd/source/ui/unoidl/unoobj.hxx14
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.hxx64
-rw-r--r--sd/source/ui/unoidl/unopback.cxx6
-rw-r--r--sd/source/ui/unoidl/unopback.hxx28
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx14
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx45
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx3
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx86
-rw-r--r--sd/source/ui/view/ViewClipboard.cxx8
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx23
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx2
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx1
-rw-r--r--sd/source/ui/view/drtxtob.cxx2
-rw-r--r--sd/source/ui/view/drviews1.cxx4
-rw-r--r--sd/source/ui/view/drviews3.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx1
-rw-r--r--sd/source/ui/view/drviewsa.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx1
-rw-r--r--sd/source/ui/view/drviewsf.cxx1
-rw-r--r--sd/source/ui/view/frmview.cxx11
-rw-r--r--sd/source/ui/view/outlnvsh.cxx1
-rw-r--r--sd/source/ui/view/outlview.cxx1
-rw-r--r--sd/source/ui/view/presvish.cxx1
-rw-r--r--sd/source/ui/view/sdview2.cxx20
-rw-r--r--sd/source/ui/view/sdview3.cxx10
-rw-r--r--sd/source/ui/view/sdview4.cxx12
-rw-r--r--sd/source/ui/view/sdwindow.cxx6
-rw-r--r--sd/source/ui/view/unmodpg.cxx4
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx3
-rw-r--r--sd/source/ui/view/viewshe2.cxx8
-rw-r--r--sd/source/ui/view/viewshel.cxx2
-rw-r--r--sd/workben/custompanel/ctp_panel.cxx8
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx18
-rw-r--r--sdext/source/minimizer/configurationaccess.hxx18
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx12
-rw-r--r--sdext/source/minimizer/fileopendialog.hxx18
-rw-r--r--sdext/source/minimizer/graphiccollector.cxx4
-rw-r--r--sdext/source/minimizer/graphiccollector.hxx4
-rw-r--r--sdext/source/minimizer/impoptimizer.cxx4
-rw-r--r--sdext/source/minimizer/impoptimizer.hxx6
-rw-r--r--sdext/source/minimizer/informationdialog.cxx36
-rw-r--r--sdext/source/minimizer/informationdialog.hxx6
-rw-r--r--sdext/source/minimizer/optimizerdialog.cxx22
-rw-r--r--sdext/source/minimizer/optimizerdialog.hxx6
-rw-r--r--sdext/source/minimizer/optimizerdialogcontrols.cxx66
-rw-r--r--sdext/source/minimizer/pagecollector.cxx4
-rw-r--r--sdext/source/minimizer/pagecollector.hxx4
-rw-r--r--sdext/source/minimizer/pppoptimizer.cxx4
-rw-r--r--sdext/source/minimizer/pppoptimizer.hxx14
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.cxx12
-rw-r--r--sdext/source/minimizer/pppoptimizerdialog.hxx12
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.cxx6
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.hxx4
-rw-r--r--sdext/source/minimizer/unodialog.hxx46
-rw-r--r--sdext/source/pdfimport/filterdet.cxx128
-rw-r--r--sdext/source/pdfimport/filterdet.hxx16
-rw-r--r--sdext/source/pdfimport/inc/contentsink.hxx8
-rw-r--r--sdext/source/pdfimport/inc/pdfihelper.hxx12
-rw-r--r--sdext/source/pdfimport/inc/pdfparse.hxx26
-rw-r--r--sdext/source/pdfimport/inc/wrapper.hxx6
-rw-r--r--sdext/source/pdfimport/inc/xmlemitter.hxx2
-rw-r--r--sdext/source/pdfimport/misc/pdfihelper.cxx12
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx18
-rw-r--r--sdext/source/pdfimport/odf/odfemitter.cxx20
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.cxx28
-rw-r--r--sdext/source/pdfimport/pdfiadaptor.hxx8
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx12
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx8
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.cxx22
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.hxx2
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.cxx34
-rw-r--r--sdext/source/pdfimport/sax/saxattrlist.hxx20
-rw-r--r--sdext/source/pdfimport/services.cxx6
-rw-r--r--sdext/source/pdfimport/test/outputwrap.hxx2
-rw-r--r--sdext/source/pdfimport/test/pdf2xml.cxx8
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx20
-rw-r--r--sdext/source/pdfimport/test/tests.cxx22
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx28
-rw-r--r--sdext/source/pdfimport/tree/genericelements.hxx8
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.cxx6
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx26
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.hxx18
-rw-r--r--sdext/source/pdfimport/tree/style.cxx6
-rw-r--r--sdext/source/pdfimport/tree/style.hxx14
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx26
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.hxx2
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx110
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx43
-rw-r--r--sdext/source/presenter/PresenterAccessibility.hxx2
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.cxx5
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.hxx12
-rw-r--r--sdext/source/presenter/PresenterButton.cxx1
-rw-r--r--sdext/source/presenter/PresenterButton.hxx12
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.cxx4
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.hxx4
-rw-r--r--sdext/source/presenter/PresenterComponent.cxx1
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx19
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.hxx28
-rw-r--r--sdext/source/presenter/PresenterController.cxx8
-rw-r--r--sdext/source/presenter/PresenterController.hxx12
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.cxx3
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.hxx2
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.cxx1
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.hxx4
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx5
-rw-r--r--sdext/source/presenter/PresenterHelper.cxx1
-rw-r--r--sdext/source/presenter/PresenterHelper.hxx20
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx9
-rw-r--r--sdext/source/presenter/PresenterPane.cxx1
-rw-r--r--sdext/source/presenter/PresenterPane.hxx4
-rw-r--r--sdext/source/presenter/PresenterPaneBase.cxx5
-rw-r--r--sdext/source/presenter/PresenterPaneBase.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.cxx7
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.hxx4
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx19
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.hxx18
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.cxx3
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.hxx22
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx15
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.hxx24
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx7
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.hxx6
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx7
-rw-r--r--sdext/source/presenter/PresenterScreen.hxx16
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx1
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.cxx3
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx1
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx1
-rw-r--r--sdext/source/presenter/PresenterSpritePane.cxx1
-rw-r--r--sdext/source/presenter/PresenterSpritePane.hxx4
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx10
-rw-r--r--sdext/source/presenter/PresenterTextView.hxx6
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx21
-rw-r--r--sdext/source/presenter/PresenterTheme.hxx26
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx9
-rw-r--r--sdext/source/presenter/PresenterToolBar.hxx4
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx13
-rw-r--r--sdext/source/presenter/PresenterViewFactory.hxx18
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx1
-rw-r--r--sdext/source/presenter/PresenterWindowManager.hxx4
-rw-r--r--sfx2/inc/bluthsndapi.hxx2
-rw-r--r--sfx2/inc/frmload.hxx12
-rw-r--r--sfx2/inc/guisaveas.hxx10
-rw-r--r--sfx2/inc/sfx2/DocumentMetadataAccess.hxx20
-rw-r--r--sfx2/inc/sfx2/Metadatable.hxx6
-rw-r--r--sfx2/inc/sfx2/XmlIdRegistry.hxx6
-rw-r--r--sfx2/inc/sfx2/app.hxx2
-rw-r--r--sfx2/inc/sfx2/appuno.hxx6
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx4
-rw-r--r--sfx2/inc/sfx2/bindings.hxx4
-rw-r--r--sfx2/inc/sfx2/brokenpackageint.hxx4
-rw-r--r--sfx2/inc/sfx2/checkin.hxx2
-rw-r--r--sfx2/inc/sfx2/childwin.hxx2
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx68
-rw-r--r--sfx2/inc/sfx2/docfac.hxx6
-rw-r--r--sfx2/inc/sfx2/docfile.hxx38
-rw-r--r--sfx2/inc/sfx2/docfilt.hxx12
-rw-r--r--sfx2/inc/sfx2/docinsert.hxx2
-rw-r--r--sfx2/inc/sfx2/dockwin.hxx4
-rw-r--r--sfx2/inc/sfx2/docmacromode.hxx2
-rw-r--r--sfx2/inc/sfx2/doctempl.hxx10
-rw-r--r--sfx2/inc/sfx2/event.hxx10
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx2
-rw-r--r--sfx2/inc/sfx2/fcontnr.hxx4
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx26
-rw-r--r--sfx2/inc/sfx2/frmhtmlw.hxx2
-rw-r--r--sfx2/inc/sfx2/imagemgr.hxx2
-rw-r--r--sfx2/inc/sfx2/infobar.hxx12
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx10
-rw-r--r--sfx2/inc/sfx2/mailmodelapi.hxx18
-rw-r--r--sfx2/inc/sfx2/msg.hxx4
-rw-r--r--sfx2/inc/sfx2/objface.hxx4
-rw-r--r--sfx2/inc/sfx2/objsh.hxx26
-rw-r--r--sfx2/inc/sfx2/querystatus.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxbasecontroller.hxx8
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx70
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx8
-rw-r--r--sfx2/inc/sfx2/sfxmodelfactory.hxx4
-rw-r--r--sfx2/inc/sfx2/sfxstatuslistener.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxuno.hxx56
-rw-r--r--sfx2/inc/sfx2/stbitem.hxx2
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx2
-rw-r--r--sfx2/inc/sfx2/taskpane.hxx16
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx16
-rw-r--r--sfx2/inc/sfx2/templateabstractview.hxx4
-rw-r--r--sfx2/inc/sfx2/templatelocalview.hxx2
-rw-r--r--sfx2/inc/sfx2/templateproperties.hxx4
-rw-r--r--sfx2/inc/sfx2/templaterepository.hxx8
-rw-r--r--sfx2/inc/sfx2/templateviewitem.hxx24
-rw-r--r--sfx2/inc/sfx2/thumbnailview.hxx2
-rw-r--r--sfx2/inc/sfx2/thumbnailviewitem.hxx6
-rw-r--r--sfx2/inc/sfx2/titledockwin.hxx4
-rw-r--r--sfx2/inc/sfx2/unoctitm.hxx8
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx10
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx2
-rw-r--r--sfx2/inc/srchdlg.hxx6
-rw-r--r--sfx2/qa/cppunit/test_metadatable.cxx14
-rw-r--r--sfx2/source/appl/app.cxx14
-rw-r--r--sfx2/source/appl/appbas.cxx2
-rw-r--r--sfx2/source/appl/appbaslib.cxx3
-rw-r--r--sfx2/source/appl/appcfg.cxx30
-rw-r--r--sfx2/source/appl/appdde.cxx10
-rw-r--r--sfx2/source/appl/appinit.cxx22
-rw-r--r--sfx2/source/appl/appmisc.cxx10
-rw-r--r--sfx2/source/appl/appopen.cxx70
-rw-r--r--sfx2/source/appl/appserv.cxx112
-rw-r--r--sfx2/source/appl/appuno.cxx266
-rw-r--r--sfx2/source/appl/childwin.cxx10
-rw-r--r--sfx2/source/appl/fileobj.cxx14
-rw-r--r--sfx2/source/appl/helpdispatch.cxx2
-rw-r--r--sfx2/source/appl/helpinterceptor.cxx6
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx4
-rw-r--r--sfx2/source/appl/imagemgr.cxx22
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx20
-rw-r--r--sfx2/source/appl/impldde.cxx8
-rw-r--r--sfx2/source/appl/linkmgr2.cxx18
-rw-r--r--sfx2/source/appl/lnkbase2.cxx6
-rw-r--r--sfx2/source/appl/newhelp.cxx102
-rw-r--r--sfx2/source/appl/newhelp.hxx14
-rw-r--r--sfx2/source/appl/openuriexternally.cxx6
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx48
-rw-r--r--sfx2/source/appl/shutdownicon.cxx13
-rw-r--r--sfx2/source/appl/shutdownicon.hxx14
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx14
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx10
-rw-r--r--sfx2/source/appl/workwin.cxx18
-rw-r--r--sfx2/source/appl/xpackcreator.cxx24
-rw-r--r--sfx2/source/appl/xpackcreator.hxx12
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx98
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx32
-rw-r--r--sfx2/source/bastyp/helper.cxx1
-rw-r--r--sfx2/source/bastyp/mieclip.cxx4
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx2
-rw-r--r--sfx2/source/config/evntconf.cxx32
-rw-r--r--sfx2/source/control/bindings.cxx10
-rw-r--r--sfx2/source/control/dispatch.cxx24
-rw-r--r--sfx2/source/control/msg.cxx8
-rw-r--r--sfx2/source/control/msgpool.cxx4
-rw-r--r--sfx2/source/control/objface.cxx8
-rw-r--r--sfx2/source/control/querystatus.cxx9
-rw-r--r--sfx2/source/control/request.cxx16
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx9
-rw-r--r--sfx2/source/control/sorgitm.cxx4
-rw-r--r--sfx2/source/control/statcach.cxx8
-rw-r--r--sfx2/source/control/templateabstractview.cxx12
-rw-r--r--sfx2/source/control/templatelocalview.cxx2
-rw-r--r--sfx2/source/control/thumbnailview.cxx2
-rw-r--r--sfx2/source/control/thumbnailviewacc.cxx24
-rw-r--r--sfx2/source/control/thumbnailviewacc.hxx8
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx8
-rw-r--r--sfx2/source/control/unoctitm.cxx40
-rw-r--r--sfx2/source/dialog/basedlgs.cxx16
-rw-r--r--sfx2/source/dialog/bluthsnd.cxx10
-rw-r--r--sfx2/source/dialog/checkin.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx56
-rw-r--r--sfx2/source/dialog/dockwin.cxx28
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx112
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx52
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx112
-rw-r--r--sfx2/source/dialog/filtergrouping.hxx16
-rw-r--r--sfx2/source/dialog/infobar.cxx8
-rw-r--r--sfx2/source/dialog/inputdlg.cxx4
-rw-r--r--sfx2/source/dialog/mailmodel.cxx106
-rw-r--r--sfx2/source/dialog/partwnd.cxx4
-rw-r--r--sfx2/source/dialog/recfloat.cxx8
-rw-r--r--sfx2/source/dialog/splitwin.cxx6
-rw-r--r--sfx2/source/dialog/srchdlg.cxx10
-rw-r--r--sfx2/source/dialog/tabdlg.cxx6
-rw-r--r--sfx2/source/dialog/taskpane.cxx100
-rw-r--r--sfx2/source/dialog/templdlg.cxx28
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx268
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx16
-rw-r--r--sfx2/source/doc/docfac.cxx72
-rw-r--r--sfx2/source/doc/docfile.cxx182
-rw-r--r--sfx2/source/doc/docfilt.cxx14
-rw-r--r--sfx2/source/doc/docinf.cxx18
-rw-r--r--sfx2/source/doc/docinsert.cxx6
-rw-r--r--sfx2/source/doc/docmacromode.cxx18
-rw-r--r--sfx2/source/doc/doctempl.cxx10
-rw-r--r--sfx2/source/doc/doctemplates.cxx206
-rw-r--r--sfx2/source/doc/doctemplateslocal.cxx34
-rw-r--r--sfx2/source/doc/doctemplateslocal.hxx22
-rw-r--r--sfx2/source/doc/docundomanager.cxx14
-rw-r--r--sfx2/source/doc/graphhelp.cxx18
-rw-r--r--sfx2/source/doc/graphhelp.hxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx316
-rw-r--r--sfx2/source/doc/iframe.cxx28
-rw-r--r--sfx2/source/doc/new.cxx2
-rw-r--r--sfx2/source/doc/objcont.cxx20
-rw-r--r--sfx2/source/doc/objmisc.cxx74
-rw-r--r--sfx2/source/doc/objserv.cxx24
-rw-r--r--sfx2/source/doc/objstor.cxx262
-rw-r--r--sfx2/source/doc/objxtor.cxx54
-rw-r--r--sfx2/source/doc/oleprops.cxx7
-rw-r--r--sfx2/source/doc/ownsubfilterservice.cxx20
-rw-r--r--sfx2/source/doc/plugin.cxx24
-rw-r--r--sfx2/source/doc/printhelper.cxx34
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx328
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx30
-rw-r--r--sfx2/source/doc/zoomitem.cxx6
-rw-r--r--sfx2/source/inc/SfxDocumentMetaData.hxx8
-rw-r--r--sfx2/source/inc/appbaslib.hxx10
-rw-r--r--sfx2/source/inc/doctemplates.hxx28
-rw-r--r--sfx2/source/inc/docundomanager.hxx10
-rw-r--r--sfx2/source/inc/eventsupplier.hxx12
-rw-r--r--sfx2/source/inc/iframe.hxx14
-rw-r--r--sfx2/source/inc/inputdlg.hxx4
-rw-r--r--sfx2/source/inc/objshimp.hxx6
-rw-r--r--sfx2/source/inc/openuriexternally.hxx2
-rw-r--r--sfx2/source/inc/ownsubfilterservice.hxx10
-rw-r--r--sfx2/source/inc/plugin.hxx16
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx12
-rw-r--r--sfx2/source/inc/sfxurlrelocator.hxx8
-rw-r--r--sfx2/source/inc/workwin.hxx10
-rw-r--r--sfx2/source/inet/inettbc.cxx22
-rw-r--r--sfx2/source/menu/mnumgr.cxx24
-rw-r--r--sfx2/source/menu/thessubmenu.cxx1
-rw-r--r--sfx2/source/menu/thessubmenu.hxx4
-rw-r--r--sfx2/source/menu/virtmenu.cxx34
-rw-r--r--sfx2/source/notify/eventsupplier.cxx68
-rw-r--r--sfx2/source/statbar/stbitem.cxx10
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx60
-rw-r--r--sfx2/source/view/frame2.cxx12
-rw-r--r--sfx2/source/view/frmload.cxx88
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx38
-rw-r--r--sfx2/source/view/viewfac.cxx6
-rw-r--r--sfx2/source/view/viewfrm.cxx82
-rw-r--r--sfx2/source/view/viewfrm2.cxx8
-rw-r--r--sfx2/source/view/viewprn.cxx48
-rw-r--r--sfx2/source/view/viewsh.cxx102
-rw-r--r--sfx2/workben/custompanel/ctp_factory.cxx26
-rw-r--r--sfx2/workben/custompanel/ctp_factory.hxx12
-rw-r--r--sfx2/workben/custompanel/ctp_panel.cxx10
-rw-r--r--sfx2/workben/custompanel/ctp_panel.hxx6
-rw-r--r--shell/source/backends/desktopbe/desktopbackend.cxx50
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx46
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.cxx38
-rw-r--r--shell/source/backends/kde4be/kde4access.cxx20
-rw-r--r--shell/source/backends/kde4be/kde4access.hxx2
-rw-r--r--shell/source/backends/kde4be/kde4backend.cxx38
-rw-r--r--shell/source/backends/kdebe/kdeaccess.cxx20
-rw-r--r--shell/source/backends/kdebe/kdeaccess.hxx2
-rw-r--r--shell/source/backends/kdebe/kdebackend.cxx38
-rw-r--r--shell/source/backends/localebe/localebackend.cxx48
-rw-r--r--shell/source/backends/localebe/localebackend.hxx28
-rw-r--r--shell/source/backends/macbe/macbackend.hxx22
-rw-r--r--shell/source/backends/wininetbe/wininetbackend.cxx50
-rw-r--r--shell/source/backends/wininetbe/wininetbackend.hxx22
-rw-r--r--shell/source/cmdmail/cmdmailmsg.cxx9
-rw-r--r--shell/source/cmdmail/cmdmailmsg.hxx42
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.cxx4
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.hxx6
-rw-r--r--shell/source/sessioninstall/SyncDbusSessionHelper.cxx4
-rw-r--r--shell/source/sessioninstall/SyncDbusSessionHelper.hxx24
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx18
-rw-r--r--shell/source/unix/exec/shellexec.cxx10
-rw-r--r--shell/source/unix/exec/shellexec.hxx12
-rw-r--r--shell/source/unix/exec/urltest.cxx4
-rw-r--r--shell/source/unix/sysshell/recently_used_file.cxx16
-rw-r--r--shell/source/unix/sysshell/recently_used_file_handler.cxx18
-rw-r--r--shell/source/win32/SysShExec.cxx3
-rw-r--r--shell/source/win32/SysShExec.hxx8
-rw-r--r--shell/source/win32/simplemail/senddoc.cxx2
-rw-r--r--shell/source/win32/simplemail/smplmailclient.cxx56
-rw-r--r--shell/source/win32/simplemail/smplmailclient.hxx2
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.cxx7
-rw-r--r--shell/source/win32/simplemail/smplmailmsg.hxx36
-rw-r--r--shell/source/win32/simplemail/smplmailsuppl.cxx1
-rw-r--r--shell/source/win32/simplemail/smplmailsuppl.hxx6
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx6
-rw-r--r--slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx2
-rw-r--r--slideshow/source/engine/activities/accumulation.hxx4
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx2
-rw-r--r--slideshow/source/engine/activities/interpolation.hxx12
-rw-r--r--slideshow/source/engine/activitiesqueue.cxx4
-rw-r--r--slideshow/source/engine/animationfactory.cxx32
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.hxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationsetnode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx10
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.cxx2
-rw-r--r--slideshow/source/engine/attributemap.cxx4
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx2
-rw-r--r--slideshow/source/engine/eventqueue.cxx4
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx6
-rw-r--r--slideshow/source/engine/shapeattributelayer.cxx6
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx8
-rw-r--r--slideshow/source/engine/shapes/appletshape.hxx2
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx4
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx2
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx2
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx22
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx14
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.hxx2
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx30
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.hxx2
-rw-r--r--slideshow/source/engine/shapesubset.cxx2
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx2
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.cxx6
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.hxx2
-rw-r--r--slideshow/source/engine/slide/slideanimations.cxx2
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx16
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx2
-rw-r--r--slideshow/source/engine/slidebitmap.cxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx36
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx12
-rw-r--r--slideshow/source/engine/soundplayer.cxx8
-rw-r--r--slideshow/source/engine/tools.cxx16
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx4
-rw-r--r--slideshow/source/engine/usereventqueue.cxx2
-rw-r--r--slideshow/source/engine/waitsymbol.cxx2
-rw-r--r--slideshow/source/inc/animationfactory.hxx14
-rw-r--r--slideshow/source/inc/attributemap.hxx2
-rw-r--r--slideshow/source/inc/delayevent.hxx12
-rw-r--r--slideshow/source/inc/event.hxx6
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx2
-rw-r--r--slideshow/source/inc/hyperlinkarea.hxx2
-rw-r--r--slideshow/source/inc/hyperlinkhandler.hxx2
-rw-r--r--slideshow/source/inc/shapeattributelayer.hxx6
-rw-r--r--slideshow/source/inc/shapeimporter.hxx4
-rw-r--r--slideshow/source/inc/smilfunctionparser.hxx4
-rw-r--r--slideshow/source/inc/soundplayer.hxx4
-rw-r--r--slideshow/source/inc/stringanimation.hxx2
-rw-r--r--slideshow/source/inc/tools.hxx14
-rw-r--r--slideshow/test/demoshow.cxx26
-rw-r--r--slideshow/test/testshape.cxx4
-rw-r--r--smoketest/smoketest.cxx18
-rw-r--r--sot/inc/sot/object.hxx10
-rw-r--r--sot/inc/sot/stg.hxx8
-rw-r--r--sot/inc/sot/storage.hxx4
-rw-r--r--sot/qa/cppunit/test_sot.cxx12
-rw-r--r--sot/source/base/exchange.cxx14
-rw-r--r--sot/source/base/formats.cxx2
-rw-r--r--sot/source/sdstor/stg.cxx2
-rw-r--r--sot/source/sdstor/stgdir.cxx2
-rw-r--r--sot/source/sdstor/stgelem.cxx4
-rw-r--r--sot/source/sdstor/stgole.cxx6
-rw-r--r--sot/source/sdstor/storage.cxx14
-rw-r--r--sot/source/sdstor/storinfo.cxx4
-rw-r--r--sot/source/sdstor/ucbstorage.cxx140
-rw-r--r--sot/source/unoolestorage/register.cxx2
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.cxx50
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.hxx30
-rw-r--r--starmath/inc/action.hxx2
-rw-r--r--starmath/inc/cursor.hxx4
-rw-r--r--starmath/inc/dialog.hxx12
-rw-r--r--starmath/inc/document.hxx4
-rw-r--r--starmath/inc/node.hxx4
-rw-r--r--starmath/inc/parse.hxx4
-rw-r--r--starmath/inc/rect.hxx10
-rw-r--r--starmath/inc/unomodel.hxx10
-rw-r--r--starmath/inc/utility.hxx2
-rw-r--r--starmath/qa/cppunit/test_nodetotextvisitors.cxx2
-rw-r--r--starmath/qa/cppunit/test_starmath.cxx32
-rw-r--r--starmath/source/accessibility.cxx9
-rw-r--r--starmath/source/accessibility.hxx28
-rw-r--r--starmath/source/action.cxx2
-rw-r--r--starmath/source/cfgitem.cxx17
-rw-r--r--starmath/source/cfgitem.hxx12
-rw-r--r--starmath/source/cursor.cxx4
-rw-r--r--starmath/source/dialog.cxx44
-rw-r--r--starmath/source/document.cxx18
-rw-r--r--starmath/source/edit.cxx4
-rw-r--r--starmath/source/eqnolefilehdr.cxx2
-rw-r--r--starmath/source/format.cxx10
-rw-r--r--starmath/source/mathmlexport.cxx6
-rw-r--r--starmath/source/mathmlexport.hxx2
-rw-r--r--starmath/source/mathmlimport.cxx4
-rw-r--r--starmath/source/mathmlimport.hxx66
-rw-r--r--starmath/source/mathtype.cxx12
-rw-r--r--starmath/source/node.cxx14
-rw-r--r--starmath/source/parse.cxx12
-rw-r--r--starmath/source/rect.cxx10
-rw-r--r--starmath/source/smdetect.hxx2
-rw-r--r--starmath/source/smdll.cxx2
-rw-r--r--starmath/source/smmod.cxx2
-rw-r--r--starmath/source/unodoc.cxx8
-rw-r--r--starmath/source/unomodel.cxx26
-rw-r--r--starmath/source/view.cxx10
-rw-r--r--stoc/inc/bootstrapservices.hxx44
-rw-r--r--stoc/inc/stocservices.hxx24
-rw-r--r--stoc/source/corereflection/base.hxx3
-rw-r--r--stoc/source/corereflection/crefl.cxx3
-rw-r--r--stoc/source/corereflection/criface.cxx4
-rw-r--r--stoc/source/corereflection/lrucache.hxx8
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx1
-rw-r--r--stoc/source/implementationregistration/implreg.cxx18
-rw-r--r--stoc/source/inspect/introspection.cxx238
-rw-r--r--stoc/source/invocation/invocation.cxx1
-rw-r--r--stoc/source/javavm/javavm.cxx372
-rw-r--r--stoc/source/javavm/javavm.hxx6
-rw-r--r--stoc/source/javavm/jvmargs.cxx2
-rw-r--r--stoc/source/javavm/jvmargs.hxx6
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx7
-rw-r--r--stoc/source/namingservice/namingservice.cxx7
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx1
-rw-r--r--stoc/source/registry_tdprovider/base.hxx2
-rw-r--r--stoc/source/registry_tdprovider/functiondescription.cxx6
-rw-r--r--stoc/source/registry_tdprovider/methoddescription.cxx12
-rw-r--r--stoc/source/registry_tdprovider/methoddescription.hxx6
-rw-r--r--stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx10
-rw-r--r--stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx2
-rw-r--r--stoc/source/registry_tdprovider/structtypedescription.cxx14
-rw-r--r--stoc/source/registry_tdprovider/structtypedescription.hxx8
-rw-r--r--stoc/source/registry_tdprovider/tdconsts.cxx2
-rw-r--r--stoc/source/registry_tdprovider/tdiface.cxx10
-rw-r--r--stoc/source/registry_tdprovider/tdprovider.cxx14
-rw-r--r--stoc/source/registry_tdprovider/tdservice.cxx11
-rw-r--r--stoc/source/security/access_controller.cxx13
-rw-r--r--stoc/source/security/lru_cache.h12
-rw-r--r--stoc/source/security/permissions.cxx8
-rw-r--r--stoc/source/security/permissions.h6
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx4
-rw-r--r--stoc/source/simpleregistry/simpleregistry.cxx290
-rw-r--r--stoc/source/tdmanager/lrucache.hxx8
-rw-r--r--stoc/source/tdmanager/tdmgr.cxx6
-rw-r--r--stoc/source/tdmanager/tdmgr_check.cxx2
-rw-r--r--stoc/source/tdmanager/tdmgr_common.hxx6
-rw-r--r--stoc/source/tdmanager/tdmgr_tdenumeration.cxx6
-rw-r--r--stoc/source/tdmanager/tdmgr_tdenumeration.hxx4
-rw-r--r--stoc/source/typeconv/convert.cxx1
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.cxx52
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.hxx4
-rw-r--r--stoc/source/uriproc/UriReference.cxx34
-rw-r--r--stoc/source/uriproc/UriReference.hxx39
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx88
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.hxx4
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx62
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx100
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx4
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx26
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx4
-rw-r--r--stoc/source/uriproc/supportsService.cxx4
-rw-r--r--stoc/source/uriproc/supportsService.hxx4
-rw-r--r--stoc/test/javavm/jvm_interaction/interactionhandler.cxx3
-rw-r--r--stoc/test/javavm/testjavavm.cxx3
-rw-r--r--stoc/test/registry_tdprovider/testregistrytdprovider.cxx222
-rw-r--r--stoc/test/tdmanager/testtdmanager.cxx74
-rw-r--r--stoc/test/testconv.cxx2
-rw-r--r--stoc/test/testcorefl.cxx3
-rw-r--r--stoc/test/testiadapter.cxx27
-rw-r--r--stoc/test/testintrosp.cxx4
-rw-r--r--stoc/test/testloader.cxx1
-rw-r--r--stoc/test/testregistry.cxx3
-rw-r--r--stoc/test/testsmgr_cpnt.cxx3
-rw-r--r--stoc/test/uriproc/test_uriproc.cxx128
-rw-r--r--store/inc/store/store.hxx32
-rw-r--r--store/source/lockbyte.cxx4
-rw-r--r--store/source/store.cxx1
-rw-r--r--store/workben/t_base.cxx4
-rw-r--r--store/workben/t_file.cxx2
-rw-r--r--store/workben/t_page.cxx2
-rw-r--r--store/workben/t_store.cxx3
-rw-r--r--svgio/inc/svgio/svgreader/svgcharacternode.hxx10
-rw-r--r--svgio/inc/svgio/svgreader/svgcirclenode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgclippathnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgdocument.hxx28
-rw-r--r--svgio/inc/svgio/svgreader/svgdocumenthandler.hxx14
-rw-r--r--svgio/inc/svgio/svgreader/svgellipsenode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svggnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svggradientnode.hxx4
-rw-r--r--svgio/inc/svgio/svgreader/svggradientstopnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgimagenode.hxx12
-rw-r--r--svgio/inc/svgio/svgreader/svglinenode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgmarkernode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgmasknode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgnode.hxx14
-rw-r--r--svgio/inc/svgio/svgreader/svgpathnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgpatternnode.hxx4
-rw-r--r--svgio/inc/svgio/svgreader/svgpolynode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgrectnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgstyleattributes.hxx48
-rw-r--r--svgio/inc/svgio/svgreader/svgstylenode.hxx4
-rw-r--r--svgio/inc/svgio/svgreader/svgsvgnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgsymbolnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgtextnode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgtextpathnode.hxx4
-rw-r--r--svgio/inc/svgio/svgreader/svgtitledescnode.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtoken.hxx6
-rw-r--r--svgio/inc/svgio/svgreader/svgtools.hxx66
-rw-r--r--svgio/inc/svgio/svgreader/svgtrefnode.hxx4
-rw-r--r--svgio/inc/svgio/svgreader/svgtspannode.hxx2
-rw-r--r--svgio/inc/svgio/svgreader/svgusenode.hxx4
-rw-r--r--svgio/source/svgreader/svgcharacternode.cxx18
-rw-r--r--svgio/source/svgreader/svgcirclenode.cxx4
-rw-r--r--svgio/source/svgreader/svgclippathnode.cxx2
-rw-r--r--svgio/source/svgreader/svgdocument.cxx12
-rw-r--r--svgio/source/svgreader/svgdocumenthandler.cxx24
-rw-r--r--svgio/source/svgreader/svgellipsenode.cxx4
-rw-r--r--svgio/source/svgreader/svggnode.cxx4
-rw-r--r--svgio/source/svgreader/svggradientnode.cxx8
-rw-r--r--svgio/source/svgreader/svggradientstopnode.cxx2
-rw-r--r--svgio/source/svgreader/svgimagenode.cxx8
-rw-r--r--svgio/source/svgreader/svglinenode.cxx4
-rw-r--r--svgio/source/svgreader/svgmarkernode.cxx8
-rw-r--r--svgio/source/svgreader/svgmasknode.cxx2
-rw-r--r--svgio/source/svgreader/svgnode.cxx22
-rw-r--r--svgio/source/svgreader/svgpathnode.cxx4
-rw-r--r--svgio/source/svgreader/svgpatternnode.cxx4
-rw-r--r--svgio/source/svgreader/svgpolynode.cxx6
-rw-r--r--svgio/source/svgreader/svgrectnode.cxx4
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx136
-rw-r--r--svgio/source/svgreader/svgstylenode.cxx12
-rw-r--r--svgio/source/svgreader/svgsvgnode.cxx2
-rw-r--r--svgio/source/svgreader/svgsymbolnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtextnode.cxx4
-rw-r--r--svgio/source/svgreader/svgtextpathnode.cxx14
-rw-r--r--svgio/source/svgreader/svgtitledescnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtoken.cxx264
-rw-r--r--svgio/source/svgreader/svgtools.cxx424
-rw-r--r--svgio/source/svgreader/svgtrefnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtspannode.cxx2
-rw-r--r--svgio/source/svgreader/svgusenode.cxx4
-rw-r--r--svgio/source/svguno/xsvgparser.cxx28
-rw-r--r--svgio/source/svguno/xsvgparser.hxx4
-rw-r--r--svl/inc/svl/aeitem.hxx4
-rw-r--r--svl/inc/svl/asiancfg.hxx6
-rw-r--r--svl/inc/svl/cenumitm.hxx4
-rw-r--r--svl/inc/svl/cntwall.hxx6
-rw-r--r--svl/inc/svl/documentlockfile.hxx6
-rw-r--r--svl/inc/svl/filenotation.hxx16
-rw-r--r--svl/inc/svl/fstathelper.hxx6
-rw-r--r--svl/inc/svl/inettype.hxx2
-rw-r--r--svl/inc/svl/itempool.hxx4
-rw-r--r--svl/inc/svl/itemprop.hxx24
-rw-r--r--svl/inc/svl/languageoptions.hxx4
-rw-r--r--svl/inc/svl/lngmisc.hxx10
-rw-r--r--svl/inc/svl/lockfilecommon.hxx18
-rw-r--r--svl/inc/svl/macitem.hxx20
-rw-r--r--svl/inc/svl/ownlist.hxx14
-rw-r--r--svl/inc/svl/poolitem.hxx8
-rw-r--r--svl/inc/svl/sharecontrolfile.hxx12
-rw-r--r--svl/inc/svl/slstitm.hxx4
-rw-r--r--svl/inc/svl/srchitem.hxx2
-rw-r--r--svl/inc/svl/style.hxx8
-rw-r--r--svl/inc/svl/stylepool.hxx4
-rw-r--r--svl/inc/svl/svdde.hxx18
-rw-r--r--svl/inc/svl/urihelper.hxx2
-rw-r--r--svl/inc/svl/visitem.hxx2
-rw-r--r--svl/inc/svl/zformat.hxx2
-rw-r--r--svl/qa/unit/svl.cxx4
-rw-r--r--svl/qa/unit/test_URIHelper.cxx32
-rw-r--r--svl/qa/unit/test_lngmisc.cxx50
-rw-r--r--svl/source/config/asiancfg.cxx20
-rw-r--r--svl/source/config/cjkoptions.cxx2
-rw-r--r--svl/source/config/ctloptions.cxx18
-rw-r--r--svl/source/config/itemholder2.cxx4
-rw-r--r--svl/source/config/languageoptions.cxx6
-rw-r--r--svl/source/fsstor/fsfactory.cxx24
-rw-r--r--svl/source/fsstor/fsstorage.cxx118
-rw-r--r--svl/source/fsstor/fsstorage.hxx58
-rw-r--r--svl/source/inc/fsfactory.hxx10
-rw-r--r--svl/source/inc/passwordcontainer.hxx132
-rw-r--r--svl/source/inc/poolio.hxx4
-rw-r--r--svl/source/items/aeitem.cxx6
-rw-r--r--svl/source/items/cenumitm.cxx8
-rw-r--r--svl/source/items/ctypeitm.cxx6
-rw-r--r--svl/source/items/imageitm.cxx4
-rw-r--r--svl/source/items/itempool.cxx4
-rw-r--r--svl/source/items/itemprop.cxx30
-rw-r--r--svl/source/items/macitem.cxx10
-rw-r--r--svl/source/items/poolio.cxx8
-rw-r--r--svl/source/items/poolitem.cxx8
-rw-r--r--svl/source/items/slstitm.cxx8
-rw-r--r--svl/source/items/srchitem.cxx42
-rw-r--r--svl/source/items/style.cxx6
-rw-r--r--svl/source/items/stylepool.cxx10
-rw-r--r--svl/source/misc/documentlockfile.cxx26
-rw-r--r--svl/source/misc/filenotation.cxx14
-rw-r--r--svl/source/misc/folderrestriction.cxx14
-rw-r--r--svl/source/misc/fstathelper.cxx6
-rw-r--r--svl/source/misc/getstringresource.cxx4
-rw-r--r--svl/source/misc/getstringresource.hxx2
-rw-r--r--svl/source/misc/inethist.cxx4
-rw-r--r--svl/source/misc/lngmisc.cxx20
-rw-r--r--svl/source/misc/lockfilecommon.cxx38
-rw-r--r--svl/source/misc/ownlist.cxx22
-rw-r--r--svl/source/misc/sharecontrolfile.cxx30
-rw-r--r--svl/source/numbers/numfmuno.hxx74
-rw-r--r--svl/source/numbers/supservs.cxx18
-rw-r--r--svl/source/numbers/supservs.hxx8
-rw-r--r--svl/source/numbers/zforfind.cxx8
-rw-r--r--svl/source/numbers/zformat.cxx28
-rw-r--r--svl/source/numbers/zforscan.cxx4
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx254
-rw-r--r--svl/source/passwordcontainer/syscreds.cxx52
-rw-r--r--svl/source/passwordcontainer/syscreds.hxx20
-rw-r--r--svl/source/svdde/ddecli.cxx2
-rw-r--r--svl/source/svdde/ddedata.cxx2
-rw-r--r--svl/source/svdde/ddeimp.hxx6
-rw-r--r--svl/source/svdde/ddestrg.cxx2
-rw-r--r--svl/source/svdde/ddesvr.cxx32
-rw-r--r--svl/source/uno/pathservice.cxx1
-rw-r--r--svl/source/uno/registerservices.cxx1
-rw-r--r--svl/unx/source/svdde/ddedummy.cxx14
-rw-r--r--svtools/inc/svtools/DocumentInfoPreview.hxx6
-rw-r--r--svtools/inc/svtools/PlaceEditDialog.hxx4
-rw-r--r--svtools/inc/svtools/ServerDetailsControls.hxx24
-rw-r--r--svtools/inc/svtools/acceleratorexecute.hxx4
-rw-r--r--svtools/inc/svtools/accessibletable.hxx14
-rw-r--r--svtools/inc/svtools/accessibletableprovider.hxx8
-rw-r--r--svtools/inc/svtools/addresstemplate.hxx4
-rw-r--r--svtools/inc/svtools/apearcfg.hxx4
-rw-r--r--svtools/inc/svtools/bindablecontrolhelper.hxx2
-rw-r--r--svtools/inc/svtools/brwbox.hxx8
-rw-r--r--svtools/inc/svtools/collatorres.hxx2
-rw-r--r--svtools/inc/svtools/colorcfg.hxx12
-rw-r--r--svtools/inc/svtools/contextmenuhelper.hxx10
-rw-r--r--svtools/inc/svtools/embedhlp.hxx12
-rw-r--r--svtools/inc/svtools/extcolorcfg.hxx38
-rw-r--r--svtools/inc/svtools/extensionlistbox.hxx12
-rw-r--r--svtools/inc/svtools/filechangedchecker.hxx4
-rw-r--r--svtools/inc/svtools/filectrl.hxx2
-rw-r--r--svtools/inc/svtools/fileview.hxx14
-rw-r--r--svtools/inc/svtools/fontsubstconfig.hxx6
-rw-r--r--svtools/inc/svtools/framestatuslistener.hxx8
-rw-r--r--svtools/inc/svtools/generictoolboxcontroller.hxx2
-rw-r--r--svtools/inc/svtools/genericunodialog.hxx8
-rw-r--r--svtools/inc/svtools/grfmgr.hxx14
-rw-r--r--svtools/inc/svtools/headbar.hxx6
-rw-r--r--svtools/inc/svtools/htmlcfg.hxx6
-rw-r--r--svtools/inc/svtools/htmlout.hxx4
-rw-r--r--svtools/inc/svtools/hyperlabel.hxx2
-rw-r--r--svtools/inc/svtools/imageresourceaccess.hxx6
-rw-r--r--svtools/inc/svtools/imap.hxx4
-rw-r--r--svtools/inc/svtools/imapobj.hxx8
-rw-r--r--svtools/inc/svtools/indexentryres.hxx2
-rw-r--r--svtools/inc/svtools/ivctrl.hxx2
-rw-r--r--svtools/inc/svtools/javacontext.hxx2
-rw-r--r--svtools/inc/svtools/langhelp.hxx4
-rw-r--r--svtools/inc/svtools/langtab.hxx2
-rw-r--r--svtools/inc/svtools/parhtml.hxx2
-rw-r--r--svtools/inc/svtools/place.hxx2
-rw-r--r--svtools/inc/svtools/popupmenucontrollerbase.hxx20
-rw-r--r--svtools/inc/svtools/popupwindowcontroller.hxx8
-rw-r--r--svtools/inc/svtools/roadmap.hxx8
-rw-r--r--svtools/inc/svtools/roadmapwizard.hxx2
-rw-r--r--svtools/inc/svtools/sampletext.hxx16
-rw-r--r--svtools/inc/svtools/scriptedtext.hxx2
-rw-r--r--svtools/inc/svtools/statusbarcontroller.hxx14
-rw-r--r--svtools/inc/svtools/stringtransfer.hxx10
-rw-r--r--svtools/inc/svtools/svlbitm.hxx8
-rw-r--r--svtools/inc/svtools/svtabbx.hxx8
-rw-r--r--svtools/inc/svtools/tabbar.hxx6
-rw-r--r--svtools/inc/svtools/table/gridtablerenderer.hxx4
-rw-r--r--svtools/inc/svtools/table/tablecontrol.hxx14
-rw-r--r--svtools/inc/svtools/table/tablerenderer.hxx2
-rw-r--r--svtools/inc/svtools/toolbarmenu.hxx2
-rw-r--r--svtools/inc/svtools/toolboxcontroller.hxx22
-rw-r--r--svtools/inc/svtools/toolpanel/toolpanel.hxx4
-rw-r--r--svtools/inc/svtools/transfer.hxx10
-rw-r--r--svtools/inc/svtools/treelistbox.hxx2
-rw-r--r--svtools/inc/svtools/unoevent.hxx40
-rw-r--r--svtools/langsupport/langsupport.cxx4
-rw-r--r--svtools/source/brwbox/brwbox1.cxx6
-rw-r--r--svtools/source/brwbox/brwbox3.cxx1
-rw-r--r--svtools/source/config/apearcfg.cxx2
-rw-r--r--svtools/source/config/colorcfg.cxx69
-rw-r--r--svtools/source/config/extcolorcfg.cxx213
-rw-r--r--svtools/source/config/fontsubstconfig.cxx9
-rw-r--r--svtools/source/config/helpopt.cxx83
-rw-r--r--svtools/source/config/htmlcfg.cxx3
-rw-r--r--svtools/source/config/itemholder2.cxx4
-rw-r--r--svtools/source/config/miscopt.cxx22
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx4
-rw-r--r--svtools/source/config/printoptions.cxx10
-rw-r--r--svtools/source/config/slidesorterbaropt.cxx6
-rw-r--r--svtools/source/config/toolpanelopt.cxx6
-rw-r--r--svtools/source/contnr/DocumentInfoPreview.cxx20
-rw-r--r--svtools/source/contnr/contentenumeration.cxx9
-rw-r--r--svtools/source/contnr/contentenumeration.hxx48
-rw-r--r--svtools/source/contnr/fileview.cxx49
-rw-r--r--svtools/source/contnr/fileview.hxx5
-rw-r--r--svtools/source/contnr/ivctrl.cxx2
-rw-r--r--svtools/source/contnr/svimpbox.cxx2
-rw-r--r--svtools/source/contnr/svlbitm.cxx6
-rw-r--r--svtools/source/contnr/svtabbx.cxx28
-rw-r--r--svtools/source/contnr/templwin.cxx72
-rw-r--r--svtools/source/contnr/templwin.hxx6
-rw-r--r--svtools/source/contnr/treelistbox.cxx8
-rw-r--r--svtools/source/control/calendar.cxx8
-rw-r--r--svtools/source/control/collatorres.cxx16
-rw-r--r--svtools/source/control/ctrlbox.cxx34
-rw-r--r--svtools/source/control/ctrltool.cxx8
-rw-r--r--svtools/source/control/filectrl.cxx2
-rw-r--r--svtools/source/control/filectrl2.cxx6
-rw-r--r--svtools/source/control/fmtfield.cxx2
-rw-r--r--svtools/source/control/headbar.cxx16
-rw-r--r--svtools/source/control/hyperlabel.cxx2
-rw-r--r--svtools/source/control/indexentryres.cxx14
-rw-r--r--svtools/source/control/inettbc.cxx46
-rw-r--r--svtools/source/control/roadmap.cxx20
-rw-r--r--svtools/source/control/ruler.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx12
-rw-r--r--svtools/source/control/toolbarmenu.cxx5
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx13
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx8
-rw-r--r--svtools/source/control/valueacc.cxx20
-rw-r--r--svtools/source/control/valueimp.hxx8
-rw-r--r--svtools/source/control/valueset.cxx4
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx12
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.cxx70
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx210
-rw-r--r--svtools/source/dialogs/colrdlg.cxx1
-rw-r--r--svtools/source/dialogs/insdlg.cxx20
-rw-r--r--svtools/source/dialogs/prnsetup.cxx2
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx2
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.hxx10
-rw-r--r--svtools/source/graphic/descriptor.cxx36
-rw-r--r--svtools/source/graphic/descriptor.hxx18
-rw-r--r--svtools/source/graphic/graphic.cxx24
-rw-r--r--svtools/source/graphic/graphic.hxx10
-rw-r--r--svtools/source/graphic/graphicunofactory.cxx12
-rw-r--r--svtools/source/graphic/grfcache.cxx12
-rw-r--r--svtools/source/graphic/grfcache.hxx4
-rw-r--r--svtools/source/graphic/grfmgr.cxx24
-rw-r--r--svtools/source/graphic/grfmgr2.cxx4
-rw-r--r--svtools/source/graphic/provider.cxx60
-rw-r--r--svtools/source/graphic/renderer.cxx20
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx24
-rw-r--r--svtools/source/hatchwindow/documentcloser.hxx10
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.cxx20
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.hxx10
-rw-r--r--svtools/source/inc/provider.hxx20
-rw-r--r--svtools/source/inc/renderer.hxx10
-rw-r--r--svtools/source/inc/unoiface.hxx44
-rw-r--r--svtools/source/java/javacontext.cxx2
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx74
-rw-r--r--svtools/source/misc/bindablecontrolhelper.cxx6
-rw-r--r--svtools/source/misc/ehdl.cxx18
-rw-r--r--svtools/source/misc/embedhlp.cxx22
-rw-r--r--svtools/source/misc/embedtransfer.cxx2
-rw-r--r--svtools/source/misc/filechangedchecker.cxx2
-rw-r--r--svtools/source/misc/imagemgr.cxx10
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx14
-rw-r--r--svtools/source/misc/imap.cxx4
-rw-r--r--svtools/source/misc/imap2.cxx48
-rw-r--r--svtools/source/misc/langtab.cxx2
-rw-r--r--svtools/source/misc/sampletext.cxx134
-rw-r--r--svtools/source/misc/stringtransfer.cxx8
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx4
-rw-r--r--svtools/source/misc/templatefoldercache.cxx20
-rw-r--r--svtools/source/misc/transfer.cxx130
-rw-r--r--svtools/source/misc/transfer2.cxx4
-rw-r--r--svtools/source/svhtml/htmlout.cxx44
-rw-r--r--svtools/source/svhtml/parhtml.cxx26
-rw-r--r--svtools/source/svrtf/parrtf.cxx8
-rw-r--r--svtools/source/svrtf/rtfout.cxx6
-rw-r--r--svtools/source/table/cellvalueconversion.cxx10
-rw-r--r--svtools/source/table/cellvalueconversion.hxx2
-rw-r--r--svtools/source/table/gridtablerenderer.cxx10
-rw-r--r--svtools/source/table/tablecontrol.cxx50
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx4
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx2
-rw-r--r--svtools/source/table/tabledatawindow.cxx2
-rw-r--r--svtools/source/toolpanel/dummypanel.cxx8
-rw-r--r--svtools/source/toolpanel/dummypanel.hxx4
-rw-r--r--svtools/source/toolpanel/paneltabbar.cxx16
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldeckpeer.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.hxx2
-rw-r--r--svtools/source/uno/addrtempuno.cxx26
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx34
-rw-r--r--svtools/source/uno/framestatuslistener.cxx6
-rw-r--r--svtools/source/uno/generictoolboxcontroller.cxx6
-rw-r--r--svtools/source/uno/genericunodialog.cxx18
-rw-r--r--svtools/source/uno/miscservices.cxx1
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx21
-rw-r--r--svtools/source/uno/popupwindowcontroller.cxx1
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx16
-rw-r--r--svtools/source/uno/svtxgridcontrol.cxx12
-rw-r--r--svtools/source/uno/svtxgridcontrol.hxx4
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx29
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx19
-rw-r--r--svtools/source/uno/treecontrolpeer.hxx22
-rw-r--r--svtools/source/uno/unoevent.cxx2
-rw-r--r--svtools/source/uno/unogridcolumnfacade.cxx4
-rw-r--r--svtools/source/uno/unoiface.cxx82
-rw-r--r--svtools/source/uno/unoimap.cxx96
-rw-r--r--svtools/source/uno/unowizard.hxx16
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx56
-rw-r--r--svtools/source/urlobj/inetimg.cxx2
-rw-r--r--svx/inc/svx/AccessibleControlShape.hxx12
-rw-r--r--svx/inc/svx/AccessibleGraphicShape.hxx10
-rw-r--r--svx/inc/svx/AccessibleOLEShape.hxx10
-rw-r--r--svx/inc/svx/AccessibleShape.hxx10
-rw-r--r--svx/inc/svx/AccessibleTableShape.hxx8
-rw-r--r--svx/inc/svx/ActionDescriptionProvider.hxx4
-rw-r--r--svx/inc/svx/DescriptionGenerator.hxx30
-rw-r--r--svx/inc/svx/EnhancedCustomShape2d.hxx6
-rw-r--r--svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx2
-rw-r--r--svx/inc/svx/EnhancedCustomShapeTypeNames.hxx4
-rw-r--r--svx/inc/svx/ParseContext.hxx6
-rw-r--r--svx/inc/svx/ShapeTypeHandler.hxx14
-rw-r--r--svx/inc/svx/SmartTagItem.hxx12
-rw-r--r--svx/inc/svx/SmartTagMgr.hxx24
-rw-r--r--svx/inc/svx/clipfmtitem.hxx4
-rw-r--r--svx/inc/svx/dataaccessdescriptor.hxx4
-rw-r--r--svx/inc/svx/dbaexchange.hxx52
-rw-r--r--svx/inc/svx/dbaobjectex.hxx2
-rw-r--r--svx/inc/svx/dbtoolsclient.hxx18
-rw-r--r--svx/inc/svx/fmdmod.hxx6
-rw-r--r--svx/inc/svx/fmdpage.hxx2
-rw-r--r--svx/inc/svx/fmgridcl.hxx4
-rw-r--r--svx/inc/svx/fmgridif.hxx34
-rw-r--r--svx/inc/svx/fmsearch.hxx2
-rw-r--r--svx/inc/svx/fmsrccfg.hxx8
-rw-r--r--svx/inc/svx/fmsrcimp.hxx30
-rw-r--r--svx/inc/svx/fmtools.hxx2
-rw-r--r--svx/inc/svx/fmview.hxx2
-rw-r--r--svx/inc/svx/fntctrl.hxx2
-rw-r--r--svx/inc/svx/gallery.hxx4
-rw-r--r--svx/inc/svx/gallery1.hxx20
-rw-r--r--svx/inc/svx/galmisc.hxx8
-rw-r--r--svx/inc/svx/galtheme.hxx8
-rw-r--r--svx/inc/svx/itemwin.hxx4
-rw-r--r--svx/inc/svx/lboxctrl.hxx4
-rw-r--r--svx/inc/svx/numfmtsh.hxx6
-rw-r--r--svx/inc/svx/sdasitm.hxx14
-rw-r--r--svx/inc/svx/sdgmoitm.hxx2
-rw-r--r--svx/inc/svx/sdooitm.hxx2
-rw-r--r--svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx4
-rw-r--r--svx/inc/svx/sdtaditm.hxx2
-rw-r--r--svx/inc/svx/sdtaitm.hxx2
-rw-r--r--svx/inc/svx/sdynitm.hxx2
-rw-r--r--svx/inc/svx/shapepropertynotifier.hxx12
-rw-r--r--svx/inc/svx/simptabl.hxx4
-rw-r--r--svx/inc/svx/srchdlg.hxx4
-rw-r--r--svx/inc/svx/stddlg.hxx2
-rw-r--r--svx/inc/svx/strarray.hxx2
-rw-r--r--svx/inc/svx/svddrgv.hxx2
-rw-r--r--svx/inc/svx/svdmodel.hxx8
-rw-r--r--svx/inc/svx/svdoashp.hxx4
-rw-r--r--svx/inc/svx/svdobj.hxx28
-rw-r--r--svx/inc/svx/svdograf.hxx10
-rw-r--r--svx/inc/svx/svdomedia.hxx4
-rw-r--r--svx/inc/svx/svdoole2.hxx4
-rw-r--r--svx/inc/svx/svdorect.hxx2
-rw-r--r--svx/inc/svx/svdovirt.hxx2
-rw-r--r--svx/inc/svx/svxdlg.hxx8
-rw-r--r--svx/inc/svx/sxcikitm.hxx2
-rw-r--r--svx/inc/svx/sxekitm.hxx2
-rw-r--r--svx/inc/svx/sxmkitm.hxx2
-rw-r--r--svx/inc/svx/sxmtpitm.hxx4
-rw-r--r--svx/inc/svx/sxmuitm.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx2
-rw-r--r--svx/inc/svx/tbxalign.hxx10
-rw-r--r--svx/inc/svx/tbxcolor.hxx4
-rw-r--r--svx/inc/svx/tbxctl.hxx2
-rw-r--r--svx/inc/svx/tbxcustomshapes.hxx10
-rw-r--r--svx/inc/svx/txenctab.hxx2
-rw-r--r--svx/inc/svx/unoapi.hxx2
-rw-r--r--svx/inc/svx/unomaster.hxx12
-rw-r--r--svx/inc/svx/unomod.hxx14
-rw-r--r--svx/inc/svx/unomodel.hxx12
-rw-r--r--svx/inc/svx/unopage.hxx8
-rw-r--r--svx/inc/svx/unopool.hxx6
-rw-r--r--svx/inc/svx/unoprov.hxx6
-rw-r--r--svx/inc/svx/unoshape.hxx186
-rw-r--r--svx/inc/svx/unoshcol.hxx10
-rw-r--r--svx/inc/svx/unoshprp.hxx38
-rw-r--r--svx/inc/svx/xmleohlp.hxx38
-rw-r--r--svx/inc/svx/xmlgrhlp.hxx44
-rw-r--r--svx/inc/svx/xtable.hxx14
-rw-r--r--svx/inc/tbunocontroller.hxx12
-rw-r--r--svx/inc/tbunosearchcontrollers.hxx56
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx36
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx1
-rw-r--r--svx/source/accessibility/AccessibleGraphicShape.cxx8
-rw-r--r--svx/source/accessibility/AccessibleOLEShape.cxx14
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx23
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx6
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx6
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx2
-rw-r--r--svx/source/accessibility/ShapeTypeHandler.cxx2
-rw-r--r--svx/source/accessibility/charmapacc.cxx18
-rw-r--r--svx/source/accessibility/lookupcolorname.cxx12
-rw-r--r--svx/source/accessibility/lookupcolorname.hxx2
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx34
-rw-r--r--svx/source/core/coreservices.cxx1
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx92
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx70
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.hxx12
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx10
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx10
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx8
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx4
-rw-r--r--svx/source/dialog/_contdlg.cxx8
-rw-r--r--svx/source/dialog/charmap.cxx4
-rw-r--r--svx/source/dialog/ctredlin.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx40
-rw-r--r--svx/source/dialog/fntctrl.cxx14
-rw-r--r--svx/source/dialog/imapwnd.cxx6
-rw-r--r--svx/source/dialog/linkwarn.cxx2
-rw-r--r--svx/source/dialog/optgrid.cxx12
-rw-r--r--svx/source/dialog/pagectrl.cxx6
-rw-r--r--svx/source/dialog/pfiledlg.cxx2
-rw-r--r--svx/source/dialog/relfld.cxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx5
-rw-r--r--svx/source/dialog/sendreportunx.cxx22
-rw-r--r--svx/source/dialog/sendreportw32.cxx4
-rw-r--r--svx/source/dialog/simptabl.cxx4
-rw-r--r--svx/source/dialog/srchdlg.cxx42
-rw-r--r--svx/source/dialog/stddlg.cxx2
-rw-r--r--svx/source/dialog/strarray.cxx4
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx7
-rw-r--r--svx/source/dialog/swframeexample.cxx10
-rw-r--r--svx/source/dialog/txenctab.cxx4
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx96
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx8
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx54
-rw-r--r--svx/source/fmcomp/fmgridif.cxx74
-rw-r--r--svx/source/fmcomp/gridcols.cxx18
-rw-r--r--svx/source/fmcomp/gridctrl.cxx14
-rw-r--r--svx/source/fmcomp/xmlexchg.cxx2
-rw-r--r--svx/source/form/ParseContext.cxx12
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx26
-rw-r--r--svx/source/form/databaselocationinput.cxx20
-rw-r--r--svx/source/form/datanavi.cxx144
-rw-r--r--svx/source/form/dbtoolsclient.cxx20
-rw-r--r--svx/source/form/filtnav.cxx42
-rw-r--r--svx/source/form/fmPropBrw.cxx34
-rw-r--r--svx/source/form/fmcontrolbordermanager.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx44
-rw-r--r--svx/source/form/fmdmod.cxx14
-rw-r--r--svx/source/form/fmdocumentclassification.cxx10
-rw-r--r--svx/source/form/fmdpage.cxx4
-rw-r--r--svx/source/form/fmexch.cxx6
-rw-r--r--svx/source/form/fmexpl.cxx6
-rw-r--r--svx/source/form/fmobj.cxx14
-rw-r--r--svx/source/form/fmobjfac.cxx6
-rw-r--r--svx/source/form/fmpgeimp.cxx34
-rw-r--r--svx/source/form/fmscriptingenv.cxx28
-rw-r--r--svx/source/form/fmservs.cxx14
-rw-r--r--svx/source/form/fmshell.cxx6
-rw-r--r--svx/source/form/fmshimp.cxx112
-rw-r--r--svx/source/form/fmsrccfg.cxx18
-rw-r--r--svx/source/form/fmsrcimp.cxx62
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx62
-rw-r--r--svx/source/form/fmtools.cxx6
-rw-r--r--svx/source/form/fmundo.cxx26
-rw-r--r--svx/source/form/fmview.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx42
-rw-r--r--svx/source/form/formcontrolfactory.cxx40
-rw-r--r--svx/source/form/formcontroller.cxx146
-rw-r--r--svx/source/form/formcontrolling.cxx12
-rw-r--r--svx/source/form/formdispatchinterceptor.cxx2
-rw-r--r--svx/source/form/formfeaturedispatcher.cxx2
-rw-r--r--svx/source/form/formtoolbars.cxx10
-rw-r--r--svx/source/form/legacyformcontroller.cxx24
-rw-r--r--svx/source/form/navigatortree.cxx22
-rw-r--r--svx/source/form/navigatortreemodel.cxx12
-rw-r--r--svx/source/form/sdbdatacolumn.cxx16
-rw-r--r--svx/source/form/tabwin.cxx16
-rw-r--r--svx/source/form/tbxform.cxx10
-rw-r--r--svx/source/form/xfm_addcondition.cxx22
-rw-r--r--svx/source/gallery2/galexpl.cxx8
-rw-r--r--svx/source/gallery2/gallery1.cxx28
-rw-r--r--svx/source/gallery2/galmisc.cxx2
-rw-r--r--svx/source/gallery2/galobj.cxx6
-rw-r--r--svx/source/gallery2/galtheme.cxx20
-rw-r--r--svx/source/gengal/gengal.cxx36
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx10
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx20
-rw-r--r--svx/source/inc/charmapacc.hxx16
-rw-r--r--svx/source/inc/datanavi.hxx6
-rw-r--r--svx/source/inc/docrecovery.hxx84
-rw-r--r--svx/source/inc/filtnav.hxx28
-rw-r--r--svx/source/inc/fmPropBrw.hxx4
-rw-r--r--svx/source/inc/fmcontrolbordermanager.hxx4
-rw-r--r--svx/source/inc/fmdocumentclassification.hxx4
-rw-r--r--svx/source/inc/fmexpl.hxx22
-rw-r--r--svx/source/inc/fmobj.hxx2
-rw-r--r--svx/source/inc/fmpgeimp.hxx8
-rw-r--r--svx/source/inc/fmservs.hxx98
-rw-r--r--svx/source/inc/fmshimp.hxx10
-rw-r--r--svx/source/inc/fmundo.hxx6
-rw-r--r--svx/source/inc/fmurl.hxx54
-rw-r--r--svx/source/inc/fmvwimp.hxx8
-rw-r--r--svx/source/inc/formcontrolfactory.hxx8
-rw-r--r--svx/source/inc/formcontroller.hxx28
-rw-r--r--svx/source/inc/formcontrolling.hxx4
-rw-r--r--svx/source/inc/formdispatchinterceptor.hxx4
-rw-r--r--svx/source/inc/formtoolbars.hxx2
-rw-r--r--svx/source/inc/gridcols.hxx27
-rw-r--r--svx/source/inc/recoveryui.hxx10
-rw-r--r--svx/source/inc/sdbdatacolumn.hxx16
-rw-r--r--svx/source/inc/sqlparserclient.hxx4
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx34
-rw-r--r--svx/source/inc/tabwin.hxx6
-rw-r--r--svx/source/inc/typeconversionclient.hxx4
-rw-r--r--svx/source/inc/unogalthemeprovider.hxx24
-rw-r--r--svx/source/inc/xfm_addcondition.hxx8
-rw-r--r--svx/source/inc/xmlxtexp.hxx6
-rw-r--r--svx/source/inc/xmlxtimp.hxx4
-rw-r--r--svx/source/items/SmartTagItem.cxx4
-rw-r--r--svx/source/items/chrtitem.cxx2
-rw-r--r--svx/source/items/clipfmtitem.cxx10
-rw-r--r--svx/source/items/customshapeitem.cxx10
-rw-r--r--svx/source/items/hlnkitem.cxx10
-rw-r--r--svx/source/items/numfmtsh.cxx8
-rw-r--r--svx/source/items/viewlayoutitem.cxx4
-rw-r--r--svx/source/items/zoomslideritem.cxx8
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx16
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx6
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx8
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx2
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx10
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx2
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx38
-rw-r--r--svx/source/stbctrls/insctrl.cxx2
-rw-r--r--svx/source/stbctrls/modctrl.cxx1
-rw-r--r--svx/source/stbctrls/pszctrl.cxx14
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx4
-rw-r--r--svx/source/svdraw/ActionDescriptionProvider.cxx6
-rw-r--r--svx/source/svdraw/charthelper.cxx2
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx32
-rw-r--r--svx/source/svdraw/svddrgmt.cxx12
-rw-r--r--svx/source/svdraw/svdedtv.cxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx4
-rw-r--r--svx/source/svdraw/svdmodel.cxx14
-rw-r--r--svx/source/svdraw/svdoashp.cxx124
-rw-r--r--svx/source/svdraw/svdobj.cxx36
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx8
-rw-r--r--svx/source/svdraw/svdoedge.cxx2
-rw-r--r--svx/source/svdraw/svdograf.cxx12
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdomedia.cxx24
-rw-r--r--svx/source/svdraw/svdoole2.cxx34
-rw-r--r--svx/source/svdraw/svdopath.cxx10
-rw-r--r--svx/source/svdraw/svdorect.cxx6
-rw-r--r--svx/source/svdraw/svdotext.cxx2
-rw-r--r--svx/source/svdraw/svdotxdr.cxx2
-rw-r--r--svx/source/svdraw/svdotxln.cxx4
-rw-r--r--svx/source/svdraw/svdouno.cxx8
-rw-r--r--svx/source/svdraw/svdovirt.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx4
-rw-r--r--svx/source/table/accessiblecell.cxx9
-rw-r--r--svx/source/table/accessiblecell.hxx10
-rw-r--r--svx/source/table/accessibletableshape.cxx1
-rw-r--r--svx/source/table/cell.cxx3
-rw-r--r--svx/source/table/cell.hxx52
-rw-r--r--svx/source/table/cellcursor.cxx1
-rw-r--r--svx/source/table/cellcursor.hxx2
-rw-r--r--svx/source/table/cellrange.cxx1
-rw-r--r--svx/source/table/cellrange.hxx2
-rw-r--r--svx/source/table/propertyset.cxx1
-rw-r--r--svx/source/table/propertyset.hxx30
-rw-r--r--svx/source/table/svdotable.cxx3
-rw-r--r--svx/source/table/tablecolumn.cxx1
-rw-r--r--svx/source/table/tablecolumn.hxx8
-rw-r--r--svx/source/table/tablecolumns.cxx1
-rw-r--r--svx/source/table/tablecontroller.cxx1
-rw-r--r--svx/source/table/tabledesign.cxx1
-rw-r--r--svx/source/table/tablelayouter.cxx1
-rw-r--r--svx/source/table/tablelayouter.hxx2
-rw-r--r--svx/source/table/tablemodel.cxx3
-rw-r--r--svx/source/table/tablemodel.hxx14
-rw-r--r--svx/source/table/tablerow.cxx1
-rw-r--r--svx/source/table/tablerow.hxx8
-rw-r--r--svx/source/table/tablerows.cxx1
-rw-r--r--svx/source/table/tablertfexporter.cxx5
-rw-r--r--svx/source/table/tablertfimporter.cxx1
-rw-r--r--svx/source/table/tableundo.cxx1
-rw-r--r--svx/source/table/tableundo.hxx6
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx4
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx9
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hxx30
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx40
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx17
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx4
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx21
-rw-r--r--svx/source/tbxctrls/itemwin.cxx16
-rw-r--r--svx/source/tbxctrls/layctrl.cxx22
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx12
-rw-r--r--svx/source/tbxctrls/linectrl.cxx16
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx43
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx26
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx118
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx4
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx4
-rw-r--r--svx/source/toolbars/extrusionbar.cxx82
-rw-r--r--svx/source/toolbars/fontworkbar.cxx35
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx40
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx14
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx34
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx24
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx8
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx5
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.hxx4
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx16
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx66
-rw-r--r--svx/source/unodraw/recoveryui.cxx28
-rw-r--r--svx/source/unodraw/shapeimpl.hxx28
-rw-r--r--svx/source/unodraw/shapepropertynotifier.cxx14
-rw-r--r--svx/source/unodraw/tableshape.cxx7
-rw-r--r--svx/source/unodraw/unobtabl.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx8
-rw-r--r--svx/source/unodraw/unopage.cxx1
-rw-r--r--svx/source/unodraw/unoprov.cxx126
-rw-r--r--svx/source/unodraw/unoshap2.cxx27
-rw-r--r--svx/source/unodraw/unoshap3.cxx25
-rw-r--r--svx/source/unodraw/unoshap4.cxx66
-rw-r--r--svx/source/unodraw/unoshape.cxx25
-rw-r--r--svx/source/unodraw/unoshcol.cxx18
-rw-r--r--svx/source/unodraw/unoshtxt.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx32
-rw-r--r--svx/source/unogallery/unogalitem.hxx10
-rw-r--r--svx/source/unogallery/unogaltheme.cxx28
-rw-r--r--svx/source/unogallery/unogaltheme.hxx16
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx36
-rw-r--r--svx/source/xml/xmleohlp.cxx72
-rw-r--r--svx/source/xml/xmlexport.cxx1
-rw-r--r--svx/source/xml/xmlgrhlp.cxx138
-rw-r--r--svx/source/xml/xmlxtexp.cxx14
-rw-r--r--svx/source/xml/xmlxtimp.cxx4
-rw-r--r--svx/source/xoutdev/xattr.cxx26
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx14
-rw-r--r--svx/source/xoutdev/xtable.cxx16
-rw-r--r--svx/workben/msview/msview.cxx21
-rw-r--r--svx/workben/msview/xmlconfig.cxx21
-rw-r--r--svx/workben/msview/xmlconfig.hxx42
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx6
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx16
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx6
-rw-r--r--sw/inc/IMark.hxx18
-rw-r--r--sw/inc/PostItMgr.hxx14
-rw-r--r--sw/inc/SwAppletImpl.hxx18
-rw-r--r--sw/inc/SwSmartTagMgr.hxx2
-rw-r--r--sw/inc/SwXMLSectionList.hxx10
-rw-r--r--sw/inc/authfld.hxx2
-rw-r--r--sw/inc/breakit.hxx8
-rw-r--r--sw/inc/ccoll.hxx4
-rw-r--r--sw/inc/charfmt.hxx2
-rw-r--r--sw/inc/crsrsh.hxx8
-rw-r--r--sw/inc/dbfld.hxx30
-rw-r--r--sw/inc/dbgoutsw.hxx2
-rw-r--r--sw/inc/dbmgr.hxx20
-rw-r--r--sw/inc/ddefld.hxx10
-rw-r--r--sw/inc/doc.hxx8
-rw-r--r--sw/inc/docsh.hxx4
-rw-r--r--sw/inc/docstyle.hxx2
-rw-r--r--sw/inc/docufld.hxx96
-rw-r--r--sw/inc/editsh.hxx10
-rw-r--r--sw/inc/expfld.hxx32
-rw-r--r--sw/inc/fldbas.hxx10
-rw-r--r--sw/inc/flddat.hxx4
-rw-r--r--sw/inc/flddropdown.hxx40
-rw-r--r--sw/inc/fmtftntx.hxx12
-rw-r--r--sw/inc/fmtmeta.hxx4
-rw-r--r--sw/inc/fmtrfmrk.hxx6
-rw-r--r--sw/inc/format.hxx2
-rw-r--r--sw/inc/ftninfo.hxx12
-rw-r--r--sw/inc/istyleaccess.hxx2
-rw-r--r--sw/inc/mdiexp.hxx4
-rw-r--r--sw/inc/modcfg.hxx20
-rw-r--r--sw/inc/modeltoviewhelper.hxx4
-rw-r--r--sw/inc/ndtxt.hxx2
-rw-r--r--sw/inc/printdata.hxx12
-rw-r--r--sw/inc/prtopt.hxx4
-rw-r--r--sw/inc/reffld.hxx10
-rw-r--r--sw/inc/splargs.hxx2
-rw-r--r--sw/inc/swabstdlg.hxx12
-rw-r--r--sw/inc/swdbdata.hxx4
-rw-r--r--sw/inc/swdbtoolsclient.hxx4
-rw-r--r--sw/inc/swfltopt.hxx2
-rw-r--r--sw/inc/swscanner.hxx10
-rw-r--r--sw/inc/swundo.hxx2
-rw-r--r--sw/inc/swurl.hxx4
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/undobj.hxx4
-rw-r--r--sw/inc/unobaseclass.hxx4
-rw-r--r--sw/inc/unochart.hxx54
-rw-r--r--sw/inc/unocoll.hxx90
-rw-r--r--sw/inc/unocrsrhelper.hxx18
-rw-r--r--sw/inc/unodraw.hxx36
-rw-r--r--sw/inc/unofieldcoll.hxx18
-rw-r--r--sw/inc/unoframe.hxx52
-rw-r--r--sw/inc/unoidxcoll.hxx12
-rw-r--r--sw/inc/unoparagraph.hxx54
-rw-r--r--sw/inc/unoredline.hxx12
-rw-r--r--sw/inc/unoredlines.hxx12
-rw-r--r--sw/inc/unosett.hxx102
-rw-r--r--sw/inc/unosrch.hxx26
-rw-r--r--sw/inc/unostyle.hxx146
-rw-r--r--sw/inc/unotbl.hxx148
-rw-r--r--sw/inc/unotext.hxx22
-rw-r--r--sw/inc/unotextbodyhf.hxx12
-rw-r--r--sw/inc/unotextcursor.hxx52
-rw-r--r--sw/inc/unotextrange.hxx46
-rw-r--r--sw/inc/unotxdoc.hxx92
-rw-r--r--sw/inc/usrfld.hxx10
-rw-r--r--sw/inc/viewopt.hxx6
-rw-r--r--sw/qa/core/filters-test.cxx34
-rw-r--r--sw/qa/core/layout-test.cxx18
-rw-r--r--sw/qa/core/macros-test.cxx40
-rw-r--r--sw/qa/core/uwriter.cxx136
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx2
-rw-r--r--sw/source/core/access/acccell.cxx1
-rw-r--r--sw/source/core/access/acccell.hxx8
-rw-r--r--sw/source/core/access/acccontext.cxx1
-rw-r--r--sw/source/core/access/accdoc.cxx1
-rw-r--r--sw/source/core/access/accdoc.hxx8
-rw-r--r--sw/source/core/access/accembedded.cxx1
-rw-r--r--sw/source/core/access/accembedded.hxx6
-rw-r--r--sw/source/core/access/accfootnote.cxx1
-rw-r--r--sw/source/core/access/accfootnote.hxx8
-rw-r--r--sw/source/core/access/accframebase.cxx1
-rw-r--r--sw/source/core/access/accgraphic.cxx1
-rw-r--r--sw/source/core/access/accgraphic.hxx6
-rw-r--r--sw/source/core/access/accheaderfooter.cxx1
-rw-r--r--sw/source/core/access/accheaderfooter.hxx8
-rw-r--r--sw/source/core/access/acchyperlink.cxx1
-rw-r--r--sw/source/core/access/acchyperlink.hxx2
-rw-r--r--sw/source/core/access/accmap.cxx1
-rw-r--r--sw/source/core/access/accnotextframe.cxx1
-rw-r--r--sw/source/core/access/accnotextframe.hxx10
-rw-r--r--sw/source/core/access/accpage.cxx1
-rw-r--r--sw/source/core/access/accpage.hxx8
-rw-r--r--sw/source/core/access/accpara.hxx58
-rw-r--r--sw/source/core/access/accportions.cxx2
-rw-r--r--sw/source/core/access/accportions.hxx6
-rw-r--r--sw/source/core/access/accpreview.cxx1
-rw-r--r--sw/source/core/access/accpreview.hxx6
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/access/acctable.hxx18
-rw-r--r--sw/source/core/access/acctextframe.cxx1
-rw-r--r--sw/source/core/access/acctextframe.hxx14
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx4
-rw-r--r--sw/source/core/attr/swatrset.cxx2
-rw-r--r--sw/source/core/bastyp/breakit.cxx6
-rw-r--r--sw/source/core/bastyp/calc.cxx2
-rw-r--r--sw/source/core/bastyp/swcache.cxx2
-rw-r--r--sw/source/core/crsr/crbm.cxx4
-rw-r--r--sw/source/core/crsr/crossrefbookmark.cxx9
-rw-r--r--sw/source/core/crsr/crsrsh.cxx10
-rw-r--r--sw/source/core/crsr/crstrvl.cxx2
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx8
-rw-r--r--sw/source/core/doc/doc.cxx1
-rw-r--r--sw/source/core/doc/docbasic.cxx5
-rw-r--r--sw/source/core/doc/docbm.cxx44
-rw-r--r--sw/source/core/doc/docdde.cxx10
-rw-r--r--sw/source/core/doc/docdraw.cxx6
-rw-r--r--sw/source/core/doc/docedt.cxx10
-rw-r--r--sw/source/core/doc/docfld.cxx4
-rw-r--r--sw/source/core/doc/docglbl.cxx4
-rw-r--r--sw/source/core/doc/docglos.cxx2
-rw-r--r--sw/source/core/doc/doclay.cxx1
-rw-r--r--sw/source/core/doc/docnum.cxx2
-rw-r--r--sw/source/core/doc/doctxm.cxx6
-rw-r--r--sw/source/core/doc/docxforms.cxx1
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/doc/poolfmt.cxx2
-rw-r--r--sw/source/core/doc/swstylemanager.cxx14
-rw-r--r--sw/source/core/doc/tblafmt.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/docnode/ndtbl.cxx4
-rw-r--r--sw/source/core/docnode/nodedump.cxx4
-rw-r--r--sw/source/core/docnode/section.cxx6
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx2
-rw-r--r--sw/source/core/draw/drawdoc.cxx2
-rw-r--r--sw/source/core/edit/autofmt.cxx28
-rw-r--r--sw/source/core/edit/edfldexp.cxx1
-rw-r--r--sw/source/core/edit/edglss.cxx8
-rw-r--r--sw/source/core/edit/editsh.cxx6
-rw-r--r--sw/source/core/edit/edtox.cxx6
-rw-r--r--sw/source/core/edit/edundo.cxx6
-rw-r--r--sw/source/core/edit/edws.cxx6
-rw-r--r--sw/source/core/fields/authfld.cxx11
-rw-r--r--sw/source/core/fields/cellfml.cxx14
-rw-r--r--sw/source/core/fields/dbfld.cxx21
-rw-r--r--sw/source/core/fields/ddefld.cxx13
-rw-r--r--sw/source/core/fields/docufld.cxx79
-rw-r--r--sw/source/core/fields/expfld.cxx29
-rw-r--r--sw/source/core/fields/fldbas.cxx12
-rw-r--r--sw/source/core/fields/flddat.cxx6
-rw-r--r--sw/source/core/fields/flddropdown.cxx43
-rw-r--r--sw/source/core/fields/macrofld.cxx15
-rw-r--r--sw/source/core/fields/reffld.cxx13
-rw-r--r--sw/source/core/fields/scrptfld.cxx9
-rw-r--r--sw/source/core/fields/tblcalc.cxx11
-rw-r--r--sw/source/core/fields/textapi.cxx2
-rw-r--r--sw/source/core/fields/usrfld.cxx11
-rw-r--r--sw/source/core/frmedt/fefly1.cxx1
-rw-r--r--sw/source/core/frmedt/fetab.cxx6
-rw-r--r--sw/source/core/graphic/ndgrf.cxx2
-rw-r--r--sw/source/core/inc/MarkManager.hxx24
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx22
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx4
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx26
-rw-r--r--sw/source/core/inc/UndoDraw.hxx2
-rw-r--r--sw/source/core/inc/UndoInsert.hxx4
-rw-r--r--sw/source/core/inc/UndoManager.hxx6
-rw-r--r--sw/source/core/inc/bookmrk.hxx38
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx22
-rw-r--r--sw/source/core/inc/dumpfilter.hxx6
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx10
-rw-r--r--sw/source/core/inc/fntcache.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx4
-rw-r--r--sw/source/core/inc/rolbck.hxx6
-rw-r--r--sw/source/core/inc/scriptinfo.hxx9
-rw-r--r--sw/source/core/inc/swblocks.hxx4
-rw-r--r--sw/source/core/inc/swcache.hxx4
-rw-r--r--sw/source/core/inc/txtfrm.hxx2
-rw-r--r--sw/source/core/inc/unobookmark.hxx42
-rw-r--r--sw/source/core/inc/unoevent.hxx12
-rw-r--r--sw/source/core/inc/unofield.hxx48
-rw-r--r--sw/source/core/inc/unoflatpara.hxx10
-rw-r--r--sw/source/core/inc/unofootnote.hxx22
-rw-r--r--sw/source/core/inc/unoidx.hxx46
-rw-r--r--sw/source/core/inc/unometa.hxx34
-rw-r--r--sw/source/core/inc/unoparaframeenum.hxx6
-rw-r--r--sw/source/core/inc/unoport.hxx64
-rw-r--r--sw/source/core/inc/unorefmark.hxx22
-rw-r--r--sw/source/core/inc/unosection.hxx38
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx12
-rw-r--r--sw/source/core/inc/wrong.hxx8
-rw-r--r--sw/source/core/layout/atrfrm.cxx1
-rw-r--r--sw/source/core/layout/dbg_lay.cxx34
-rw-r--r--sw/source/core/layout/newfrm.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/ole/ndole.cxx1
-rw-r--r--sw/source/core/para/paratr.cxx6
-rw-r--r--sw/source/core/swg/SwXMLBlockExport.cxx5
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx1
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx3
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx1
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx4
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx1
-rw-r--r--sw/source/core/swg/swblocks.cxx4
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx78
-rw-r--r--sw/source/core/text/inftxt.cxx2
-rw-r--r--sw/source/core/text/txthyph.cxx1
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/text/xmldump.cxx6
-rw-r--r--sw/source/core/tox/tox.cxx4
-rw-r--r--sw/source/core/tox/toxhlp.cxx4
-rw-r--r--sw/source/core/tox/txmsrt.cxx1
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx9
-rw-r--r--sw/source/core/txtnode/fntcache.cxx4
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx4
-rw-r--r--sw/source/core/txtnode/thints.cxx4
-rw-r--r--sw/source/core/txtnode/txtedt.cxx33
-rw-r--r--sw/source/core/undo/docundo.cxx14
-rw-r--r--sw/source/core/undo/rolbck.cxx2
-rw-r--r--sw/source/core/undo/undel.cxx10
-rw-r--r--sw/source/core/undo/undobj.cxx2
-rw-r--r--sw/source/core/undo/undobj1.cxx2
-rw-r--r--sw/source/core/undo/undraw.cxx2
-rw-r--r--sw/source/core/undo/unins.cxx20
-rw-r--r--sw/source/core/undo/unovwr.cxx12
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx9
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.cxx30
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.hxx6
-rw-r--r--sw/source/core/unocore/swunohelper.cxx14
-rw-r--r--sw/source/core/unocore/unobkm.cxx21
-rw-r--r--sw/source/core/unocore/unochart.cxx15
-rw-r--r--sw/source/core/unocore/unocoll.cxx62
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx19
-rw-r--r--sw/source/core/unocore/unodraw.cxx89
-rw-r--r--sw/source/core/unocore/unoevent.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx9
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx41
-rw-r--r--sw/source/core/unocore/unoftn.cxx15
-rw-r--r--sw/source/core/unocore/unoidx.cxx33
-rw-r--r--sw/source/core/unocore/unomap.cxx1
-rw-r--r--sw/source/core/unocore/unoobj.cxx32
-rw-r--r--sw/source/core/unocore/unoobj2.cxx23
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx17
-rw-r--r--sw/source/core/unocore/unoport.cxx4
-rw-r--r--sw/source/core/unocore/unoredline.cxx30
-rw-r--r--sw/source/core/unocore/unoredlines.cxx7
-rw-r--r--sw/source/core/unocore/unorefmk.cxx75
-rw-r--r--sw/source/core/unocore/unosect.cxx55
-rw-r--r--sw/source/core/unocore/unosett.cxx10
-rw-r--r--sw/source/core/unocore/unostyle.cxx56
-rw-r--r--sw/source/core/unocore/unotbl.cxx22
-rw-r--r--sw/source/core/unocore/unotext.cxx45
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx18
-rw-r--r--sw/source/core/view/printdata.cxx81
-rw-r--r--sw/source/core/view/viewimp.cxx2
-rw-r--r--sw/source/filter/ascii/parasc.cxx8
-rw-r--r--sw/source/filter/basflt/fltini.cxx13
-rw-r--r--sw/source/filter/basflt/iodetect.cxx36
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx34
-rw-r--r--sw/source/filter/html/css1atr.cxx124
-rw-r--r--sw/source/filter/html/htmlatr.cxx36
-rw-r--r--sw/source/filter/html/htmlbas.cxx20
-rw-r--r--sw/source/filter/html/htmlcss1.cxx12
-rw-r--r--sw/source/filter/html/htmldraw.cxx4
-rw-r--r--sw/source/filter/html/htmlfldw.cxx12
-rw-r--r--sw/source/filter/html/htmlfly.cxx44
-rw-r--r--sw/source/filter/html/htmlform.cxx3
-rw-r--r--sw/source/filter/html/htmlforw.cxx21
-rw-r--r--sw/source/filter/html/htmlftn.cxx14
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/htmlnum.cxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx64
-rw-r--r--sw/source/filter/html/htmltabw.cxx12
-rw-r--r--sw/source/filter/html/parcss1.cxx18
-rw-r--r--sw/source/filter/html/swhtml.cxx20
-rw-r--r--sw/source/filter/html/swhtml.hxx6
-rw-r--r--sw/source/filter/html/wrthtml.cxx30
-rw-r--r--sw/source/filter/html/wrthtml.hxx14
-rw-r--r--sw/source/filter/inc/msfilter.hxx4
-rw-r--r--sw/source/filter/ww1/fltshell.cxx8
-rw-r--r--sw/source/filter/ww1/w1class.cxx10
-rw-r--r--sw/source/filter/ww1/w1filter.cxx4
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx12
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx48
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx8
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx8
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx42
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx8
-rw-r--r--sw/source/filter/ww8/docxexport.cxx26
-rw-r--r--sw/source/filter/ww8/docxexport.hxx18
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx10
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx4
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx26
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx20
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx20
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx4
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx4
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx6
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.cxx10
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.hxx10
-rw-r--r--sw/source/filter/ww8/sortedarray.hxx10
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx16
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx10
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx14
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx48
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx20
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx8
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx10
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx54
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx36
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx10
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx8
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par.cxx96
-rw-r--r--sw/source/filter/ww8/ww8par.hxx44
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx38
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx14
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx72
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx20
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx2
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx38
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx12
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx1
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx30
-rw-r--r--sw/source/filter/xml/swxml.cxx31
-rw-r--r--sw/source/filter/xml/wrtxml.cxx21
-rw-r--r--sw/source/filter/xml/wrtxml.hxx2
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx1
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx5
-rw-r--r--sw/source/filter/xml/xmlexp.hxx10
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx2
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx2
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx4
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx5
-rw-r--r--sw/source/filter/xml/xmlimp.hxx24
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx3
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx6
-rw-r--r--sw/source/filter/xml/xmlitem.cxx3
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx11
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx1
-rw-r--r--sw/source/filter/xml/xmlithlp.hxx2
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx2
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx1
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx2
-rw-r--r--sw/source/filter/xml/xmlscript.cxx1
-rw-r--r--sw/source/filter/xml/xmltble.cxx2
-rw-r--r--sw/source/filter/xml/xmltbli.cxx4
-rw-r--r--sw/source/filter/xml/xmltbli.hxx34
-rw-r--r--sw/source/filter/xml/xmltext.cxx1
-rw-r--r--sw/source/filter/xml/xmltexte.cxx60
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.cxx64
-rw-r--r--sw/source/filter/xml/xmltexti.hxx44
-rw-r--r--sw/source/ui/app/apphdl.cxx2
-rw-r--r--sw/source/ui/app/applab.cxx7
-rw-r--r--sw/source/ui/app/appopt.cxx6
-rw-r--r--sw/source/ui/app/docsh.cxx35
-rw-r--r--sw/source/ui/app/docsh2.cxx37
-rw-r--r--sw/source/ui/app/docshini.cxx7
-rw-r--r--sw/source/ui/app/docst.cxx4
-rw-r--r--sw/source/ui/app/docstyle.cxx12
-rw-r--r--sw/source/ui/app/swdll.cxx6
-rw-r--r--sw/source/ui/app/swmodul1.cxx1
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx6
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx8
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx4
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/config/barcfg.cxx3
-rw-r--r--sw/source/ui/config/caption.cxx2
-rw-r--r--sw/source/ui/config/dbconfig.cxx3
-rw-r--r--sw/source/ui/config/fontcfg.cxx3
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx7
-rw-r--r--sw/source/ui/config/modcfg.cxx19
-rw-r--r--sw/source/ui/config/optcomp.cxx16
-rw-r--r--sw/source/ui/config/optload.cxx8
-rw-r--r--sw/source/ui/config/optpage.cxx10
-rw-r--r--sw/source/ui/config/prtopt.cxx3
-rw-r--r--sw/source/ui/config/uinums.cxx4
-rw-r--r--sw/source/ui/config/usrpref.cxx11
-rw-r--r--sw/source/ui/config/viewopt.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx40
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx7
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx18
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx122
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx122
-rw-r--r--sw/source/ui/dbui/dbtree.cxx26
-rw-r--r--sw/source/ui/dbui/dbui.cxx6
-rw-r--r--sw/source/ui/dbui/maildispatcher.cxx5
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx12
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx87
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx74
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx20
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx209
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx6
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx36
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx36
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx86
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx20
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx1
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx12
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx10
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx4
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx4
-rw-r--r--sw/source/ui/dialog/regionsw.cxx2
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx12
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx12
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx6
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx2
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx26
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx2
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx12
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx4
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.hxx2
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx4
-rw-r--r--sw/source/ui/docvw/edtwin.cxx14
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx4
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx12
-rw-r--r--sw/source/ui/envelp/envimg.cxx7
-rw-r--r--sw/source/ui/envelp/label1.cxx14
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx12
-rw-r--r--sw/source/ui/envelp/labelexp.cxx9
-rw-r--r--sw/source/ui/envelp/labfmt.cxx9
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/envelp/labimg.cxx5
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx19
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx6
-rw-r--r--sw/source/ui/fldui/changedb.cxx4
-rw-r--r--sw/source/ui/fldui/flddb.cxx4
-rw-r--r--sw/source/ui/fldui/flddinf.cxx10
-rw-r--r--sw/source/ui/fldui/flddinf.hxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx4
-rw-r--r--sw/source/ui/fldui/fldedt.cxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx5
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx9
-rw-r--r--sw/source/ui/fldui/fldpage.cxx8
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx6
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/fldui/xfldui.cxx4
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/cption.cxx10
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx1
-rw-r--r--sw/source/ui/inc/HeaderFooterWin.hxx2
-rw-r--r--sw/source/ui/inc/SwXFilterOptions.hxx16
-rw-r--r--sw/source/ui/inc/actctrl.hxx4
-rw-r--r--sw/source/ui/inc/barcfg.hxx4
-rw-r--r--sw/source/ui/inc/caption.hxx6
-rw-r--r--sw/source/ui/inc/cfgitems.hxx2
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/conttree.hxx2
-rw-r--r--sw/source/ui/inc/dbconfig.hxx4
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/ui/inc/edtwin.hxx2
-rw-r--r--sw/source/ui/inc/envimg.hxx8
-rw-r--r--sw/source/ui/inc/fldmgr.hxx2
-rw-r--r--sw/source/ui/inc/fontcfg.hxx4
-rw-r--r--sw/source/ui/inc/glosbib.hxx2
-rw-r--r--sw/source/ui/inc/glosdoc.hxx8
-rw-r--r--sw/source/ui/inc/imaildsplistener.hxx2
-rw-r--r--sw/source/ui/inc/javaedit.hxx8
-rw-r--r--sw/source/ui/inc/label.hxx6
-rw-r--r--sw/source/ui/inc/labelcfg.hxx14
-rw-r--r--sw/source/ui/inc/labimg.hxx90
-rw-r--r--sw/source/ui/inc/mailmergehelper.hxx98
-rw-r--r--sw/source/ui/inc/mailmrge.hxx4
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx78
-rw-r--r--sw/source/ui/inc/navicfg.hxx4
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx2
-rw-r--r--sw/source/ui/inc/olmenu.hxx16
-rw-r--r--sw/source/ui/inc/stmenu.hxx2
-rw-r--r--sw/source/ui/inc/tablemgr.hxx2
-rw-r--r--sw/source/ui/inc/unoatxt.hxx72
-rw-r--r--sw/source/ui/inc/unodispatch.hxx2
-rw-r--r--sw/source/ui/inc/unomailmerge.hxx56
-rw-r--r--sw/source/ui/inc/unomod.hxx18
-rw-r--r--sw/source/ui/inc/unotxvw.hxx48
-rw-r--r--sw/source/ui/inc/usrpref.hxx20
-rw-r--r--sw/source/ui/inc/wrtsh.hxx6
-rw-r--r--sw/source/ui/index/cntex.cxx23
-rw-r--r--sw/source/ui/index/cnttab.cxx37
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx1
-rw-r--r--sw/source/ui/lingu/hyp.cxx1
-rw-r--r--sw/source/ui/lingu/olmenu.cxx13
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.cxx1
-rw-r--r--sw/source/ui/misc/bookmark.cxx4
-rw-r--r--sw/source/ui/misc/glosbib.cxx6
-rw-r--r--sw/source/ui/misc/glosdoc.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx5
-rw-r--r--sw/source/ui/misc/linenum.cxx8
-rw-r--r--sw/source/ui/misc/num.cxx2
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx3
-rw-r--r--sw/source/ui/misc/outline.cxx6
-rw-r--r--sw/source/ui/misc/pggrid.cxx6
-rw-r--r--sw/source/ui/misc/redlndlg.cxx4
-rw-r--r--sw/source/ui/misc/srtdlg.cxx5
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx8
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx10
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx19
-rw-r--r--sw/source/ui/shells/annotsh.cxx8
-rw-r--r--sw/source/ui/shells/basesh.cxx4
-rw-r--r--sw/source/ui/shells/beziersh.cxx2
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drformsh.cxx5
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx10
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
-rw-r--r--sw/source/ui/shells/grfsh.cxx2
-rw-r--r--sw/source/ui/shells/grfshex.cxx5
-rw-r--r--sw/source/ui/shells/langhelper.cxx14
-rw-r--r--sw/source/ui/shells/listsh.cxx2
-rw-r--r--sw/source/ui/shells/mediash.cxx2
-rw-r--r--sw/source/ui/shells/navsh.cxx2
-rw-r--r--sw/source/ui/shells/olesh.cxx2
-rw-r--r--sw/source/ui/shells/tabsh.cxx2
-rw-r--r--sw/source/ui/shells/textdrw.cxx3
-rw-r--r--sw/source/ui/shells/textfld.cxx8
-rw-r--r--sw/source/ui/shells/textsh.cxx39
-rw-r--r--sw/source/ui/shells/textsh1.cxx22
-rw-r--r--sw/source/ui/shells/textsh2.cxx4
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx18
-rw-r--r--sw/source/ui/table/chartins.cxx11
-rw-r--r--sw/source/ui/table/convert.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx2
-rw-r--r--sw/source/ui/table/tablemgr.cxx12
-rw-r--r--sw/source/ui/uiview/pview.cxx2
-rw-r--r--sw/source/ui/uiview/srcview.cxx19
-rw-r--r--sw/source/ui/uiview/view.cxx6
-rw-r--r--sw/source/ui/uiview/view0.cxx3
-rw-r--r--sw/source/ui/uiview/view2.cxx9
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx4
-rw-r--r--sw/source/ui/uiview/viewling.cxx25
-rw-r--r--sw/source/ui/uiview/viewport.cxx2
-rw-r--r--sw/source/ui/uiview/viewprt.cxx2
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx2
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx7
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.hxx6
-rw-r--r--sw/source/ui/uno/SwXFilterOptions.cxx28
-rw-r--r--sw/source/ui/uno/detreg.cxx1
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx1
-rw-r--r--sw/source/ui/uno/swdet2.cxx4
-rw-r--r--sw/source/ui/uno/swdetect.hxx2
-rw-r--r--sw/source/ui/uno/unoatxt.cxx1
-rw-r--r--sw/source/ui/uno/unodispatch.cxx1
-rw-r--r--sw/source/ui/uno/unodoc.cxx36
-rw-r--r--sw/source/ui/uno/unofreg.cxx5
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx5
-rw-r--r--sw/source/ui/uno/unomod.cxx8
-rw-r--r--sw/source/ui/uno/unomodule.hxx8
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx33
-rw-r--r--sw/source/ui/uno/unotxvw.cxx13
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx2
-rw-r--r--sw/source/ui/utlui/condedit.cxx1
-rw-r--r--sw/source/ui/utlui/content.cxx28
-rw-r--r--sw/source/ui/utlui/glbltree.cxx5
-rw-r--r--sw/source/ui/utlui/initui.cxx8
-rw-r--r--sw/source/ui/utlui/navicfg.cxx2
-rw-r--r--sw/source/ui/utlui/navipi.cxx10
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx4
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx1
-rw-r--r--sw/source/ui/utlui/uitool.cxx2
-rw-r--r--sw/source/ui/utlui/unotools.cxx65
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx22
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx14
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx16
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx15
-rw-r--r--sw/source/ui/vba/vbaapplication.hxx6
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx32
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx8
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx18
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx12
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx34
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx12
-rw-r--r--sw/source/ui/vba/vbaborders.cxx26
-rw-r--r--sw/source/ui/vba/vbaborders.hxx4
-rw-r--r--sw/source/ui/vba/vbacell.cxx10
-rw-r--r--sw/source/ui/vba/vbacell.hxx4
-rw-r--r--sw/source/ui/vba/vbacells.cxx10
-rw-r--r--sw/source/ui/vba/vbacells.hxx4
-rw-r--r--sw/source/ui/vba/vbacheckbox.cxx18
-rw-r--r--sw/source/ui/vba/vbacheckbox.hxx4
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx18
-rw-r--r--sw/source/ui/vba/vbacolumn.hxx4
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx14
-rw-r--r--sw/source/ui/vba/vbacolumns.hxx4
-rw-r--r--sw/source/ui/vba/vbadialog.cxx16
-rw-r--r--sw/source/ui/vba/vbadialog.hxx6
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx10
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx46
-rw-r--r--sw/source/ui/vba/vbadocument.hxx16
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx120
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx10
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx16
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx6
-rw-r--r--sw/source/ui/vba/vbaeventshelper.cxx4
-rw-r--r--sw/source/ui/vba/vbaeventshelper.hxx2
-rw-r--r--sw/source/ui/vba/vbafield.cxx50
-rw-r--r--sw/source/ui/vba/vbafield.hxx12
-rw-r--r--sw/source/ui/vba/vbafind.cxx56
-rw-r--r--sw/source/ui/vba/vbafind.hxx12
-rw-r--r--sw/source/ui/vba/vbafont.cxx14
-rw-r--r--sw/source/ui/vba/vbafont.hxx4
-rw-r--r--sw/source/ui/vba/vbaformfield.cxx26
-rw-r--r--sw/source/ui/vba/vbaformfield.hxx8
-rw-r--r--sw/source/ui/vba/vbaformfields.cxx26
-rw-r--r--sw/source/ui/vba/vbaformfields.hxx4
-rw-r--r--sw/source/ui/vba/vbaframe.cxx10
-rw-r--r--sw/source/ui/vba/vbaframe.hxx4
-rw-r--r--sw/source/ui/vba/vbaframes.cxx10
-rw-r--r--sw/source/ui/vba/vbaframes.hxx4
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx26
-rw-r--r--sw/source/ui/vba/vbaglobals.hxx8
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.cxx18
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx4
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.cxx22
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx10
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.hxx4
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx18
-rw-r--r--sw/source/ui/vba/vbalistformat.hxx4
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx12
-rw-r--r--sw/source/ui/vba/vbalistgalleries.hxx4
-rw-r--r--sw/source/ui/vba/vbalistgallery.cxx10
-rw-r--r--sw/source/ui/vba/vbalistgallery.hxx4
-rw-r--r--sw/source/ui/vba/vbalisthelper.cxx244
-rw-r--r--sw/source/ui/vba/vbalisthelper.hxx6
-rw-r--r--sw/source/ui/vba/vbalistlevel.cxx68
-rw-r--r--sw/source/ui/vba/vbalistlevel.hxx12
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx12
-rw-r--r--sw/source/ui/vba/vbalistlevels.hxx4
-rw-r--r--sw/source/ui/vba/vbalisttemplate.cxx12
-rw-r--r--sw/source/ui/vba/vbalisttemplate.hxx4
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx12
-rw-r--r--sw/source/ui/vba/vbalisttemplates.hxx4
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx40
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx6
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx102
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx6
-rw-r--r--sw/source/ui/vba/vbapane.cxx12
-rw-r--r--sw/source/ui/vba/vbapane.hxx4
-rw-r--r--sw/source/ui/vba/vbapanes.cxx10
-rw-r--r--sw/source/ui/vba/vbapanes.hxx4
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx24
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx8
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx104
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx4
-rw-r--r--sw/source/ui/vba/vbarange.cxx56
-rw-r--r--sw/source/ui/vba/vbarange.hxx10
-rw-r--r--sw/source/ui/vba/vbarangehelper.cxx4
-rw-r--r--sw/source/ui/vba/vbarangehelper.hxx2
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx14
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx8
-rw-r--r--sw/source/ui/vba/vbarevision.cxx10
-rw-r--r--sw/source/ui/vba/vbarevision.hxx4
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx10
-rw-r--r--sw/source/ui/vba/vbarevisions.hxx4
-rw-r--r--sw/source/ui/vba/vbarow.cxx24
-rw-r--r--sw/source/ui/vba/vbarow.hxx4
-rw-r--r--sw/source/ui/vba/vbarows.cxx46
-rw-r--r--sw/source/ui/vba/vbarows.hxx4
-rw-r--r--sw/source/ui/vba/vbasection.cxx10
-rw-r--r--sw/source/ui/vba/vbasection.hxx4
-rw-r--r--sw/source/ui/vba/vbasections.cxx14
-rw-r--r--sw/source/ui/vba/vbasections.hxx4
-rw-r--r--sw/source/ui/vba/vbaselection.cxx102
-rw-r--r--sw/source/ui/vba/vbaselection.hxx12
-rw-r--r--sw/source/ui/vba/vbastyle.cxx58
-rw-r--r--sw/source/ui/vba/vbastyle.hxx14
-rw-r--r--sw/source/ui/vba/vbastyles.cxx42
-rw-r--r--sw/source/ui/vba/vbastyles.hxx4
-rw-r--r--sw/source/ui/vba/vbasystem.cxx46
-rw-r--r--sw/source/ui/vba/vbasystem.hxx14
-rw-r--r--sw/source/ui/vba/vbatable.cxx12
-rw-r--r--sw/source/ui/vba/vbatable.hxx6
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx12
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx6
-rw-r--r--sw/source/ui/vba/vbatableofcontents.cxx22
-rw-r--r--sw/source/ui/vba/vbatableofcontents.hxx4
-rw-r--r--sw/source/ui/vba/vbatables.cxx24
-rw-r--r--sw/source/ui/vba/vbatables.hxx4
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx14
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.hxx4
-rw-r--r--sw/source/ui/vba/vbatabstop.cxx10
-rw-r--r--sw/source/ui/vba/vbatabstop.hxx4
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx16
-rw-r--r--sw/source/ui/vba/vbatabstops.hxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx28
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx12
-rw-r--r--sw/source/ui/vba/vbavariable.cxx18
-rw-r--r--sw/source/ui/vba/vbavariable.hxx12
-rw-r--r--sw/source/ui/vba/vbavariables.cxx14
-rw-r--r--sw/source/ui/vba/vbavariables.hxx6
-rw-r--r--sw/source/ui/vba/vbaview.cxx72
-rw-r--r--sw/source/ui/vba/vbaview.hxx4
-rw-r--r--sw/source/ui/vba/vbawindow.cxx12
-rw-r--r--sw/source/ui/vba/vbawindow.hxx4
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx44
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx8
-rw-r--r--sw/source/ui/vba/wordvbahelper.cxx16
-rw-r--r--sw/source/ui/web/wgrfsh.cxx2
-rw-r--r--sw/source/ui/web/wlistsh.cxx2
-rw-r--r--sw/source/ui/web/wolesh.cxx2
-rw-r--r--sw/source/ui/web/wtabsh.cxx2
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx4
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx26
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx14
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx3
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx4
-rw-r--r--test/inc/test/beans/xpropertyset.hxx12
-rw-r--r--test/inc/test/container/xnamecontainer.hxx4
-rw-r--r--test/inc/test/container/xnamed.hxx4
-rw-r--r--test/inc/test/container/xnamereplace.hxx4
-rw-r--r--test/inc/test/sheet/xdatabaserange.hxx2
-rw-r--r--test/inc/test/sheet/xdatapilotdescriptor.hxx2
-rw-r--r--test/inc/test/sheet/xnamedrange.hxx2
-rw-r--r--test/inc/test/sheet/xnamedranges.hxx4
-rw-r--r--test/inc/test/sheet/xspreadsheets2.hxx14
-rw-r--r--test/inc/test/unoapi_test.hxx4
-rw-r--r--test/inc/test/util/xreplaceable.hxx8
-rw-r--r--test/inc/test/util/xsearchable.hxx4
-rw-r--r--test/source/beans/xpropertyset.cxx12
-rw-r--r--test/source/container/xnamecontainer.cxx2
-rw-r--r--test/source/container/xnamed.cxx2
-rw-r--r--test/source/sheet/cellproperties.cxx4
-rw-r--r--test/source/sheet/datapilotfield.cxx24
-rw-r--r--test/source/sheet/tableautoformatfield.cxx6
-rw-r--r--test/source/sheet/xdatabaserange.cxx34
-rw-r--r--test/source/sheet/xdatapilotdescriptor.cxx10
-rw-r--r--test/source/sheet/xdatapilotfieldgrouping.cxx2
-rw-r--r--test/source/sheet/xdatapilottable2.cxx4
-rw-r--r--test/source/sheet/xnamedrange.cxx24
-rw-r--r--test/source/sheet/xnamedranges.cxx28
-rw-r--r--test/source/sheet/xsheetannotation.cxx4
-rw-r--r--test/source/sheet/xsheetannotations.cxx6
-rw-r--r--test/source/sheet/xspreadsheets2.cxx58
-rw-r--r--test/source/text/xtextfield.cxx2
-rw-r--r--test/source/unoapi_test.cxx4
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx15
-rw-r--r--testtools/source/bridgetest/constructors.cxx34
-rw-r--r--testtools/source/bridgetest/cppobj.cxx32
-rw-r--r--testtools/source/bridgetest/currentcontextchecker.cxx12
-rw-r--r--testtools/source/bridgetest/multi.cxx60
-rw-r--r--testtools/source/bridgetest/multi.hxx22
-rw-r--r--testtools/source/performance/pseudo.cxx1
-rw-r--r--testtools/source/performance/ubobject.cxx5
-rw-r--r--testtools/source/performance/ubtest.cxx3
-rw-r--r--toolkit/inc/toolkit/awt/animatedimagespeer.hxx4
-rw-r--r--toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx14
-rw-r--r--toolkit/inc/toolkit/awt/vclxcontainer.hxx2
-rw-r--r--toolkit/inc/toolkit/awt/vclxfont.hxx6
-rw-r--r--toolkit/inc/toolkit/awt/vclxgraphics.hxx4
-rw-r--r--toolkit/inc/toolkit/awt/vclxmenu.hxx28
-rw-r--r--toolkit/inc/toolkit/awt/vclxprinter.hxx56
-rw-r--r--toolkit/inc/toolkit/awt/vclxspinbutton.hxx4
-rw-r--r--toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx2
-rw-r--r--toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx14
-rw-r--r--toolkit/inc/toolkit/awt/vclxtoolkit.hxx10
-rw-r--r--toolkit/inc/toolkit/awt/vclxwindow.hxx8
-rw-r--r--toolkit/inc/toolkit/awt/vclxwindows.hxx162
-rw-r--r--toolkit/inc/toolkit/awt/xsimpleanimation.hxx4
-rw-r--r--toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx6
-rw-r--r--toolkit/inc/toolkit/controls/animatedimages.hxx18
-rw-r--r--toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx52
-rw-r--r--toolkit/inc/toolkit/controls/dialogcontrol.hxx24
-rw-r--r--toolkit/inc/toolkit/controls/eventcontainer.hxx20
-rw-r--r--toolkit/inc/toolkit/controls/formattedcontrol.hxx6
-rw-r--r--toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx8
-rw-r--r--toolkit/inc/toolkit/controls/roadmapcontrol.hxx4
-rw-r--r--toolkit/inc/toolkit/controls/roadmapentry.hxx8
-rw-r--r--toolkit/inc/toolkit/controls/spinningprogress.hxx6
-rw-r--r--toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx14
-rw-r--r--toolkit/inc/toolkit/controls/tabpagecontainer.hxx8
-rw-r--r--toolkit/inc/toolkit/controls/tabpagemodel.hxx4
-rw-r--r--toolkit/inc/toolkit/controls/tkscrollbar.hxx4
-rw-r--r--toolkit/inc/toolkit/controls/tksimpleanimation.hxx12
-rw-r--r--toolkit/inc/toolkit/controls/tkspinbutton.hxx12
-rw-r--r--toolkit/inc/toolkit/controls/tkthrobber.hxx12
-rw-r--r--toolkit/inc/toolkit/controls/unocontrol.hxx18
-rw-r--r--toolkit/inc/toolkit/controls/unocontrolbase.hxx10
-rw-r--r--toolkit/inc/toolkit/controls/unocontrolcontainer.hxx10
-rw-r--r--toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx2
-rw-r--r--toolkit/inc/toolkit/controls/unocontrolmodel.hxx20
-rw-r--r--toolkit/inc/toolkit/controls/unocontrols.hxx212
-rw-r--r--toolkit/inc/toolkit/helper/listenermultiplexer.hxx2
-rw-r--r--toolkit/inc/toolkit/helper/macros.hxx18
-rw-r--r--toolkit/inc/toolkit/helper/property.hxx43
-rw-r--r--toolkit/inc/toolkit/helper/tkresmgr.hxx4
-rw-r--r--toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx10
-rw-r--r--toolkit/source/awt/animatedimagespeer.cxx20
-rw-r--r--toolkit/source/awt/asynccallback.cxx18
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx44
-rw-r--r--toolkit/source/awt/vclxcontainer.cxx2
-rw-r--r--toolkit/source/awt/vclxfont.cxx10
-rw-r--r--toolkit/source/awt/vclxgraphics.cxx4
-rw-r--r--toolkit/source/awt/vclxmenu.cxx44
-rw-r--r--toolkit/source/awt/vclxprinter.cxx18
-rw-r--r--toolkit/source/awt/vclxspinbutton.cxx4
-rw-r--r--toolkit/source/awt/vclxtabpagecontainer.cxx3
-rw-r--r--toolkit/source/awt/vclxtabpagemodel.cxx20
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx40
-rw-r--r--toolkit/source/awt/vclxwindow.cxx34
-rw-r--r--toolkit/source/awt/vclxwindow1.cxx4
-rw-r--r--toolkit/source/awt/vclxwindows.cxx280
-rw-r--r--toolkit/source/awt/xsimpleanimation.cxx4
-rw-r--r--toolkit/source/controls/accessiblecontrolcontext.cxx10
-rw-r--r--toolkit/source/controls/animatedimages.cxx44
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx206
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx114
-rw-r--r--toolkit/source/controls/eventcontainer.cxx1
-rw-r--r--toolkit/source/controls/formattedcontrol.cxx16
-rw-r--r--toolkit/source/controls/geometrycontrolmodel.cxx40
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.cxx18
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.hxx6
-rw-r--r--toolkit/source/controls/grid/defaultgriddatamodel.cxx36
-rw-r--r--toolkit/source/controls/grid/defaultgriddatamodel.hxx6
-rw-r--r--toolkit/source/controls/grid/gridcolumn.cxx28
-rw-r--r--toolkit/source/controls/grid/gridcolumn.hxx18
-rw-r--r--toolkit/source/controls/grid/gridcontrol.cxx7
-rw-r--r--toolkit/source/controls/grid/gridcontrol.hxx4
-rw-r--r--toolkit/source/controls/grid/initguard.hxx2
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.cxx20
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.hxx6
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx24
-rw-r--r--toolkit/source/controls/roadmapentry.cxx22
-rw-r--r--toolkit/source/controls/spinningprogress.cxx14
-rw-r--r--toolkit/source/controls/stdtabcontroller.cxx4
-rw-r--r--toolkit/source/controls/stdtabcontrollermodel.cxx16
-rw-r--r--toolkit/source/controls/tabpagecontainer.cxx15
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx44
-rw-r--r--toolkit/source/controls/tkscrollbar.cxx10
-rw-r--r--toolkit/source/controls/tksimpleanimation.cxx32
-rw-r--r--toolkit/source/controls/tkspinbutton.cxx30
-rw-r--r--toolkit/source/controls/tkthrobber.cxx34
-rw-r--r--toolkit/source/controls/tree/treecontrol.cxx3
-rw-r--r--toolkit/source/controls/tree/treecontrol.hxx12
-rw-r--r--toolkit/source/controls/tree/treedatamodel.cxx13
-rw-r--r--toolkit/source/controls/unocontrol.cxx66
-rw-r--r--toolkit/source/controls/unocontrolbase.cxx14
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx54
-rw-r--r--toolkit/source/controls/unocontrolcontainermodel.cxx4
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx84
-rw-r--r--toolkit/source/controls/unocontrols.cxx10
-rw-r--r--toolkit/source/helper/accessibilityclient.cxx6
-rw-r--r--toolkit/source/helper/formpdfexport.cxx76
-rw-r--r--toolkit/source/helper/property.cxx60
-rw-r--r--toolkit/source/helper/registerservices.cxx8
-rw-r--r--toolkit/source/helper/tkresmgr.cxx6
-rw-r--r--toolkit/source/helper/unopropertyarrayhelper.cxx12
-rw-r--r--tools/inc/tools/StringListResource.hxx2
-rw-r--r--tools/inc/tools/appendunixshellword.hxx2
-rw-r--r--tools/inc/tools/bigint.hxx4
-rw-r--r--tools/inc/tools/config.hxx32
-rw-r--r--tools/inc/tools/diagnose_ex.h10
-rw-r--r--tools/inc/tools/getprocessworkingdir.hxx2
-rw-r--r--tools/inc/tools/inetmime.hxx34
-rw-r--r--tools/inc/tools/lineend.hxx4
-rw-r--r--tools/inc/tools/multisel.hxx6
-rw-r--r--tools/inc/tools/rc.hxx4
-rw-r--r--tools/inc/tools/resary.hxx8
-rw-r--r--tools/inc/tools/resid.hxx4
-rw-r--r--tools/inc/tools/resmgr.hxx12
-rw-r--r--tools/inc/tools/simplerm.hxx2
-rw-r--r--tools/inc/tools/stream.hxx70
-rw-r--r--tools/inc/tools/string.hxx40
-rw-r--r--tools/inc/tools/urlobj.hxx360
-rw-r--r--tools/inc/tools/wldcrd.hxx14
-rw-r--r--tools/qa/cppunit/test_inetmime.cxx2
-rw-r--r--tools/qa/cppunit/test_reversemap.cxx12
-rw-r--r--tools/qa/cppunit/test_stream.cxx16
-rw-r--r--tools/qa/cppunit/test_urlobj.cxx2
-rw-r--r--tools/source/fsys/tempfile.cxx14
-rw-r--r--tools/source/fsys/urlobj.cxx360
-rw-r--r--tools/source/fsys/wldcrd.cxx4
-rw-r--r--tools/source/generic/bigint.cxx4
-rw-r--r--tools/source/generic/config.cxx80
-rw-r--r--tools/source/inet/inetmime.cxx58
-rw-r--r--tools/source/inet/inetstrm.cxx24
-rw-r--r--tools/source/memtools/multisel.cxx7
-rw-r--r--tools/source/misc/appendunixshellword.cxx2
-rw-r--r--tools/source/misc/extendapplicationenvironment.cxx8
-rw-r--r--tools/source/misc/getprocessworkingdir.cxx6
-rw-r--r--tools/source/rc/resmgr.cxx48
-rw-r--r--tools/source/ref/errinf.cxx16
-rw-r--r--tools/source/ref/globname.cxx6
-rw-r--r--tools/source/ref/pstm.cxx6
-rw-r--r--tools/source/stream/stream.cxx64
-rw-r--r--tools/source/stream/strmunx.cxx30
-rw-r--r--tools/source/stream/strmwnt.cxx4
-rw-r--r--tools/source/string/strucvt.cxx24
-rw-r--r--touch/source/uno/Document.cxx1
-rw-r--r--tubes/inc/tubes/manager.hxx12
-rw-r--r--tubes/qa/test_manager.cxx4
-rw-r--r--tubes/source/contacts.cxx12
-rw-r--r--tubes/source/manager.cxx16
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx1
-rw-r--r--ucb/source/cacher/cachedcontentresultset.hxx10
-rw-r--r--ucb/source/cacher/cachedcontentresultsetstub.cxx1
-rw-r--r--ucb/source/cacher/cachedcontentresultsetstub.hxx4
-rw-r--r--ucb/source/cacher/cacheddynamicresultset.cxx1
-rw-r--r--ucb/source/cacher/cacheddynamicresultsetstub.cxx1
-rw-r--r--ucb/source/cacher/cacheserv.cxx1
-rw-r--r--ucb/source/cacher/contentresultsetwrapper.cxx1
-rw-r--r--ucb/source/cacher/contentresultsetwrapper.hxx22
-rw-r--r--ucb/source/cacher/dynamicresultsetwrapper.cxx1
-rw-r--r--ucb/source/core/cmdenv.cxx18
-rw-r--r--ucb/source/core/cmdenv.hxx10
-rw-r--r--ucb/source/core/identify.cxx1
-rw-r--r--ucb/source/core/identify.hxx10
-rw-r--r--ucb/source/core/provprox.cxx3
-rw-r--r--ucb/source/core/provprox.hxx18
-rw-r--r--ucb/source/core/ucb.cxx2
-rw-r--r--ucb/source/core/ucb.hxx14
-rw-r--r--ucb/source/core/ucbcmds.cxx226
-rw-r--r--ucb/source/core/ucbprops.cxx3
-rw-r--r--ucb/source/core/ucbprops.hxx6
-rw-r--r--ucb/source/core/ucbserv.cxx1
-rw-r--r--ucb/source/core/ucbstore.cxx2
-rw-r--r--ucb/source/core/ucbstore.hxx44
-rw-r--r--ucb/source/inc/regexp.hxx18
-rw-r--r--ucb/source/inc/regexpmap.hxx16
-rw-r--r--ucb/source/regexp/regexp.cxx58
-rw-r--r--ucb/source/sorter/sortdynres.cxx1
-rw-r--r--ucb/source/sorter/sortmain.cxx1
-rw-r--r--ucb/source/sorter/sortresult.cxx1
-rw-r--r--ucb/source/sorter/sortresult.hxx16
-rw-r--r--ucb/source/ucp/cmis/auth_provider.cxx8
-rw-r--r--ucb/source/ucp/cmis/auth_provider.hxx8
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx170
-rw-r--r--ucb/source/ucp/cmis/cmis_content.hxx22
-rw-r--r--ucb/source/ucp/cmis/cmis_datasupplier.cxx6
-rw-r--r--ucb/source/ucp/cmis/cmis_datasupplier.hxx2
-rw-r--r--ucb/source/ucp/cmis/cmis_provider.cxx12
-rw-r--r--ucb/source/ucp/cmis/cmis_provider.hxx6
-rw-r--r--ucb/source/ucp/cmis/cmis_repo_content.cxx54
-rw-r--r--ucb/source/ucp/cmis/cmis_repo_content.hxx10
-rw-r--r--ucb/source/ucp/cmis/cmis_url.cxx32
-rw-r--r--ucb/source/ucp/cmis/cmis_url.hxx32
-rw-r--r--ucb/source/ucp/expand/ucpexpand.cxx3
-rw-r--r--ucb/source/ucp/ext/ucpext_content.cxx116
-rw-r--r--ucb/source/ucp/ext/ucpext_content.hxx28
-rw-r--r--ucb/source/ucp/ext/ucpext_datasupplier.cxx36
-rw-r--r--ucb/source/ucp/ext/ucpext_datasupplier.hxx2
-rw-r--r--ucb/source/ucp/ext/ucpext_provider.cxx34
-rw-r--r--ucb/source/ucp/ext/ucpext_provider.hxx12
-rw-r--r--ucb/source/ucp/file/bc.cxx94
-rw-r--r--ucb/source/ucp/file/bc.hxx26
-rw-r--r--ucb/source/ucp/file/filcmd.cxx4
-rw-r--r--ucb/source/ucp/file/filcmd.hxx4
-rw-r--r--ucb/source/ucp/file/filglob.cxx116
-rw-r--r--ucb/source/ucp/file/filglob.hxx28
-rw-r--r--ucb/source/ucp/file/filid.cxx6
-rw-r--r--ucb/source/ucp/file/filid.hxx12
-rw-r--r--ucb/source/ucp/file/filinpstr.cxx2
-rw-r--r--ucb/source/ucp/file/filinpstr.hxx2
-rw-r--r--ucb/source/ucp/file/filinsreq.cxx8
-rw-r--r--ucb/source/ucp/file/filinsreq.hxx14
-rw-r--r--ucb/source/ucp/file/filnot.cxx10
-rw-r--r--ucb/source/ucp/file/filnot.hxx14
-rw-r--r--ucb/source/ucp/file/filprp.cxx6
-rw-r--r--ucb/source/ucp/file/filprp.hxx6
-rw-r--r--ucb/source/ucp/file/filrec.hxx2
-rw-r--r--ucb/source/ucp/file/filrow.cxx44
-rw-r--r--ucb/source/ucp/file/filrow.hxx2
-rw-r--r--ucb/source/ucp/file/filrset.cxx66
-rw-r--r--ucb/source/ucp/file/filrset.hxx28
-rw-r--r--ucb/source/ucp/file/filstr.cxx26
-rw-r--r--ucb/source/ucp/file/filstr.hxx2
-rw-r--r--ucb/source/ucp/file/filtask.cxx2
-rw-r--r--ucb/source/ucp/file/filtask.hxx2
-rw-r--r--ucb/source/ucp/file/prov.cxx78
-rw-r--r--ucb/source/ucp/file/prov.hxx32
-rw-r--r--ucb/source/ucp/file/shell.cxx220
-rw-r--r--ucb/source/ucp/file/shell.hxx132
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx54
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpcontentcaps.cxx36
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.cxx8
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.hxx8
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.cxx26
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.hxx30
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.cxx1
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.hxx8
-rw-r--r--ucb/source/ucp/ftp/ftphandleprovider.hxx22
-rw-r--r--ucb/source/ucp/ftp/ftpintreq.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpintreq.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetI.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.cxx42
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.hxx20
-rw-r--r--ucb/source/ucp/ftp/ftpurl.cxx106
-rw-r--r--ucb/source/ucp/ftp/ftpurl.hxx32
-rw-r--r--ucb/source/ucp/ftp/test_ftpurl.cxx42
-rw-r--r--ucb/source/ucp/ftp/test_multiservicefac.cxx8
-rw-r--r--ucb/source/ucp/ftp/test_multiservicefac.hxx6
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx156
-rw-r--r--ucb/source/ucp/gio/gio_content.hxx8
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.cxx16
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.hxx4
-rw-r--r--ucb/source/ucp/gio/gio_inputstream.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_mount.cxx24
-rw-r--r--ucb/source/ucp/gio/gio_provider.cxx6
-rw-r--r--ucb/source/ucp/gio/gio_seekable.cxx6
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.cxx188
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.hxx14
-rw-r--r--ucb/source/ucp/gvfs/gvfs_directory.cxx16
-rw-r--r--ucb/source/ucp/gvfs/gvfs_directory.hxx2
-rw-r--r--ucb/source/ucp/gvfs/gvfs_provider.cxx6
-rw-r--r--ucb/source/ucp/gvfs/gvfs_stream.cxx3
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx218
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.hxx36
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx150
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydata.cxx110
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydata.hxx30
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx82
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.hxx10
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx14
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.cxx14
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.hxx10
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.cxx30
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.hxx26
-rw-r--r--ucb/source/ucp/inc/urihelper.hxx14
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx256
-rw-r--r--ucb/source/ucp/package/pkgcontent.hxx24
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx112
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.cxx30
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.hxx4
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx24
-rw-r--r--ucb/source/ucp/package/pkgprovider.hxx4
-rw-r--r--ucb/source/ucp/package/pkguri.cxx25
-rw-r--r--ucb/source/ucp/package/pkguri.hxx34
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx278
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.hxx42
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx128
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.cxx36
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.hxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.cxx36
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.hxx24
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx24
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx10
-rw-r--r--ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx12
-rw-r--r--ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx44
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.hxx28
-rw-r--r--ucb/source/ucp/tdoc/tdoc_stgelems.cxx48
-rw-r--r--ucb/source/ucp/tdoc/tdoc_stgelems.hxx48
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.cxx58
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.hxx28
-rw-r--r--ucb/source/ucp/tdoc/tdoc_uri.cxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_uri.hxx36
-rw-r--r--ucb/source/ucp/webdav-neon/ContentProperties.cxx100
-rw-r--r--ucb/source/ucp/webdav-neon/ContentProperties.hxx34
-rw-r--r--ucb/source/ucp/webdav-neon/DAVAuthListener.hxx8
-rw-r--r--ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx16
-rw-r--r--ucb/source/ucp/webdav-neon/DAVException.hxx8
-rw-r--r--ucb/source/ucp/webdav-neon/DAVProperties.cxx60
-rw-r--r--ucb/source/ucp/webdav-neon/DAVProperties.hxx28
-rw-r--r--ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResource.hxx12
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx94
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx42
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSession.hxx60
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/DAVTypes.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/DateTimeHelper.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/DateTimeHelper.hxx8
-rw-r--r--ucb/source/ucp/webdav-neon/LinkSequence.cxx14
-rw-r--r--ucb/source/ucp/webdav-neon/LinkSequence.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/LockEntrySequence.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/LockEntrySequence.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/LockSequence.cxx10
-rw-r--r--ucb/source/ucp/webdav-neon/LockSequence.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx16
-rw-r--r--ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/NeonLockStore.cxx4
-rw-r--r--ucb/source/ucp/webdav-neon/NeonLockStore.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx11
-rw-r--r--ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.cxx242
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.hxx82
-rw-r--r--ucb/source/ucp/webdav-neon/NeonUri.cxx54
-rw-r--r--ucb/source/ucp/webdav-neon/NeonUri.hxx42
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx88
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx28
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx274
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.hxx20
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx104
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx30
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.cxx16
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.hxx2
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.cxx100
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.hxx34
-rw-r--r--ucb/source/ucp/webdav/DAVAuthListener.hxx8
-rw-r--r--ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx16
-rw-r--r--ucb/source/ucp/webdav/DAVException.hxx8
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.cxx78
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.hxx28
-rw-r--r--ucb/source/ucp/webdav/DAVRequestEnvironment.hxx6
-rw-r--r--ucb/source/ucp/webdav/DAVResource.hxx12
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx92
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.hxx42
-rw-r--r--ucb/source/ucp/webdav/DAVSession.hxx60
-rw-r--r--ucb/source/ucp/webdav/DAVSessionFactory.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVSessionFactory.hxx4
-rw-r--r--ucb/source/ucp/webdav/DAVTypes.hxx4
-rw-r--r--ucb/source/ucp/webdav/DateTimeHelper.hxx8
-rw-r--r--ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx12
-rw-r--r--ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx10
-rw-r--r--ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx4
-rw-r--r--ucb/source/ucp/webdav/SerfLockStore.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfLockStore.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx30
-rw-r--r--ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx4
-rw-r--r--ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx54
-rw-r--r--ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.cxx44
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.hxx26
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx8
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx8
-rw-r--r--ucb/source/ucp/webdav/SerfSession.cxx142
-rw-r--r--ucb/source/ucp/webdav/SerfSession.hxx76
-rw-r--r--ucb/source/ucp/webdav/SerfUri.cxx52
-rw-r--r--ucb/source/ucp/webdav/SerfUri.hxx40
-rw-r--r--ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx116
-rw-r--r--ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx30
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx286
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.hxx20
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx104
-rw-r--r--ucb/source/ucp/webdav/webdavdatasupplier.cxx30
-rw-r--r--ucb/source/ucp/webdav/webdavdatasupplier.hxx2
-rw-r--r--ucb/source/ucp/webdav/webdavprovider.cxx16
-rw-r--r--ucb/source/ucp/webdav/webdavprovider.hxx2
-rw-r--r--ucb/source/ucp/webdav/webdavresponseparser.cxx138
-rw-r--r--ucb/workben/cachemap/cachemapobject1.cxx2
-rw-r--r--ucb/workben/cachemap/cachemapobject1.hxx4
-rw-r--r--ucb/workben/cachemap/cachemapobject3.cxx2
-rw-r--r--ucb/workben/cachemap/cachemapobject3.hxx4
-rw-r--r--ucb/workben/cachemap/cachemapobjectcontainer2.cxx2
-rw-r--r--ucb/workben/cachemap/cachemapobjectcontainer2.hxx6
-rw-r--r--ucb/workben/cachemap/cachemaptest.cxx22
-rw-r--r--ucb/workben/ucb/srcharg.cxx2
-rw-r--r--ucb/workben/ucb/ucbdemo.cxx218
-rw-r--r--ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx2
-rw-r--r--ucbhelper/inc/ucbhelper/content.hxx42
-rw-r--r--ucbhelper/inc/ucbhelper/contenthelper.hxx26
-rw-r--r--ucbhelper/inc/ucbhelper/contentidentifier.hxx6
-rw-r--r--ucbhelper/inc/ucbhelper/contentinfo.hxx12
-rw-r--r--ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx12
-rw-r--r--ucbhelper/inc/ucbhelper/interactionrequest.hxx30
-rw-r--r--ucbhelper/inc/ucbhelper/macros.hxx40
-rw-r--r--ucbhelper/inc/ucbhelper/propertyvalueset.hxx32
-rw-r--r--ucbhelper/inc/ucbhelper/providerhelper.hxx20
-rw-r--r--ucbhelper/inc/ucbhelper/proxydecider.hxx10
-rw-r--r--ucbhelper/inc/ucbhelper/registerucb.hxx22
-rw-r--r--ucbhelper/inc/ucbhelper/resultset.hxx18
-rw-r--r--ucbhelper/inc/ucbhelper/resultsetmetadata.hxx26
-rw-r--r--ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx26
-rw-r--r--ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx2
-rw-r--r--ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx2
-rw-r--r--ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx8
-rw-r--r--ucbhelper/source/client/content.cxx114
-rw-r--r--ucbhelper/source/client/fileidentifierconverter.cxx18
-rw-r--r--ucbhelper/source/client/proxydecider.cxx84
-rw-r--r--ucbhelper/source/provider/cancelcommandexecution.cxx6
-rw-r--r--ucbhelper/source/provider/contenthelper.cxx48
-rw-r--r--ucbhelper/source/provider/contentidentifier.cxx1
-rw-r--r--ucbhelper/source/provider/contentinfo.cxx12
-rw-r--r--ucbhelper/source/provider/interactionrequest.cxx10
-rw-r--r--ucbhelper/source/provider/propertyvalueset.cxx15
-rw-r--r--ucbhelper/source/provider/providerhelper.cxx76
-rw-r--r--ucbhelper/source/provider/registerucb.cxx10
-rw-r--r--ucbhelper/source/provider/resultset.cxx66
-rw-r--r--ucbhelper/source/provider/resultsethelper.cxx4
-rw-r--r--ucbhelper/source/provider/resultsetmetadata.cxx3
-rw-r--r--ucbhelper/source/provider/simpleauthenticationrequest.cxx24
-rw-r--r--ucbhelper/source/provider/simplecertificatevalidationrequest.cxx2
-rw-r--r--ucbhelper/source/provider/simpleioerrorrequest.cxx2
-rw-r--r--ucbhelper/source/provider/simplenameclashresolverequest.cxx6
-rw-r--r--unodevtools/inc/unodevtools/options.hxx6
-rw-r--r--unodevtools/source/skeletonmaker/cppcompskeleton.cxx134
-rw-r--r--unodevtools/source/skeletonmaker/cpptypemaker.cxx8
-rw-r--r--unodevtools/source/skeletonmaker/skeletoncommon.cxx6
-rw-r--r--unodevtools/source/skeletonmaker/skeletoncommon.hxx50
-rw-r--r--unodevtools/source/skeletonmaker/skeletoncpp.hxx34
-rw-r--r--unodevtools/source/skeletonmaker/skeletonjava.hxx28
-rw-r--r--unodevtools/source/unodevtools/typeblob.cxx6
-rw-r--r--unoidl/inc/unoidl/legacyprovider.hxx4
-rw-r--r--unoidl/inc/unoidl/unoidl.hxx180
-rw-r--r--unoidl/inc/unoidl/unoidlprovider.hxx6
-rw-r--r--unoidl/source/legacyprovider.cxx2
-rw-r--r--unoidl/source/unoidl.cxx2
-rw-r--r--unotest/inc/unotest/bootstrapfixturebase.hxx24
-rw-r--r--unotest/inc/unotest/filters-test.hxx18
-rw-r--r--unotest/inc/unotest/gettestargument.hxx2
-rw-r--r--unotest/inc/unotest/macros_test.hxx4
-rw-r--r--unotest/inc/unotest/toabsolutefileurl.hxx4
-rw-r--r--unotest/inc/unotest/uniquepipename.hxx2
-rw-r--r--unotest/source/cpp/bootstrapfixturebase.cxx32
-rw-r--r--unotest/source/cpp/filters-test.cxx22
-rw-r--r--unotest/source/cpp/getargument.cxx4
-rw-r--r--unotest/source/cpp/getargument.hxx2
-rw-r--r--unotest/source/cpp/gettestargument.cxx4
-rw-r--r--unotest/source/cpp/macros_test.cxx6
-rw-r--r--unotest/source/cpp/officeconnection.cxx40
-rw-r--r--unotest/source/cpp/toabsolutefileurl.cxx20
-rw-r--r--unotest/source/cpp/uniquepipename.cxx2
-rw-r--r--unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx6
-rw-r--r--unotools/inc/unotools/bootstrap.hxx25
-rw-r--r--unotools/inc/unotools/componentresmodule.hxx4
-rw-r--r--unotools/inc/unotools/configmgr.hxx22
-rw-r--r--unotools/inc/unotools/confignode.hxx48
-rw-r--r--unotools/inc/unotools/configpaths.hxx30
-rw-r--r--unotools/inc/unotools/configvaluecontainer.hxx2
-rw-r--r--unotools/inc/unotools/docinfohelper.hxx2
-rw-r--r--unotools/inc/unotools/eventcfg.hxx26
-rw-r--r--unotools/inc/unotools/fltrcfg.hxx4
-rw-r--r--unotools/inc/unotools/fontcfg.hxx20
-rw-r--r--unotools/inc/unotools/historyoptions.hxx8
-rw-r--r--unotools/inc/unotools/lingucfg.hxx46
-rw-r--r--unotools/inc/unotools/localedatawrapper.hxx98
-rw-r--r--unotools/inc/unotools/localfilehelper.hxx12
-rw-r--r--unotools/inc/unotools/moduleoptions.hxx26
-rw-r--r--unotools/inc/unotools/nativenumberwrapper.hxx4
-rw-r--r--unotools/inc/unotools/optionsdlg.hxx12
-rw-r--r--unotools/inc/unotools/securityoptions.hxx16
-rw-r--r--unotools/inc/unotools/syslocaleoptions.hxx18
-rw-r--r--unotools/inc/unotools/textsearch.hxx4
-rw-r--r--unotools/inc/unotools/ucbhelper.hxx22
-rw-r--r--unotools/inc/unotools/useroptions.hxx40
-rw-r--r--unotools/inc/unotools/viewoptions.hxx12
-rw-r--r--unotools/inc/unotools/xmlaccelcfg.hxx14
-rw-r--r--unotools/source/config/bootstrap.cxx7
-rw-r--r--unotools/source/config/cmdoptions.cxx4
-rw-r--r--unotools/source/config/compatibility.cxx14
-rw-r--r--unotools/source/config/configitem.cxx12
-rw-r--r--unotools/source/config/configmgr.cxx2
-rw-r--r--unotools/source/config/confignode.cxx76
-rw-r--r--unotools/source/config/configpaths.cxx4
-rw-r--r--unotools/source/config/configvaluecontainer.cxx22
-rw-r--r--unotools/source/config/defaultoptions.cxx9
-rw-r--r--unotools/source/config/docinfohelper.cxx14
-rw-r--r--unotools/source/config/eventcfg.cxx14
-rw-r--r--unotools/source/config/extendedsecurityoptions.cxx4
-rw-r--r--unotools/source/config/fltrcfg.cxx4
-rw-r--r--unotools/source/config/fontcfg.cxx15
-rw-r--r--unotools/source/config/historyoptions.cxx110
-rw-r--r--unotools/source/config/itemholder1.cxx12
-rw-r--r--unotools/source/config/lingucfg.cxx73
-rw-r--r--unotools/source/config/misccfg.cxx7
-rw-r--r--unotools/source/config/moduleoptions.cxx220
-rw-r--r--unotools/source/config/optionsdlg.cxx13
-rw-r--r--unotools/source/config/pathoptions.cxx39
-rw-r--r--unotools/source/config/printwarningoptions.cxx4
-rw-r--r--unotools/source/config/saveopt.cxx37
-rw-r--r--unotools/source/config/searchopt.cxx5
-rw-r--r--unotools/source/config/securityoptions.cxx2
-rw-r--r--unotools/source/config/syslocaleoptions.cxx11
-rw-r--r--unotools/source/config/useroptions.cxx1
-rw-r--r--unotools/source/config/viewoptions.cxx112
-rw-r--r--unotools/source/config/xmlaccelcfg.cxx17
-rw-r--r--unotools/source/i18n/calendarwrapper.cxx10
-rw-r--r--unotools/source/i18n/charclass.cxx6
-rw-r--r--unotools/source/i18n/collatorwrapper.cxx8
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx104
-rw-r--r--unotools/source/i18n/nativenumberwrapper.cxx6
-rw-r--r--unotools/source/i18n/textsearch.cxx6
-rw-r--r--unotools/source/i18n/transliterationwrapper.cxx6
-rw-r--r--unotools/source/misc/atom.cxx16
-rw-r--r--unotools/source/misc/componentresmodule.cxx10
-rw-r--r--unotools/source/misc/fontcvt.cxx2
-rw-r--r--unotools/source/misc/fontdefs.cxx2
-rw-r--r--unotools/source/streaming/streamhelper.cxx14
-rw-r--r--unotools/source/streaming/streamwrap.cxx16
-rw-r--r--unotools/source/ucbhelper/XTempFile.hxx14
-rw-r--r--unotools/source/ucbhelper/localfilehelper.cxx34
-rw-r--r--unotools/source/ucbhelper/progresshandlerwrap.cxx6
-rw-r--r--unotools/source/ucbhelper/tempfile.cxx46
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx66
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx32
-rw-r--r--unotools/source/ucbhelper/ucbstreamhelper.cxx4
-rw-r--r--unotools/source/ucbhelper/xtempfile.cxx52
-rw-r--r--unoxml/source/dom/attr.cxx14
-rw-r--r--unoxml/source/dom/attr.hxx3
-rw-r--r--unoxml/source/dom/attributesmap.hxx1
-rw-r--r--unoxml/source/dom/cdatasection.hxx1
-rw-r--r--unoxml/source/dom/characterdata.cxx8
-rw-r--r--unoxml/source/dom/characterdata.hxx1
-rw-r--r--unoxml/source/dom/childlist.hxx1
-rw-r--r--unoxml/source/dom/comment.hxx1
-rw-r--r--unoxml/source/dom/document.cxx4
-rw-r--r--unoxml/source/dom/document.hxx3
-rw-r--r--unoxml/source/dom/documentbuilder.cxx2
-rw-r--r--unoxml/source/dom/documentbuilder.hxx1
-rw-r--r--unoxml/source/dom/documentfragment.hxx1
-rw-r--r--unoxml/source/dom/documenttype.hxx1
-rw-r--r--unoxml/source/dom/domimplementation.hxx1
-rw-r--r--unoxml/source/dom/element.cxx10
-rw-r--r--unoxml/source/dom/element.hxx1
-rw-r--r--unoxml/source/dom/elementlist.cxx6
-rw-r--r--unoxml/source/dom/elementlist.hxx1
-rw-r--r--unoxml/source/dom/entitiesmap.hxx1
-rw-r--r--unoxml/source/dom/entity.hxx1
-rw-r--r--unoxml/source/dom/entityreference.hxx1
-rw-r--r--unoxml/source/dom/node.cxx2
-rw-r--r--unoxml/source/dom/node.hxx4
-rw-r--r--unoxml/source/dom/notation.hxx1
-rw-r--r--unoxml/source/dom/notationsmap.hxx1
-rw-r--r--unoxml/source/dom/processinginstruction.cxx12
-rw-r--r--unoxml/source/dom/processinginstruction.hxx1
-rw-r--r--unoxml/source/dom/saxbuilder.hxx1
-rw-r--r--unoxml/source/dom/text.hxx1
-rw-r--r--unoxml/source/events/eventdispatcher.hxx8
-rw-r--r--unoxml/source/events/mouseevent.hxx3
-rw-r--r--unoxml/source/events/mutationevent.hxx3
-rw-r--r--unoxml/source/events/testlistener.hxx1
-rw-r--r--unoxml/source/events/uievent.hxx1
-rw-r--r--unoxml/source/rdf/CBlankNode.cxx32
-rw-r--r--unoxml/source/rdf/CLiteral.cxx54
-rw-r--r--unoxml/source/rdf/CNodes.hxx12
-rw-r--r--unoxml/source/rdf/CURI.cxx58
-rw-r--r--unoxml/source/rdf/librdf_repository.cxx190
-rw-r--r--unoxml/source/rdf/librdf_repository.hxx4
-rw-r--r--unoxml/source/service/services.cxx1
-rw-r--r--unoxml/source/xpath/nodelist.hxx2
-rw-r--r--unoxml/source/xpath/xpathapi.cxx6
-rw-r--r--unoxml/source/xpath/xpathapi.hxx2
-rw-r--r--unoxml/source/xpath/xpathobject.hxx2
-rw-r--r--unoxml/test/domtest.cxx24
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/iahndl-authentication.cxx34
-rw-r--r--uui/source/iahndl-errorhandler.cxx12
-rw-r--r--uui/source/iahndl-filter.cxx34
-rw-r--r--uui/source/iahndl-ioexceptions.cxx26
-rw-r--r--uui/source/iahndl-locking.cxx8
-rw-r--r--uui/source/iahndl-ssl.cxx36
-rw-r--r--uui/source/iahndl.cxx132
-rw-r--r--uui/source/iahndl.hxx40
-rw-r--r--uui/source/interactionhandler.cxx12
-rw-r--r--uui/source/interactionhandler.hxx8
-rw-r--r--uui/source/logindlg.cxx4
-rw-r--r--uui/source/logindlg.hxx2
-rw-r--r--uui/source/nameclashdlg.cxx10
-rw-r--r--uui/source/nameclashdlg.hxx12
-rw-r--r--uui/source/newerverwarn.cxx6
-rw-r--r--uui/source/newerverwarn.hxx4
-rw-r--r--uui/source/passwordcontainer.cxx22
-rw-r--r--uui/source/passwordcontainer.hxx18
-rw-r--r--uui/source/passworddlg.cxx6
-rw-r--r--uui/source/passworddlg.hxx2
-rw-r--r--uui/source/requeststringresolver.cxx12
-rw-r--r--uui/source/requeststringresolver.hxx10
-rw-r--r--uui/source/secmacrowarnings.cxx6
-rw-r--r--uui/source/secmacrowarnings.hxx4
-rw-r--r--uui/source/services.cxx1
-rw-r--r--uui/source/sslwarndlg.hxx2
-rw-r--r--uui/source/unknownauthdlg.hxx2
-rw-r--r--vbahelper/inc/vbahelper/vbaaccesshelper.hxx2
-rw-r--r--vbahelper/inc/vbahelper/vbaapplicationbase.hxx12
-rw-r--r--vbahelper/inc/vbahelper/vbacollectionimpl.hxx32
-rw-r--r--vbahelper/inc/vbahelper/vbadialogbase.hxx2
-rw-r--r--vbahelper/inc/vbahelper/vbadocumentbase.hxx10
-rw-r--r--vbahelper/inc/vbahelper/vbadocumentsbase.hxx2
-rw-r--r--vbahelper/inc/vbahelper/vbaeventshelperbase.hxx16
-rw-r--r--vbahelper/inc/vbahelper/vbaglobalbase.hxx14
-rw-r--r--vbahelper/inc/vbahelper/vbahelper.hxx30
-rw-r--r--vbahelper/inc/vbahelper/vbapropvalue.hxx2
-rw-r--r--vbahelper/inc/vbahelper/vbashape.hxx8
-rw-r--r--vbahelper/inc/vbahelper/vbashaperange.hxx8
-rw-r--r--vbahelper/inc/vbahelper/vbashapes.hxx10
-rw-r--r--vbahelper/inc/vbahelper/vbatextframe.hxx8
-rw-r--r--vbahelper/inc/vbahelper/vbawindowbase.hxx4
-rw-r--r--vbahelper/source/msforms/vbacombobox.cxx6
-rw-r--r--vbahelper/source/msforms/vbacombobox.hxx4
-rw-r--r--vbahelper/source/msforms/vbacontrols.cxx2
-rw-r--r--vbahelper/source/msforms/vbatextbox.hxx10
-rw-r--r--vbahelper/source/vbahelper/vbacolorformat.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbadocumentsbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbashapes.cxx2
-rw-r--r--vcl/android/androidinst.cxx36
-rw-r--r--vcl/aqua/source/app/salinst.cxx24
-rw-r--r--vcl/aqua/source/app/salsys.cxx21
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.cxx5
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.hxx4
-rw-r--r--vcl/aqua/source/dtrans/DragSource.cxx1
-rw-r--r--vcl/aqua/source/dtrans/DragSource.hxx6
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx1
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.hxx6
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.cxx1
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.cxx1
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.hxx8
-rw-r--r--vcl/aqua/source/gdi/atsui/salatslayout.cxx2
-rw-r--r--vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx2
-rw-r--r--vcl/aqua/source/gdi/atsui/salgdi.cxx22
-rw-r--r--vcl/aqua/source/gdi/salgdicommon.cxx6
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx4
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx32
-rw-r--r--vcl/aqua/source/window/salframe.cxx102
-rw-r--r--vcl/aqua/source/window/salmenu.cxx12
-rw-r--r--vcl/coretext/salcoretextfontutils.cxx2
-rw-r--r--vcl/coretext/salgdi.cxx4
-rw-r--r--vcl/generic/app/gendisp.cxx1
-rw-r--r--vcl/generic/fontmanager/fontcache.cxx19
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx31
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx68
-rw-r--r--vcl/generic/fontmanager/fontsubst.cxx14
-rw-r--r--vcl/generic/fontmanager/helper.cxx9
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx10
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.hxx14
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx4
-rw-r--r--vcl/generic/glyphs/graphite_serverfont.cxx14
-rw-r--r--vcl/generic/print/common_gfx.cxx8
-rw-r--r--vcl/generic/print/genprnpsp.cxx59
-rw-r--r--vcl/generic/print/genpspgraphics.cxx28
-rw-r--r--vcl/generic/print/glyphset.cxx4
-rw-r--r--vcl/generic/print/glyphset.hxx20
-rw-r--r--vcl/generic/print/printerjob.cxx74
-rw-r--r--vcl/generic/print/psputil.cxx6
-rw-r--r--vcl/generic/print/psputil.hxx4
-rw-r--r--vcl/generic/print/text_gfx.cxx20
-rw-r--r--vcl/headless/svpelement.cxx8
-rw-r--r--vcl/headless/svpframe.cxx6
-rw-r--r--vcl/headless/svpgdi.cxx2
-rw-r--r--vcl/headless/svptext.cxx2
-rw-r--r--vcl/inc/aqua/atsui/salgdi.h8
-rw-r--r--vcl/inc/aqua/salframe.h8
-rw-r--r--vcl/inc/aqua/salinst.h8
-rw-r--r--vcl/inc/aqua/salmenu.h4
-rw-r--r--vcl/inc/aqua/salprn.h20
-rw-r--r--vcl/inc/aqua/salsys.h6
-rw-r--r--vcl/inc/coretext/salgdi.h10
-rw-r--r--vcl/inc/cupsmgr.hxx24
-rw-r--r--vcl/inc/fontcache.hxx8
-rw-r--r--vcl/inc/generic/gendata.hxx8
-rw-r--r--vcl/inc/generic/geninst.h2
-rw-r--r--vcl/inc/generic/genprn.h20
-rw-r--r--vcl/inc/generic/genpspgraphics.h12
-rw-r--r--vcl/inc/generic/gensys.h12
-rw-r--r--vcl/inc/generic/glyphcache.hxx4
-rw-r--r--vcl/inc/generic/printergfx.hxx6
-rw-r--r--vcl/inc/generic/printerjob.hxx18
-rw-r--r--vcl/inc/graphite_features.hxx12
-rw-r--r--vcl/inc/headless/svpdummies.hxx8
-rw-r--r--vcl/inc/headless/svpframe.hxx6
-rw-r--r--vcl/inc/headless/svpgdi.hxx4
-rw-r--r--vcl/inc/headless/svpinst.hxx4
-rw-r--r--vcl/inc/ilstbox.hxx4
-rw-r--r--vcl/inc/image.h12
-rw-r--r--vcl/inc/impimagetree.hxx24
-rw-r--r--vcl/inc/jobset.h6
-rw-r--r--vcl/inc/outdev.h4
-rw-r--r--vcl/inc/outfont.hxx10
-rw-r--r--vcl/inc/print.h6
-rw-r--r--vcl/inc/printdlg.hxx26
-rw-r--r--vcl/inc/quartz/utils.h8
-rw-r--r--vcl/inc/salframe.hxx3
-rw-r--r--vcl/inc/salgdi.hxx16
-rw-r--r--vcl/inc/salinst.hxx2
-rw-r--r--vcl/inc/salmenu.hxx10
-rw-r--r--vcl/inc/salprn.hxx24
-rw-r--r--vcl/inc/svdata.hxx2
-rw-r--r--vcl/inc/toolbox.h2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx10
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx8
-rw-r--r--vcl/inc/unx/saldisp.hxx8
-rw-r--r--vcl/inc/unx/salframe.h10
-rw-r--r--vcl/inc/unx/salgdi.h4
-rw-r--r--vcl/inc/unx/salinst.h4
-rw-r--r--vcl/inc/unx/salmenu.h4
-rw-r--r--vcl/inc/unx/sm.hxx13
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx8
-rw-r--r--vcl/inc/vcl/button.hxx6
-rw-r--r--vcl/inc/vcl/combobox.hxx2
-rw-r--r--vcl/inc/vcl/configsettings.hxx10
-rw-r--r--vcl/inc/vcl/dialog.hxx10
-rw-r--r--vcl/inc/vcl/edit.hxx8
-rw-r--r--vcl/inc/vcl/field.hxx4
-rw-r--r--vcl/inc/vcl/fixed.hxx4
-rw-r--r--vcl/inc/vcl/font.hxx2
-rw-r--r--vcl/inc/vcl/fontmanager.hxx74
-rw-r--r--vcl/inc/vcl/gdimtf.hxx4
-rw-r--r--vcl/inc/vcl/gfxlink.hxx2
-rw-r--r--vcl/inc/vcl/graphicfilter.hxx4
-rw-r--r--vcl/inc/vcl/helper.hxx14
-rw-r--r--vcl/inc/vcl/i18nhelp.hxx4
-rw-r--r--vcl/inc/vcl/image.hxx26
-rw-r--r--vcl/inc/vcl/imagerepository.hxx2
-rw-r--r--vcl/inc/vcl/jobdata.hxx2
-rw-r--r--vcl/inc/vcl/jobset.hxx6
-rw-r--r--vcl/inc/vcl/longcurr.hxx2
-rw-r--r--vcl/inc/vcl/lstbox.hxx2
-rw-r--r--vcl/inc/vcl/menu.hxx4
-rw-r--r--vcl/inc/vcl/metaact.hxx30
-rw-r--r--vcl/inc/vcl/outdev.hxx4
-rw-r--r--vcl/inc/vcl/pdfextoutdevdata.hxx8
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx46
-rw-r--r--vcl/inc/vcl/ppdparser.hxx24
-rw-r--r--vcl/inc/vcl/print.hxx168
-rw-r--r--vcl/inc/vcl/printerinfomanager.hxx58
-rw-r--r--vcl/inc/vcl/settings.hxx12
-rw-r--r--vcl/inc/vcl/spinfld.hxx2
-rw-r--r--vcl/inc/vcl/status.hxx8
-rw-r--r--vcl/inc/vcl/strhelper.hxx10
-rw-r--r--vcl/inc/vcl/svapp.hxx10
-rw-r--r--vcl/inc/vcl/svgdata.hxx8
-rw-r--r--vcl/inc/vcl/syswin.hxx8
-rw-r--r--vcl/inc/vcl/tabctrl.hxx4
-rw-r--r--vcl/inc/vcl/tabdlg.hxx2
-rw-r--r--vcl/inc/vcl/textview.hxx4
-rw-r--r--vcl/inc/vcl/throbber.hxx2
-rw-r--r--vcl/inc/vcl/toolbox.hxx10
-rw-r--r--vcl/inc/vcl/unohelp.hxx2
-rw-r--r--vcl/inc/vcl/vclmedit.hxx2
-rw-r--r--vcl/inc/vcl/window.hxx16
-rw-r--r--vcl/inc/win/saldata.hxx2
-rw-r--r--vcl/inc/win/salframe.h10
-rw-r--r--vcl/inc/win/salgdi.h8
-rw-r--r--vcl/inc/win/salinst.h4
-rw-r--r--vcl/inc/win/salmenu.h4
-rw-r--r--vcl/inc/win/salprn.h14
-rw-r--r--vcl/inc/win/salsys.h16
-rw-r--r--vcl/inc/window.h4
-rw-r--r--vcl/ios/iosinst.cxx14
-rw-r--r--vcl/null/printerinfomanager.cxx6
-rw-r--r--vcl/qa/cppunit/graphicfilter/filters-test.cxx36
-rw-r--r--vcl/quartz/utils.cxx22
-rw-r--r--vcl/source/app/dbggui.cxx58
-rw-r--r--vcl/source/app/i18nhelp.cxx8
-rw-r--r--vcl/source/app/salvtables.cxx6
-rw-r--r--vcl/source/app/session.cxx3
-rw-r--r--vcl/source/app/settings.cxx68
-rw-r--r--vcl/source/app/svapp.cxx24
-rw-r--r--vcl/source/app/svdata.cxx31
-rw-r--r--vcl/source/app/svmain.cxx13
-rw-r--r--vcl/source/app/unohelp.cxx4
-rw-r--r--vcl/source/app/unohelp2.cxx2
-rw-r--r--vcl/source/components/dtranscomp.cxx29
-rw-r--r--vcl/source/components/factory.cxx2
-rw-r--r--vcl/source/components/fontident.cxx1
-rw-r--r--vcl/source/control/button.cxx26
-rw-r--r--vcl/source/control/combobox.cxx12
-rw-r--r--vcl/source/control/edit.cxx26
-rw-r--r--vcl/source/control/field.cxx26
-rw-r--r--vcl/source/control/field2.cxx12
-rw-r--r--vcl/source/control/fixed.cxx6
-rw-r--r--vcl/source/control/ilstbox.cxx8
-rw-r--r--vcl/source/control/longcurr.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx16
-rw-r--r--vcl/source/control/quickselectionengine.cxx2
-rw-r--r--vcl/source/control/scrbar.cxx25
-rw-r--r--vcl/source/control/slider.cxx6
-rw-r--r--vcl/source/control/spinfld.cxx20
-rw-r--r--vcl/source/control/tabctrl.cxx16
-rw-r--r--vcl/source/control/throbber.cxx10
-rw-r--r--vcl/source/edit/texteng.cxx20
-rw-r--r--vcl/source/edit/textund2.hxx12
-rw-r--r--vcl/source/edit/textundo.cxx24
-rw-r--r--vcl/source/edit/textundo.hxx2
-rw-r--r--vcl/source/edit/textview.cxx16
-rw-r--r--vcl/source/edit/vclmedit.cxx14
-rw-r--r--vcl/source/edit/xtextedt.cxx2
-rw-r--r--vcl/source/filter/FilterConfigCache.cxx10
-rw-r--r--vcl/source/filter/FilterConfigItem.cxx7
-rw-r--r--vcl/source/filter/graphicfilter.cxx68
-rw-r--r--vcl/source/filter/graphicfilter2.cxx2
-rw-r--r--vcl/source/filter/igif/gifread.cxx6
-rw-r--r--vcl/source/filter/ixbm/xbmread.cxx14
-rw-r--r--vcl/source/filter/ixbm/xbmread.hxx4
-rw-r--r--vcl/source/filter/sgvmain.cxx2
-rw-r--r--vcl/source/filter/sgvmain.hxx2
-rw-r--r--vcl/source/filter/sgvtext.cxx34
-rw-r--r--vcl/source/filter/wmf/emfwr.cxx4
-rw-r--r--vcl/source/filter/wmf/enhwmf.cxx8
-rw-r--r--vcl/source/filter/wmf/winmtf.cxx6
-rw-r--r--vcl/source/filter/wmf/winwmf.cxx2
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx22
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx4
-rw-r--r--vcl/source/gdi/animate.cxx2
-rw-r--r--vcl/source/gdi/base14.cxx2
-rw-r--r--vcl/source/gdi/bitmapex.cxx6
-rw-r--r--vcl/source/gdi/bmpconv.cxx1
-rw-r--r--vcl/source/gdi/configsettings.cxx5
-rw-r--r--vcl/source/gdi/cvtsvm.cxx20
-rw-r--r--vcl/source/gdi/font.cxx10
-rw-r--r--vcl/source/gdi/gdimtf.cxx18
-rw-r--r--vcl/source/gdi/image.cxx40
-rw-r--r--vcl/source/gdi/imagerepository.cxx6
-rw-r--r--vcl/source/gdi/impgraph.cxx12
-rw-r--r--vcl/source/gdi/impimage.cxx4
-rw-r--r--vcl/source/gdi/impimagetree.cxx60
-rw-r--r--vcl/source/gdi/jobset.cxx16
-rw-r--r--vcl/source/gdi/metaact.cxx10
-rw-r--r--vcl/source/gdi/outdev3.cxx36
-rw-r--r--vcl/source/gdi/outdev6.cxx2
-rw-r--r--vcl/source/gdi/outdevnative.cxx4
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx10
-rw-r--r--vcl/source/gdi/pdfwriter.cxx14
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx127
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx130
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx12
-rw-r--r--vcl/source/gdi/print.cxx46
-rw-r--r--vcl/source/gdi/print3.cxx278
-rw-r--r--vcl/source/gdi/salgdilayout.cxx2
-rw-r--r--vcl/source/gdi/salnativewidgets-none.cxx1
-rw-r--r--vcl/source/gdi/svgdata.cxx6
-rw-r--r--vcl/source/gdi/textlayout.cxx4
-rw-r--r--vcl/source/glyphs/graphite_features.cxx14
-rw-r--r--vcl/source/helper/canvasbitmap.cxx4
-rw-r--r--vcl/source/helper/strhelper.cxx14
-rw-r--r--vcl/source/helper/xconnection.cxx1
-rw-r--r--vcl/source/uipreviewer/previewer.cxx10
-rw-r--r--vcl/source/window/abstdlg.cxx2
-rw-r--r--vcl/source/window/brdwin.cxx6
-rw-r--r--vcl/source/window/decoview.cxx6
-rw-r--r--vcl/source/window/dialog.cxx28
-rw-r--r--vcl/source/window/dlgctrl.cxx4
-rw-r--r--vcl/source/window/dockingarea.cxx4
-rw-r--r--vcl/source/window/layout.cxx16
-rw-r--r--vcl/source/window/menu.cxx28
-rw-r--r--vcl/source/window/mnemonic.cxx2
-rw-r--r--vcl/source/window/msgbox.cxx6
-rw-r--r--vcl/source/window/printdlg.cxx176
-rw-r--r--vcl/source/window/status.cxx24
-rw-r--r--vcl/source/window/syschild.cxx4
-rw-r--r--vcl/source/window/syswin.cxx20
-rw-r--r--vcl/source/window/tabdlg.cxx2
-rw-r--r--vcl/source/window/tabpage.cxx4
-rw-r--r--vcl/source/window/toolbox.cxx16
-rw-r--r--vcl/source/window/toolbox2.cxx13
-rw-r--r--vcl/source/window/window.cxx69
-rw-r--r--vcl/test/canvasbitmaptest.cxx6
-rw-r--r--vcl/test/dndtest.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx6
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx2
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx8
-rw-r--r--vcl/unx/generic/app/saldata.cxx14
-rw-r--r--vcl/unx/generic/app/saldisp.cxx19
-rw-r--r--vcl/unx/generic/app/sm.cxx24
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx26
-rw-r--r--vcl/unx/generic/desktopdetect/desktopdetector.cxx6
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx1
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx12
-rw-r--r--vcl/unx/generic/dtrans/X11_droptarget.cxx1
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx5
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx40
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx3
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.cxx1
-rw-r--r--vcl/unx/generic/dtrans/config.cxx3
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx11
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx12
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx14
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx14
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx247
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx144
-rw-r--r--vcl/unx/generic/window/salframe.cxx26
-rw-r--r--vcl/unx/gtk/a11y/atkaction.cxx18
-rw-r--r--vcl/unx/gtk/a11y/atkeditabletext.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkhypertext.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkimage.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atklistener.cxx8
-rw-r--r--vcl/unx/gtk/a11y/atktable.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx12
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx16
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx10
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.hxx8
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx3
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx12
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx20
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx106
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx38
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx12
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx10
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx22
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.hxx12
-rw-r--r--vcl/unx/gtk/fpicker/resourceprovider.cxx4
-rw-r--r--vcl/unx/gtk/gdi/gtkprintwrapper.cxx4
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx1
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx148
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx24
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx18
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx6
-rw-r--r--vcl/unx/kde/UnxCommandThread.cxx42
-rw-r--r--vcl/unx/kde/UnxCommandThread.hxx16
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx168
-rw-r--r--vcl/unx/kde/UnxFilePicker.hxx40
-rw-r--r--vcl/unx/kde/UnxNotifyThread.hxx2
-rw-r--r--vcl/unx/kde/kdedata.cxx10
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx62
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.hxx30
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx4
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx8
-rw-r--r--vcl/unx/kde4/main.cxx2
-rw-r--r--vcl/unx/x11/x11sys.cxx16
-rw-r--r--vcl/win/source/app/salinfo.cxx28
-rw-r--r--vcl/win/source/app/salinst.cxx10
-rw-r--r--vcl/win/source/gdi/salgdi.cxx1
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx56
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx1
-rw-r--r--vcl/win/source/gdi/salprn.cxx27
-rw-r--r--vcl/win/source/gdi/winlayout.cxx9
-rw-r--r--vcl/win/source/window/keynames.cxx6
-rw-r--r--vcl/win/source/window/salframe.cxx23
-rw-r--r--vcl/win/source/window/salmenu.cxx4
-rw-r--r--vcl/workben/outdevgrind.cxx4
-rw-r--r--vcl/workben/svdem.cxx2
-rw-r--r--vcl/workben/svpclient.cxx30
-rw-r--r--vcl/workben/svptest.cxx6
-rw-r--r--vcl/workben/vcldemo.cxx4
-rw-r--r--writerfilter/qa/cppunittests/doctok/testdoctok.cxx8
-rw-r--r--writerfilter/qa/cppunittests/rtftok/testrtftok.cxx8
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx4
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx4
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx15
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx30
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfsprm.cxx1
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.cxx5
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfvalue.cxx4
-rw-r--r--writerfilter/source/rtftok/rtfvalue.hxx10
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx30
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.hxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx398
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.hxx216
-rw-r--r--xmlhelp/source/cxxhelp/provider/db.cxx8
-rw-r--r--xmlhelp/source/cxxhelp/provider/db.hxx14
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx72
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx42
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx48
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx8
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx138
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.hxx110
-rw-r--r--xmlhelp/source/cxxhelp/test/searchdemo.cxx2
-rw-r--r--xmlhelp/source/treeview/tvfactory.cxx34
-rw-r--r--xmlhelp/source/treeview/tvread.cxx196
-rw-r--r--xmlhelp/source/treeview/tvread.hxx64
-rw-r--r--xmloff/inc/AttributeContainerHandler.hxx4
-rw-r--r--xmloff/inc/DomBuilderContext.hxx8
-rw-r--r--xmloff/inc/EnhancedCustomShapeToken.hxx4
-rw-r--r--xmloff/inc/MetaExportComponent.hxx4
-rw-r--r--xmloff/inc/MetaImportComponent.hxx6
-rw-r--r--xmloff/inc/MultiPropertySetHelper.hxx4
-rw-r--r--xmloff/inc/PageMasterImportContext.hxx10
-rw-r--r--xmloff/inc/RDFaExportHelper.hxx4
-rw-r--r--xmloff/inc/RDFaImportHelper.hxx20
-rw-r--r--xmloff/inc/SchXMLExport.hxx2
-rw-r--r--xmloff/inc/SchXMLImport.hxx6
-rw-r--r--xmloff/inc/StyleMap.hxx6
-rw-r--r--xmloff/inc/TransGradientStyle.hxx6
-rw-r--r--xmloff/inc/XMLBackgroundImageContext.hxx8
-rw-r--r--xmloff/inc/XMLBackgroundImageExport.hxx2
-rw-r--r--xmloff/inc/XMLBasicExportFilter.hxx10
-rw-r--r--xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx4
-rw-r--r--xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx8
-rw-r--r--xmloff/inc/XMLChartPropertySetMapper.hxx6
-rw-r--r--xmloff/inc/XMLChartStyleContext.hxx12
-rw-r--r--xmloff/inc/XMLClipPropertyHandler.hxx4
-rw-r--r--xmloff/inc/XMLElementPropertyContext.hxx2
-rw-r--r--xmloff/inc/XMLEmbeddedObjectImportContext.hxx14
-rw-r--r--xmloff/inc/XMLEventImportHelper.hxx12
-rw-r--r--xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx4
-rw-r--r--xmloff/inc/XMLFootnoteConfigurationImportContext.hxx54
-rw-r--r--xmloff/inc/XMLImageMapContext.hxx6
-rw-r--r--xmloff/inc/XMLImageMapExport.hxx22
-rw-r--r--xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx36
-rw-r--r--xmloff/inc/XMLIsPercentagePropertyHandler.hxx4
-rw-r--r--xmloff/inc/XMLLineNumberingImportContext.hxx44
-rw-r--r--xmloff/inc/XMLNumberStylesImport.hxx6
-rw-r--r--xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx4
-rw-r--r--xmloff/inc/XMLRectangleMembersHandler.hxx4
-rw-r--r--xmloff/inc/XMLReplacementImageContext.hxx8
-rw-r--r--xmloff/inc/XMLScriptContextFactory.hxx12
-rw-r--r--xmloff/inc/XMLScriptExportHandler.hxx4
-rw-r--r--xmloff/inc/XMLShapePropertySetContext.hxx4
-rw-r--r--xmloff/inc/XMLStarBasicContextFactory.hxx14
-rw-r--r--xmloff/inc/XMLStarBasicExportHandler.hxx12
-rw-r--r--xmloff/inc/XMLStringBufferImportContext.hxx10
-rw-r--r--xmloff/inc/XMLTextColumnsContext.hxx20
-rw-r--r--xmloff/inc/XMLTextColumnsExport.hxx16
-rw-r--r--xmloff/inc/XMLTextColumnsPropertyHandler.hxx4
-rw-r--r--xmloff/inc/XMLTextHeaderFooterContext.hxx16
-rw-r--r--xmloff/inc/animationimport.hxx4
-rw-r--r--xmloff/inc/animimp.hxx4
-rw-r--r--xmloff/inc/forms/property_handler.hxx6
-rw-r--r--xmloff/inc/txtflde.hxx202
-rw-r--r--xmloff/inc/txtfldi.hxx20
-rw-r--r--xmloff/inc/txtlists.hxx68
-rw-r--r--xmloff/inc/txtvfldi.hxx144
-rw-r--r--xmloff/inc/xexptran.hxx32
-rw-r--r--xmloff/inc/xmloff/DashStyle.hxx4
-rw-r--r--xmloff/inc/xmloff/DocumentSettingsContext.hxx4
-rw-r--r--xmloff/inc/xmloff/EnumPropertyHdl.hxx4
-rw-r--r--xmloff/inc/xmloff/GradientStyle.hxx6
-rw-r--r--xmloff/inc/xmloff/HatchStyle.hxx6
-rw-r--r--xmloff/inc/xmloff/ImageStyle.hxx8
-rw-r--r--xmloff/inc/xmloff/MarkerStyle.hxx6
-rw-r--r--xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx10
-rw-r--r--xmloff/inc/xmloff/ProgressBarHelper.hxx2
-rw-r--r--xmloff/inc/xmloff/SchXMLExportHelper.hxx2
-rw-r--r--xmloff/inc/xmloff/SchXMLImportHelper.hxx4
-rw-r--r--xmloff/inc/xmloff/SettingsExportHelper.hxx52
-rw-r--r--xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx6
-rw-r--r--xmloff/inc/xmloff/WordWrapPropertyHdl.hxx4
-rw-r--r--xmloff/inc/xmloff/XMLBase64ImportContext.hxx6
-rw-r--r--xmloff/inc/xmloff/XMLCharContext.hxx6
-rw-r--r--xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx4
-rw-r--r--xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx22
-rw-r--r--xmloff/inc/xmloff/XMLEventExport.hxx10
-rw-r--r--xmloff/inc/xmloff/XMLEventsImportContext.hxx14
-rw-r--r--xmloff/inc/xmloff/XMLFontAutoStylePool.hxx16
-rw-r--r--xmloff/inc/xmloff/XMLFontStylesContext.hxx6
-rw-r--r--xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx4
-rw-r--r--xmloff/inc/xmloff/XMLPageExport.hxx12
-rw-r--r--xmloff/inc/xmloff/XMLSettingsExportContext.hxx4
-rw-r--r--xmloff/inc/xmloff/XMLShapeStyleContext.hxx12
-rw-r--r--xmloff/inc/xmloff/XMLStringVector.hxx2
-rw-r--r--xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx12
-rw-r--r--xmloff/inc/xmloff/XMLTextMasterPageContext.hxx16
-rw-r--r--xmloff/inc/xmloff/XMLTextMasterPageExport.hxx22
-rw-r--r--xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx6
-rw-r--r--xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx6
-rw-r--r--xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx10
-rw-r--r--xmloff/inc/xmloff/XMLTextTableContext.hxx2
-rw-r--r--xmloff/inc/xmloff/attrlist.hxx22
-rw-r--r--xmloff/inc/xmloff/controlpropertyhdl.hxx16
-rw-r--r--xmloff/inc/xmloff/formlayerexport.hxx4
-rw-r--r--xmloff/inc/xmloff/formlayerimport.hxx8
-rw-r--r--xmloff/inc/xmloff/i18nmap.hxx14
-rw-r--r--xmloff/inc/xmloff/nmspmap.hxx88
-rw-r--r--xmloff/inc/xmloff/numehelp.hxx46
-rw-r--r--xmloff/inc/xmloff/prstylei.hxx12
-rw-r--r--xmloff/inc/xmloff/shapeexport.hxx58
-rw-r--r--xmloff/inc/xmloff/shapeimport.hxx30
-rw-r--r--xmloff/inc/xmloff/styleexp.hxx36
-rw-r--r--xmloff/inc/xmloff/table/XMLTableExport.hxx6
-rw-r--r--xmloff/inc/xmloff/table/XMLTableImport.hxx10
-rw-r--r--xmloff/inc/xmloff/txtimp.hxx130
-rw-r--r--xmloff/inc/xmloff/txtimppr.hxx2
-rw-r--r--xmloff/inc/xmloff/txtparae.hxx2
-rw-r--r--xmloff/inc/xmloff/txtstyli.hxx38
-rw-r--r--xmloff/inc/xmloff/unoatrcn.hxx20
-rw-r--r--xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx12
-rw-r--r--xmloff/inc/xmloff/xformsexport.hxx8
-rw-r--r--xmloff/inc/xmloff/xformsimport.hxx8
-rw-r--r--xmloff/inc/xmloff/xmlaustp.hxx22
-rw-r--r--xmloff/inc/xmloff/xmlcnimp.hxx36
-rw-r--r--xmloff/inc/xmloff/xmlerror.hxx12
-rw-r--r--xmloff/inc/xmloff/xmlevent.hxx14
-rw-r--r--xmloff/inc/xmloff/xmlexp.hxx82
-rw-r--r--xmloff/inc/xmloff/xmlexppr.hxx4
-rw-r--r--xmloff/inc/xmloff/xmlictxt.hxx10
-rw-r--r--xmloff/inc/xmloff/xmlimppr.hxx4
-rw-r--r--xmloff/inc/xmloff/xmlmetae.hxx14
-rw-r--r--xmloff/inc/xmloff/xmlmetai.hxx6
-rw-r--r--xmloff/inc/xmloff/xmlmultiimagehelper.hxx2
-rw-r--r--xmloff/inc/xmloff/xmlnume.hxx12
-rw-r--r--xmloff/inc/xmloff/xmlnumfe.hxx34
-rw-r--r--xmloff/inc/xmloff/xmlnumfi.hxx36
-rw-r--r--xmloff/inc/xmloff/xmlnumi.hxx16
-rw-r--r--xmloff/inc/xmloff/xmlprcon.hxx6
-rw-r--r--xmloff/inc/xmloff/xmlprhdl.hxx6
-rw-r--r--xmloff/inc/xmloff/xmlprmap.hxx16
-rw-r--r--xmloff/inc/xmloff/xmlscripti.hxx4
-rw-r--r--xmloff/inc/xmloff/xmlstyle.hxx54
-rw-r--r--xmloff/inc/xmloff/xmltkmap.hxx4
-rw-r--r--xmloff/inc/xmloff/xmltoken.hxx8
-rw-r--r--xmloff/inc/xmloff/xmluconv.hxx57
-rw-r--r--xmloff/inc/xmltabi.hxx4
-rw-r--r--xmloff/inc/xmlversion.hxx16
-rw-r--r--xmloff/source/chart/ColorPropertySet.cxx1
-rw-r--r--xmloff/source/chart/ColorPropertySet.hxx22
-rw-r--r--xmloff/source/chart/MultiPropertySetHandler.hxx30
-rw-r--r--xmloff/source/chart/PropertyMaps.cxx16
-rw-r--r--xmloff/source/chart/SchXMLAutoStylePoolP.cxx2
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.hxx16
-rw-r--r--xmloff/source/chart/SchXMLCalculationSettingsContext.cxx12
-rw-r--r--xmloff/source/chart/SchXMLCalculationSettingsContext.hxx4
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx109
-rw-r--r--xmloff/source/chart/SchXMLChartContext.hxx30
-rw-r--r--xmloff/source/chart/SchXMLEnumConverter.cxx1
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx63
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx5
-rw-r--r--xmloff/source/chart/SchXMLLegendContext.cxx11
-rw-r--r--xmloff/source/chart/SchXMLLegendContext.hxx2
-rw-r--r--xmloff/source/chart/SchXMLParagraphContext.cxx5
-rw-r--r--xmloff/source/chart/SchXMLParagraphContext.hxx16
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx171
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.hxx42
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx92
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.hxx24
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx63
-rw-r--r--xmloff/source/chart/SchXMLTableContext.hxx30
-rw-r--r--xmloff/source/chart/SchXMLTextListContext.cxx5
-rw-r--r--xmloff/source/chart/SchXMLTextListContext.hxx10
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx82
-rw-r--r--xmloff/source/chart/SchXMLTools.hxx24
-rw-r--r--xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx4
-rw-r--r--xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx4
-rw-r--r--xmloff/source/chart/XMLChartPropertyContext.cxx4
-rw-r--r--xmloff/source/chart/XMLChartPropertyContext.hxx4
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx10
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx1
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx2
-rw-r--r--xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx6
-rw-r--r--xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx4
-rw-r--r--xmloff/source/chart/XMLLabelSeparatorContext.cxx4
-rw-r--r--xmloff/source/chart/XMLLabelSeparatorContext.hxx6
-rw-r--r--xmloff/source/chart/XMLSymbolImageContext.cxx12
-rw-r--r--xmloff/source/chart/XMLSymbolImageContext.hxx6
-rw-r--r--xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx2
-rw-r--r--xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx4
-rw-r--r--xmloff/source/chart/XMLTextOrientationHdl.cxx4
-rw-r--r--xmloff/source/chart/XMLTextOrientationHdl.hxx4
-rw-r--r--xmloff/source/chart/contexts.cxx20
-rw-r--r--xmloff/source/chart/contexts.hxx12
-rw-r--r--xmloff/source/chart/transporttypes.hxx24
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx134
-rw-r--r--xmloff/source/core/DomBuilderContext.cxx1
-rw-r--r--xmloff/source/core/DomExport.cxx2
-rw-r--r--xmloff/source/core/PropertySetMerger.cxx1
-rw-r--r--xmloff/source/core/RDFaExportHelper.cxx28
-rw-r--r--xmloff/source/core/RDFaImportHelper.cxx108
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx94
-rw-r--r--xmloff/source/core/SvXMLAttr.cxx12
-rw-r--r--xmloff/source/core/SvXMLAttr.hxx18
-rw-r--r--xmloff/source/core/SvXMLAttrCollection.cxx52
-rw-r--r--xmloff/source/core/SvXMLAttrCollection.hxx50
-rw-r--r--xmloff/source/core/XMLBase64Export.cxx2
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx4
-rw-r--r--xmloff/source/core/XMLBasicExportFilter.cxx12
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx1
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx12
-rw-r--r--xmloff/source/core/attrlist.cxx3
-rw-r--r--xmloff/source/core/facreg.cxx1
-rw-r--r--xmloff/source/core/i18nmap.cxx6
-rw-r--r--xmloff/source/core/nmspmap.cxx10
-rw-r--r--xmloff/source/core/unoatrcn.cxx2
-rw-r--r--xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx1
-rw-r--r--xmloff/source/core/xmlcnimp.cxx48
-rw-r--r--xmloff/source/core/xmlerror.cxx4
-rw-r--r--xmloff/source/core/xmlexp.cxx71
-rw-r--r--xmloff/source/core/xmlictxt.cxx2
-rw-r--r--xmloff/source/core/xmlimp.cxx58
-rw-r--r--xmloff/source/core/xmlmultiimagehelper.cxx4
-rw-r--r--xmloff/source/core/xmltkmap.cxx1
-rw-r--r--xmloff/source/core/xmltoken.cxx3
-rw-r--r--xmloff/source/core/xmluconv.cxx10
-rw-r--r--xmloff/source/draw/EnhancedCustomShapeToken.cxx6
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx2
-rw-r--r--xmloff/source/draw/XMLImageMapContext.cxx56
-rw-r--r--xmloff/source/draw/XMLImageMapExport.cxx2
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx17
-rw-r--r--xmloff/source/draw/XMLNumberStylesExport.hxx4
-rw-r--r--xmloff/source/draw/XMLReplacementImageContext.cxx1
-rw-r--r--xmloff/source/draw/XMLShapePropertySetContext.cxx2
-rw-r--r--xmloff/source/draw/XMLShapeStyleContext.cxx4
-rw-r--r--xmloff/source/draw/animationexport.cxx4
-rw-r--r--xmloff/source/draw/animationimport.cxx6
-rw-r--r--xmloff/source/draw/animexp.cxx2
-rw-r--r--xmloff/source/draw/animimp.cxx6
-rw-r--r--xmloff/source/draw/descriptionimp.cxx4
-rw-r--r--xmloff/source/draw/descriptionimp.hxx6
-rw-r--r--xmloff/source/draw/eventimp.cxx6
-rw-r--r--xmloff/source/draw/eventimp.hxx4
-rw-r--r--xmloff/source/draw/layerexp.cxx2
-rw-r--r--xmloff/source/draw/layerimp.cxx16
-rw-r--r--xmloff/source/draw/layerimp.hxx4
-rw-r--r--xmloff/source/draw/numithdl.cxx4
-rw-r--r--xmloff/source/draw/numithdl.hxx4
-rw-r--r--xmloff/source/draw/propimp0.cxx6
-rw-r--r--xmloff/source/draw/propimp0.hxx16
-rw-r--r--xmloff/source/draw/sdpropls.cxx16
-rw-r--r--xmloff/source/draw/sdpropls.hxx12
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx4
-rw-r--r--xmloff/source/draw/sdxmlexp_impl.hxx46
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx20
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx40
-rw-r--r--xmloff/source/draw/shapeexport.cxx14
-rw-r--r--xmloff/source/draw/shapeexport2.cxx34
-rw-r--r--xmloff/source/draw/shapeexport3.cxx2
-rw-r--r--xmloff/source/draw/shapeimport.cxx4
-rw-r--r--xmloff/source/draw/xexptran.cxx44
-rw-r--r--xmloff/source/draw/ximp3dobject.cxx2
-rw-r--r--xmloff/source/draw/ximp3dobject.hxx16
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx8
-rw-r--r--xmloff/source/draw/ximp3dscene.hxx4
-rw-r--r--xmloff/source/draw/ximpbody.cxx2
-rw-r--r--xmloff/source/draw/ximpbody.hxx16
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx104
-rw-r--r--xmloff/source/draw/ximpcustomshape.hxx8
-rw-r--r--xmloff/source/draw/ximpgrp.cxx2
-rw-r--r--xmloff/source/draw/ximpgrp.hxx4
-rw-r--r--xmloff/source/draw/ximplink.cxx2
-rw-r--r--xmloff/source/draw/ximplink.hxx6
-rw-r--r--xmloff/source/draw/ximpnote.cxx2
-rw-r--r--xmloff/source/draw/ximpnote.hxx6
-rw-r--r--xmloff/source/draw/ximppage.cxx6
-rw-r--r--xmloff/source/draw/ximppage.hxx18
-rw-r--r--xmloff/source/draw/ximpshap.cxx98
-rw-r--r--xmloff/source/draw/ximpshap.hxx162
-rw-r--r--xmloff/source/draw/ximpshow.cxx2
-rw-r--r--xmloff/source/draw/ximpshow.hxx4
-rw-r--r--xmloff/source/draw/ximpstyl.cxx30
-rw-r--r--xmloff/source/draw/ximpstyl.hxx66
-rw-r--r--xmloff/source/forms/attriblistmerge.cxx22
-rw-r--r--xmloff/source/forms/attriblistmerge.hxx12
-rw-r--r--xmloff/source/forms/callbacks.hxx2
-rw-r--r--xmloff/source/forms/controlpropertyhdl.cxx28
-rw-r--r--xmloff/source/forms/elementexport.cxx80
-rw-r--r--xmloff/source/forms/elementexport.hxx14
-rw-r--r--xmloff/source/forms/elementimport.cxx248
-rw-r--r--xmloff/source/forms/elementimport.hxx156
-rw-r--r--xmloff/source/forms/elementimport_impl.hxx4
-rw-r--r--xmloff/source/forms/eventexport.cxx20
-rw-r--r--xmloff/source/forms/eventexport.hxx8
-rw-r--r--xmloff/source/forms/eventimport.cxx6
-rw-r--r--xmloff/source/forms/eventimport.hxx2
-rw-r--r--xmloff/source/forms/formattributes.cxx32
-rw-r--r--xmloff/source/forms/formattributes.hxx22
-rw-r--r--xmloff/source/forms/formcellbinding.cxx42
-rw-r--r--xmloff/source/forms/formcellbinding.hxx26
-rw-r--r--xmloff/source/forms/formlayerexport.cxx4
-rw-r--r--xmloff/source/forms/formlayerimport.cxx8
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx44
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.hxx20
-rw-r--r--xmloff/source/forms/handler/vcl_date_handler.cxx10
-rw-r--r--xmloff/source/forms/handler/vcl_date_handler.hxx6
-rw-r--r--xmloff/source/forms/handler/vcl_time_handler.cxx10
-rw-r--r--xmloff/source/forms/handler/vcl_time_handler.hxx6
-rw-r--r--xmloff/source/forms/layerexport.cxx54
-rw-r--r--xmloff/source/forms/layerexport.hxx12
-rw-r--r--xmloff/source/forms/layerimport.cxx38
-rw-r--r--xmloff/source/forms/layerimport.hxx26
-rw-r--r--xmloff/source/forms/officeforms.cxx16
-rw-r--r--xmloff/source/forms/officeforms.hxx8
-rw-r--r--xmloff/source/forms/property_description.hxx4
-rw-r--r--xmloff/source/forms/property_meta_data.cxx8
-rw-r--r--xmloff/source/forms/property_meta_data.hxx4
-rw-r--r--xmloff/source/forms/propertyexport.cxx84
-rw-r--r--xmloff/source/forms/propertyexport.hxx42
-rw-r--r--xmloff/source/forms/propertyimport.cxx96
-rw-r--r--xmloff/source/forms/propertyimport.hxx48
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx28
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx4
-rw-r--r--xmloff/source/meta/xmlmetae.cxx62
-rw-r--r--xmloff/source/meta/xmlmetai.cxx26
-rw-r--r--xmloff/source/meta/xmlversion.cxx25
-rw-r--r--xmloff/source/script/XMLEventExport.cxx9
-rw-r--r--xmloff/source/script/XMLEventImportHelper.cxx1
-rw-r--r--xmloff/source/script/XMLEventsImportContext.cxx1
-rw-r--r--xmloff/source/script/XMLScriptContextFactory.cxx1
-rw-r--r--xmloff/source/script/XMLScriptExportHandler.cxx1
-rw-r--r--xmloff/source/script/XMLStarBasicContextFactory.cxx1
-rw-r--r--xmloff/source/script/XMLStarBasicExportHandler.cxx2
-rw-r--r--xmloff/source/script/xmlbasici.cxx14
-rw-r--r--xmloff/source/script/xmlbasici.hxx12
-rw-r--r--xmloff/source/script/xmlscripti.cxx20
-rw-r--r--xmloff/source/style/AttributeContainerHandler.cxx2
-rw-r--r--xmloff/source/style/DashStyle.cxx2
-rw-r--r--xmloff/source/style/DrawAspectHdl.cxx2
-rw-r--r--xmloff/source/style/DrawAspectHdl.hxx4
-rw-r--r--xmloff/source/style/EnumPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/FillStyleContext.cxx4
-rw-r--r--xmloff/source/style/FillStyleContext.hxx26
-rw-r--r--xmloff/source/style/GradientStyle.cxx2
-rw-r--r--xmloff/source/style/HatchStyle.cxx2
-rw-r--r--xmloff/source/style/ImageStyle.cxx2
-rw-r--r--xmloff/source/style/MarkerStyle.cxx2
-rw-r--r--xmloff/source/style/MultiPropertySetHelper.cxx1
-rw-r--r--xmloff/source/style/NamedBoolPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/PageHeaderFooterContext.cxx4
-rw-r--r--xmloff/source/style/PageHeaderFooterContext.hxx4
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx2
-rw-r--r--xmloff/source/style/PageMasterImportContext.cxx8
-rw-r--r--xmloff/source/style/PageMasterImportPropMapper.cxx4
-rw-r--r--xmloff/source/style/PageMasterImportPropMapper.hxx2
-rw-r--r--xmloff/source/style/PageMasterPropHdl.cxx2
-rw-r--r--xmloff/source/style/PageMasterPropHdl.hxx30
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.cxx2
-rw-r--r--xmloff/source/style/PagePropertySetContext.cxx1
-rw-r--r--xmloff/source/style/PagePropertySetContext.hxx4
-rw-r--r--xmloff/source/style/TransGradientStyle.cxx2
-rw-r--r--xmloff/source/style/WordWrapPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/XMLBackgroundImageContext.cxx2
-rw-r--r--xmloff/source/style/XMLBackgroundImageExport.cxx4
-rw-r--r--xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLClipPropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLConstantsPropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLElementPropertyContext.cxx1
-rw-r--r--xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx24
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx8
-rw-r--r--xmloff/source/style/XMLFontStylesContext_impl.hxx10
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorExport.cxx1
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorImport.cxx1
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorImport.hxx2
-rw-r--r--xmloff/source/style/XMLIsPercentagePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLPageExport.cxx8
-rw-r--r--xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLRectangleMembersHandler.cxx4
-rw-r--r--xmloff/source/style/adjushdl.cxx2
-rw-r--r--xmloff/source/style/adjushdl.hxx8
-rw-r--r--xmloff/source/style/backhdl.cxx2
-rw-r--r--xmloff/source/style/backhdl.hxx4
-rw-r--r--xmloff/source/style/bordrhdl.cxx2
-rw-r--r--xmloff/source/style/bordrhdl.hxx8
-rw-r--r--xmloff/source/style/breakhdl.cxx2
-rw-r--r--xmloff/source/style/breakhdl.hxx8
-rw-r--r--xmloff/source/style/cdouthdl.cxx2
-rw-r--r--xmloff/source/style/cdouthdl.hxx16
-rw-r--r--xmloff/source/style/chrhghdl.cxx2
-rw-r--r--xmloff/source/style/chrhghdl.hxx12
-rw-r--r--xmloff/source/style/chrlohdl.cxx2
-rw-r--r--xmloff/source/style/chrlohdl.hxx8
-rw-r--r--xmloff/source/style/csmaphdl.cxx2
-rw-r--r--xmloff/source/style/csmaphdl.hxx8
-rw-r--r--xmloff/source/style/durationhdl.cxx2
-rw-r--r--xmloff/source/style/durationhdl.hxx4
-rw-r--r--xmloff/source/style/escphdl.cxx2
-rw-r--r--xmloff/source/style/escphdl.hxx8
-rw-r--r--xmloff/source/style/fonthdl.cxx2
-rw-r--r--xmloff/source/style/fonthdl.hxx16
-rw-r--r--xmloff/source/style/impastp1.cxx3
-rw-r--r--xmloff/source/style/impastp2.cxx2
-rw-r--r--xmloff/source/style/impastp3.cxx1
-rw-r--r--xmloff/source/style/impastp4.cxx2
-rw-r--r--xmloff/source/style/impastpl.hxx50
-rw-r--r--xmloff/source/style/kernihdl.cxx2
-rw-r--r--xmloff/source/style/kernihdl.hxx4
-rw-r--r--xmloff/source/style/lspachdl.cxx2
-rw-r--r--xmloff/source/style/lspachdl.hxx12
-rw-r--r--xmloff/source/style/numehelp.cxx38
-rw-r--r--xmloff/source/style/opaquhdl.cxx2
-rw-r--r--xmloff/source/style/opaquhdl.hxx4
-rw-r--r--xmloff/source/style/postuhdl.cxx2
-rw-r--r--xmloff/source/style/postuhdl.hxx4
-rw-r--r--xmloff/source/style/prstylei.cxx12
-rw-r--r--xmloff/source/style/shadwhdl.cxx2
-rw-r--r--xmloff/source/style/shadwhdl.hxx4
-rw-r--r--xmloff/source/style/shdwdhdl.cxx2
-rw-r--r--xmloff/source/style/shdwdhdl.hxx4
-rw-r--r--xmloff/source/style/tabsthdl.cxx4
-rw-r--r--xmloff/source/style/tabsthdl.hxx4
-rw-r--r--xmloff/source/style/undlihdl.cxx2
-rw-r--r--xmloff/source/style/undlihdl.hxx12
-rw-r--r--xmloff/source/style/weighhdl.cxx2
-rw-r--r--xmloff/source/style/weighhdl.hxx4
-rw-r--r--xmloff/source/style/xmlaustp.cxx4
-rw-r--r--xmloff/source/style/xmlbahdl.cxx2
-rw-r--r--xmloff/source/style/xmlbahdl.hxx92
-rw-r--r--xmloff/source/style/xmlexppr.cxx12
-rw-r--r--xmloff/source/style/xmlimppr.cxx6
-rw-r--r--xmloff/source/style/xmlnume.cxx2
-rw-r--r--xmloff/source/style/xmlnumfe.cxx14
-rw-r--r--xmloff/source/style/xmlnumfi.cxx106
-rw-r--r--xmloff/source/style/xmlprcon.cxx4
-rw-r--r--xmloff/source/style/xmlprmap.cxx2
-rw-r--r--xmloff/source/style/xmltabe.cxx2
-rw-r--r--xmloff/source/style/xmltabi.cxx2
-rw-r--r--xmloff/source/table/XMLTableExport.cxx1
-rw-r--r--xmloff/source/table/XMLTableImport.cxx3
-rw-r--r--xmloff/source/table/table.hxx2
-rw-r--r--xmloff/source/text/XMLAnchorTypePropHdl.hxx6
-rw-r--r--xmloff/source/text/XMLAutoMarkFileContext.cxx1
-rw-r--r--xmloff/source/text/XMLAutoMarkFileContext.hxx4
-rw-r--r--xmloff/source/text/XMLAutoTextContainerEventImport.cxx1
-rw-r--r--xmloff/source/text/XMLAutoTextContainerEventImport.hxx4
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.cxx2
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.hxx12
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.cxx1
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.hxx6
-rw-r--r--xmloff/source/text/XMLCalculationSettingsContext.cxx10
-rw-r--r--xmloff/source/text/XMLCalculationSettingsContext.hxx2
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.hxx4
-rw-r--r--xmloff/source/text/XMLChangeImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangeImportContext.hxx2
-rw-r--r--xmloff/source/text/XMLChangeInfoContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangeInfoContext.hxx14
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.hxx16
-rw-r--r--xmloff/source/text/XMLFootnoteBodyImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLFootnoteBodyImportContext.hxx4
-rw-r--r--xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLFootnoteImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLFootnoteImportContext.hxx8
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx32
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.hxx2
-rw-r--r--xmloff/source/text/XMLIndexBibliographySourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexBibliographySourceContext.hxx6
-rw-r--r--xmloff/source/text/XMLIndexBodyContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexBodyContext.hxx4
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx2
-rw-r--r--xmloff/source/text/XMLIndexIllustrationSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexIllustrationSourceContext.hxx4
-rw-r--r--xmloff/source/text/XMLIndexMarkExport.cxx2
-rw-r--r--xmloff/source/text/XMLIndexMarkExport.hxx26
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.hxx16
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.hxx8
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.hxx10
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.hxx6
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.hxx10
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.hxx16
-rw-r--r--xmloff/source/text/XMLIndexTOCStylesContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTOCStylesContext.hxx8
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.hxx4
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.hxx14
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.hxx50
-rw-r--r--xmloff/source/text/XMLIndexTitleTemplateContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTitleTemplateContext.hxx12
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.cxx1
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.hxx24
-rw-r--r--xmloff/source/text/XMLLineNumberingExport.cxx2
-rw-r--r--xmloff/source/text/XMLLineNumberingExport.hxx22
-rw-r--r--xmloff/source/text/XMLLineNumberingImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx6
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.cxx9
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.hxx18
-rw-r--r--xmloff/source/text/XMLRedlineExport.cxx2
-rw-r--r--xmloff/source/text/XMLRedlineExport.hxx58
-rw-r--r--xmloff/source/text/XMLSectionExport.cxx2
-rw-r--r--xmloff/source/text/XMLSectionExport.hxx122
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigExport.cxx2
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.cxx1
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.hxx2
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLSectionImportContext.hxx30
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.hxx12
-rw-r--r--xmloff/source/text/XMLSectionSourceImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLSectionSourceImportContext.hxx4
-rw-r--r--xmloff/source/text/XMLStringBufferImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx1
-rw-r--r--xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx4
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextColumnsExport.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx112
-rw-r--r--xmloff/source/text/XMLTextFrameContext.hxx16
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.hxx10
-rw-r--r--xmloff/source/text/XMLTextHeaderFooterContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx6
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.cxx14
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.hxx18
-rw-r--r--xmloff/source/text/XMLTextListItemContext.cxx6
-rw-r--r--xmloff/source/text/XMLTextListItemContext.hxx4
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx25
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.hxx26
-rw-r--r--xmloff/source/text/XMLTextMasterPageContext.cxx4
-rw-r--r--xmloff/source/text/XMLTextMasterPageExport.cxx2
-rw-r--r--xmloff/source/text/XMLTextMasterStylesContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.cxx3
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.hxx32
-rw-r--r--xmloff/source/text/XMLTextPropertySetContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextPropertySetContext.hxx8
-rw-r--r--xmloff/source/text/XMLTextShapeImportHelper.cxx2
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextTableContext.cxx1
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.cxx1
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.hxx4
-rw-r--r--xmloff/source/text/txtdrope.cxx2
-rw-r--r--xmloff/source/text/txtdrope.hxx2
-rw-r--r--xmloff/source/text/txtdropi.cxx2
-rw-r--r--xmloff/source/text/txtdropi.hxx6
-rw-r--r--xmloff/source/text/txtexppr.cxx2
-rw-r--r--xmloff/source/text/txtexppr.hxx2
-rw-r--r--xmloff/source/text/txtflde.cxx14
-rw-r--r--xmloff/source/text/txtfldi.cxx32
-rw-r--r--xmloff/source/text/txtftne.cxx2
-rw-r--r--xmloff/source/text/txtimppr.cxx3
-rw-r--r--xmloff/source/text/txtlists.cxx80
-rw-r--r--xmloff/source/text/txtparae.cxx36
-rw-r--r--xmloff/source/text/txtparai.cxx24
-rw-r--r--xmloff/source/text/txtparai.hxx28
-rw-r--r--xmloff/source/text/txtparaimphint.hxx1
-rw-r--r--xmloff/source/text/txtprhdl.cxx58
-rw-r--r--xmloff/source/text/txtsecte.cxx2
-rw-r--r--xmloff/source/text/txtstyle.cxx2
-rw-r--r--xmloff/source/text/txtstyli.cxx2
-rw-r--r--xmloff/source/text/txtvfldi.cxx2
-rw-r--r--xmloff/source/transform/ChartOASISTContext.cxx1
-rw-r--r--xmloff/source/transform/ChartOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/ChartOOoTContext.cxx1
-rw-r--r--xmloff/source/transform/ChartOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.cxx19
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.hxx6
-rw-r--r--xmloff/source/transform/ChartPlotAreaOOoTContext.cxx11
-rw-r--r--xmloff/source/transform/ChartPlotAreaOOoTContext.hxx6
-rw-r--r--xmloff/source/transform/ControlOASISTContext.cxx1
-rw-r--r--xmloff/source/transform/ControlOASISTContext.hxx4
-rw-r--r--xmloff/source/transform/ControlOOoTContext.cxx1
-rw-r--r--xmloff/source/transform/ControlOOoTContext.hxx10
-rw-r--r--xmloff/source/transform/CreateElemTContext.cxx1
-rw-r--r--xmloff/source/transform/CreateElemTContext.hxx2
-rw-r--r--xmloff/source/transform/DeepTContext.cxx1
-rw-r--r--xmloff/source/transform/DeepTContext.hxx12
-rw-r--r--xmloff/source/transform/DlgOASISTContext.cxx1
-rw-r--r--xmloff/source/transform/DlgOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/DocumentTContext.cxx3
-rw-r--r--xmloff/source/transform/DocumentTContext.hxx2
-rw-r--r--xmloff/source/transform/EventOASISTContext.cxx3
-rw-r--r--xmloff/source/transform/EventOASISTContext.hxx6
-rw-r--r--xmloff/source/transform/EventOOoTContext.cxx6
-rw-r--r--xmloff/source/transform/EventOOoTContext.hxx10
-rw-r--r--xmloff/source/transform/FlatTContext.cxx1
-rw-r--r--xmloff/source/transform/FlatTContext.hxx10
-rw-r--r--xmloff/source/transform/FormPropOASISTContext.cxx1
-rw-r--r--xmloff/source/transform/FormPropOASISTContext.hxx4
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.cxx11
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.hxx8
-rw-r--r--xmloff/source/transform/FrameOASISTContext.cxx1
-rw-r--r--xmloff/source/transform/FrameOASISTContext.hxx12
-rw-r--r--xmloff/source/transform/FrameOOoTContext.cxx1
-rw-r--r--xmloff/source/transform/FrameOOoTContext.hxx10
-rw-r--r--xmloff/source/transform/IgnoreTContext.cxx3
-rw-r--r--xmloff/source/transform/IgnoreTContext.hxx10
-rw-r--r--xmloff/source/transform/MergeElemTContext.cxx17
-rw-r--r--xmloff/source/transform/MergeElemTContext.hxx8
-rw-r--r--xmloff/source/transform/MetaTContext.cxx1
-rw-r--r--xmloff/source/transform/MetaTContext.hxx10
-rw-r--r--xmloff/source/transform/MutableAttrList.cxx3
-rw-r--r--xmloff/source/transform/MutableAttrList.hxx18
-rw-r--r--xmloff/source/transform/NotesTContext.cxx1
-rw-r--r--xmloff/source/transform/NotesTContext.hxx6
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx19
-rw-r--r--xmloff/source/transform/OOo2Oasis.hxx14
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx34
-rw-r--r--xmloff/source/transform/Oasis2OOo.hxx10
-rw-r--r--xmloff/source/transform/PersAttrListTContext.cxx3
-rw-r--r--xmloff/source/transform/PersAttrListTContext.hxx22
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.cxx13
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.hxx10
-rw-r--r--xmloff/source/transform/ProcAddAttrTContext.cxx1
-rw-r--r--xmloff/source/transform/ProcAddAttrTContext.hxx6
-rw-r--r--xmloff/source/transform/ProcAttrTContext.cxx1
-rw-r--r--xmloff/source/transform/ProcAttrTContext.hxx8
-rw-r--r--xmloff/source/transform/RenameElemTContext.cxx1
-rw-r--r--xmloff/source/transform/RenameElemTContext.hxx10
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx19
-rw-r--r--xmloff/source/transform/StyleOASISTContext.hxx12
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx47
-rw-r--r--xmloff/source/transform/StyleOOoTContext.hxx10
-rw-r--r--xmloff/source/transform/TransformerActions.cxx1
-rw-r--r--xmloff/source/transform/TransformerActions.hxx4
-rw-r--r--xmloff/source/transform/TransformerBase.cxx14
-rw-r--r--xmloff/source/transform/TransformerBase.hxx60
-rw-r--r--xmloff/source/transform/TransformerContext.cxx1
-rw-r--r--xmloff/source/transform/TransformerContext.hxx14
-rw-r--r--xmloff/source/transform/TransformerTokenMap.hxx4
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx8
-rw-r--r--xmloff/source/xforms/SchemaContext.cxx1
-rw-r--r--xmloff/source/xforms/SchemaContext.hxx6
-rw-r--r--xmloff/source/xforms/SchemaRestrictionContext.cxx1
-rw-r--r--xmloff/source/xforms/SchemaRestrictionContext.hxx12
-rw-r--r--xmloff/source/xforms/SchemaSimpleTypeContext.cxx1
-rw-r--r--xmloff/source/xforms/SchemaSimpleTypeContext.hxx8
-rw-r--r--xmloff/source/xforms/TokenContext.cxx3
-rw-r--r--xmloff/source/xforms/TokenContext.hxx10
-rw-r--r--xmloff/source/xforms/XFormsBindContext.cxx1
-rw-r--r--xmloff/source/xforms/XFormsBindContext.hxx6
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.cxx3
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.hxx12
-rw-r--r--xmloff/source/xforms/XFormsModelContext.cxx1
-rw-r--r--xmloff/source/xforms/XFormsModelContext.hxx6
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.cxx1
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.hxx6
-rw-r--r--xmloff/source/xforms/xformsapi.cxx11
-rw-r--r--xmloff/source/xforms/xformsapi.hxx18
-rw-r--r--xmloff/source/xforms/xformsexport.cxx6
-rw-r--r--xmloff/source/xforms/xformsimport.cxx7
-rw-r--r--xmlreader/inc/xmlreader/pad.hxx2
-rw-r--r--xmlreader/inc/xmlreader/span.hxx7
-rw-r--r--xmlreader/inc/xmlreader/xmlreader.hxx6
-rw-r--r--xmlreader/source/span.cxx6
-rw-r--r--xmlreader/source/xmlreader.cxx64
-rw-r--r--xmlscript/source/xml_helper/xml_element.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_export.cxx2
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx1
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx9
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.hxx10
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.hxx70
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_export.cxx1
-rw-r--r--xmlscript/source/xmlmod_imexp/imp_share.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/biginteger.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/certvalidity.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx4
-rw-r--r--xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx18
-rw-r--r--xmlsecurity/inc/xmlsecurity/sigstruct.hxx20
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx8
-rw-r--r--xmlsecurity/qa/certext/SanCertExt.cxx32
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx26
-rw-r--r--xmlsecurity/source/component/certificatecontainer.hxx22
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx38
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.hxx16
-rw-r--r--xmlsecurity/source/component/registerservices.cxx6
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx2
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx10
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx22
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx16
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx6
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.hxx8
-rw-r--r--xmlsecurity/source/framework/buffernode.cxx28
-rw-r--r--xmlsecurity/source/framework/buffernode.hxx2
-rw-r--r--xmlsecurity/source/framework/decryptorimpl.cxx22
-rw-r--r--xmlsecurity/source/framework/decryptorimpl.hxx12
-rw-r--r--xmlsecurity/source/framework/encryptionengine.cxx2
-rw-r--r--xmlsecurity/source/framework/encryptorimpl.cxx22
-rw-r--r--xmlsecurity/source/framework/encryptorimpl.hxx12
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.cxx74
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.hxx26
-rw-r--r--xmlsecurity/source/framework/signaturecreatorimpl.cxx22
-rw-r--r--xmlsecurity/source/framework/signaturecreatorimpl.hxx12
-rw-r--r--xmlsecurity/source/framework/signatureengine.cxx6
-rw-r--r--xmlsecurity/source/framework/signatureengine.hxx6
-rw-r--r--xmlsecurity/source/framework/signatureverifierimpl.cxx22
-rw-r--r--xmlsecurity/source/framework/signatureverifierimpl.hxx12
-rw-r--r--xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx1
-rw-r--r--xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx10
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx1
-rw-r--r--xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx10
-rw-r--r--xmlsecurity/source/helper/documentsignaturehelper.cxx91
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx24
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx28
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.hxx16
-rw-r--r--xmlsecurity/source/helper/xsecctl.cxx114
-rw-r--r--xmlsecurity/source/helper/xsecctl.hxx48
-rw-r--r--xmlsecurity/source/helper/xsecparser.cxx90
-rw-r--r--xmlsecurity/source/helper/xsecparser.hxx28
-rw-r--r--xmlsecurity/source/helper/xsecsign.cxx28
-rw-r--r--xmlsecurity/source/helper/xsecverify.cxx28
-rw-r--r--xmlsecurity/source/xmlsec/biginteger.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/certvalidity.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/diagnose.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx11
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx9
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx20
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx28
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx14
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx13
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx8
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/nss/ciphercontext.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.cxx58
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.hxx12
-rw-r--r--xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx21
-rw-r--r--xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx15
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx18
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx30
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx14
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx21
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx8
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx1
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx10
-rw-r--r--xmlsecurity/source/xmlsec/saxhelper.cxx20
-rw-r--r--xmlsecurity/source/xmlsec/saxhelper.hxx12
-rw-r--r--xmlsecurity/source/xmlsec/serialnumberadapter.hxx4
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx106
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx40
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx20
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx12
-rw-r--r--xmlsecurity/source/xmlsec/xmlstreamio.cxx12
-rw-r--r--xmlsecurity/workben/signaturetest.cxx8
8696 files changed, 81125 insertions, 83402 deletions
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 "<path ...>" 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<sal_Int32>(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<sal_uInt16>(rStrm,
+ OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(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<sal_Int64>(this)).getStr()<< "=='"
+ << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
<< ( aNameStr.isEmpty() ? "<unnamed>" : 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<sal_Int64>(GetParent())).getStr()
+ << OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr()
<< "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : 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<sal_Int64>(this)).getStr() << "=="
+ << OString::valueOf(reinterpret_cast<sal_Int64>(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<XInterface *>( 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<XInterface *>( 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<rtl::OUString>& ) {}
+ void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {}
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<rtl::OUString>& aPropertyNames);
+ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& 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 </sal_True> if the number could successfully be set at the given position
bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
/// returns </sal_True> 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 <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
-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_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);
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 </sal_True>, 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<rtl::OUString>& aPropertyNames);
+ virtual void Notify( const uno::Sequence<OUString>& 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<rtl::OUString>& ) {}
+void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {}
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<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
+ rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((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 <member>invoking</member>, 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:
// <properties>
sal_Int32 m_nNumberFormatKey;
- ::rtl::OUString m_sRole;
+ OUString m_sRole;
// </properties>
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.
<p>For conversion rtl::math::StringToDouble is used.</p>
*/
-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.
<p>For conversion rtl::math::DoubleToOUString is used.</p>
*/
-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<ComplexCategory>* 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:
// <properties>
sal_Int32 m_nNumberFormatKey;
- ::rtl::OUString m_sRole;
- ::rtl::OUString m_aXMLRange;
+ OUString m_sRole;
+ OUString m_aXMLRange;
// </properties>
/** 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<sal_Int32> 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<nCount;nN++)
{
- rtl::OUString aText;
+ OUString aText;
uno::Any aAny = rInAnys[nN];
if( aAny.hasValue() )
{
@@ -247,7 +246,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 ::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<sal_Int32>& 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 <iterator>
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<beans::XPropertySet> 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 <functional>
#include <vector>
-#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<sal_Int32>( 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; nN<nMinCount; nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
try
{
this->setPropertyValue( 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; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyState( aPropertyName );
}
}
@@ -394,7 +393,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( )
const Sequence< beans::Property >& rPropSeq = getPropertySequence();
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rPropSeq[nN].Name );
+ OUString aPropertyName( rPropSeq[nN].Name );
this->setPropertyToDefault( aPropertyName );
}
}
@@ -403,7 +402,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri
{
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
this->setPropertyToDefault( aPropertyName );
}
}
@@ -416,7 +415,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
aRetSeq.realloc( rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyDefault( 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 <algorithm>
#include <functional>
-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<nCount; nN++ )
@@ -1246,8 +1245,8 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > 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<VTitle> 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<drawing::XShapes> 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<drawing::XShape>
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; nN<aStringList.getLength();nN++ )
aLabel += aStringList[nN]->getString();
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<const wchar_t> 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<wchar_t const> 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<uno_Interface*>(
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<System::Object^>^ outArgs,
@@ -178,7 +178,7 @@ struct CliProxy: public uno_Interface
gcroot<System::Type^> m_type;
const com::sun::star::uno::TypeDescription m_unoType;
const gcroot<System::String^> 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 <rtl/ustring.hxx>
#include <vector>
-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 <vector>
-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 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 <rtl/ustring.hxx>
+
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2> <nargs> 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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <indexbyte1> <indexbyte2>:
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 <vector>
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),
"<clinit>", "()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),
"<clinit>", "()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, "<init>", "()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,
"<init>", "()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, "<init>", "(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, "<init>",
- 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<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal);
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Bool _bVal);
-// ::rtl::OUString
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, ::rtl::OUString& _rStr);
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const ::rtl::OUString& _rStr);
+// OUString
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& _rStr);
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& _rStr);
// sal_Int16
COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _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
<TRUE/> 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
<TRUE/> 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 <NULL/>.
*/
- ::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 <NULL/>.
*/
::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 <code>/singletons</code> key in a component context,
so accessing them means retrieving the value under <code>/singletons/&lt;instance_name&gt;</code>.
*/
- ::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 <code>::cppu::createSingleComponentFactory</code>)
@@ -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
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()</code><li/>
+ <li><code>static OUString getImplementationName_static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
@@ -226,9 +226,9 @@ namespace comphelper
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()</code><li/>
- <li><code>static ::rtl::OUString getSingletonName_static()</code></li>
+ <li><code>static OUString getImplementationName_static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/>
+ <li><code>static OUString getSingletonName_static()</code></li>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
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 <type scope="com::sun::star::logging">XLogger</type>
@@ -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 <TRUE/> 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.</p>
*/
- 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<starbeans::Property>& seqProps, const ::rtl::OUString& _rPropName);
+COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& 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<starbeans::Property>&
@param _nAddAttrib the attributes which should be added
@param _nRemoveAttrib the attributes which should be removed
*/
-COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const ::rtl::OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
+COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _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<starbeans::XPropertySet>& _rxSet);
+COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _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<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst = sal_False);
+ COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> 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 <TRUE/> if the value can be found, otherwise <FALSE/>.
*/
- 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 <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
-// 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<sal_Int16>(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<sal_Unicode>(0x07C6));
+ s1 += OUString(static_cast<sal_Unicode>(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<aServices.getLength(); ++i )
if ( _serviceName == aServices[i] )
return sal_True;
@@ -704,7 +704,7 @@ namespace comphelper
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > 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<starcontainer::X
//------------------------------------------------------------------------------
OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _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( "<cannot get type description of type " );
buf.append( OUString::unacquired( &typeRef->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 <rtl/random.h>
#include <string.h>
-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 <com/sun/star/task/XInteractionAbort.hpp>
#include <com/sun/star/task/XInteractionPassword2.hpp>
-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;i<pType->nMembers;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$" );
-
- ::rtl::OUString sMessage( _rMessage );
+ // (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$" );
+
+ 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( "<invalid event resource: '" );
aBuffer.append( m_pData->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<starutil::XNumberF
staruno::Reference<starbeans::XPropertySet> 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<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst)
+staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst)
{
sal_Int32 nLength = _rList.getLength();
@@ -34,7 +34,7 @@ staruno::Sequence<sal_Int16> 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<sal_Int16> 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<sal_Int16> 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<rtl::OUString> SAL_CALL getSupportedServiceNames()
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (uno::RuntimeException);
// XSingleComponentFactory:
virtual uno::Reference<uno::XInterface> 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<rtl::OUString> ServiceDecl::Factory::getSupportedServiceNames()
+uno::Sequence<OUString> 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<rtl::OUString> ServiceDecl::getSupportedServiceNames() const
+uno::Sequence<OUString> ServiceDecl::getSupportedServiceNames() const
{
- std::vector<rtl::OUString> vec;
+ std::vector<OUString> 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<rtl::OUString> 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 <code>getSupportedServiceNames</code> */
-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<rtl::OUString> &rElems,
- const ::rtl::OUString& rPath )
+static void splitPath( std::vector<OUString> &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<rtl::OUString> &rElems,
static uno::Reference< embed::XStorage > LookupStorageAtPath(
const uno::Reference< embed::XStorage > &xParentStorage,
- std::vector<rtl::OUString> &rElems, sal_uInt32 nOpenMode,
+ std::vector<OUString> &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<rtl::OUString> aElems;
+ std::vector<OUString> 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<rtl::OUString> aElems;
+ std::vector<OUString> 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<rtl::OString, sal_Char>(rIn, c);
+ return tmpl_stripStart<OString, sal_Char>(rIn, c);
}
-rtl::OUString stripStart(const rtl::OUString &rIn, sal_Unicode c)
+OUString stripStart(const OUString &rIn, sal_Unicode c)
{
- return tmpl_stripStart<rtl::OUString, sal_Unicode>(rIn, c);
+ return tmpl_stripStart<OUString, sal_Unicode>(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<rtl::OString, sal_Char>(rIn, c);
+ return tmpl_stripEnd<OString, sal_Char>(rIn, c);
}
-rtl::OUString stripEnd(const rtl::OUString &rIn, sal_Unicode c)
+OUString stripEnd(const OUString &rIn, sal_Unicode c)
{
- return tmpl_stripEnd<rtl::OUString, sal_Unicode>(rIn, c);
+ return tmpl_stripEnd<OUString, sal_Unicode>(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<rtl::OString, sal_Char>(rIn, cTok);
+ return tmpl_getTokenCount<OString, sal_Char>(rIn, cTok);
}
-sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok)
+sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok)
{
- return tmpl_getTokenCount<rtl::OUString, sal_Unicode>(rIn, cTok);
+ return tmpl_getTokenCount<OUString, sal_Unicode>(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<sal_Unicode> (','), 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<isdigitAscii>(rString);
}
-bool isdigitAsciiString(const rtl::OUString &rString)
+bool isdigitAsciiString(const OUString &rString)
{
return tmpl_is_OPER_AsciiString<isdigitAscii>(rString);
}
@@ -390,17 +390,17 @@ namespace
}
}
-rtl::OUString reverseString(const rtl::OUString &rStr)
+OUString reverseString(const OUString &rStr)
{
- return tmpl_reverseString<rtl::OUString, rtl::OUStringBuffer>(rStr);
+ return tmpl_reverseString<OUString, OUStringBuffer>(rStr);
}
-rtl::OString reverseString(const rtl::OString &rStr)
+OString reverseString(const OString &rStr)
{
- return tmpl_reverseString<rtl::OString, rtl::OStringBuffer>(rStr);
+ return tmpl_reverseString<OString, OStringBuffer>(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<const Sequence< ::rtl::OUString>*>(pData);
- const Sequence< ::rtl::OUString >& rRightSeq = aTemp;
+ const Sequence< OUString >& rLeftSeq = *reinterpret_cast<const Sequence< OUString>*>(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 <comphelper/ChainablePropertySetInfo.hxx>
#include <comphelper/TypeGeneration.hxx>
-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 <comphelper/MasterPropertySetInfo.hxx>
#include <comphelper/TypeGeneration.hxx>
-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 <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/awt/Gradient.hpp>
-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<text::XTextTable>*)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<OPropertySetAggregationHelper*>(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<OPropertySetAggregationHelper*>(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<XPropertySet>& _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<XPropertySet>& _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<XPropertySet>& _rxSource,
}
//------------------------------------------------------------------
-sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>& _rxSet)
+sal_Bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet)
{
if (_rxSet.is())
{
@@ -141,7 +141,7 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>&
}
//------------------------------------------------------------------
-void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName)
+void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
{
sal_Int32 nLen = _rProps.getLength();
@@ -159,7 +159,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName
}
//------------------------------------------------------------------
-void ModifyPropertyAttributes(Sequence<Property>& seqProps, const ::rtl::OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib)
+void ModifyPropertyAttributes(Sequence<Property>& 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<stario::XObjectOutputStream>& operator << (const starun
}
//------------------------------------------------------------------------------
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, ::rtl::OUString& rStr)
+const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr)
{
rStr = _rxInStream->readUTF();
return _rxInStream;
}
//------------------------------------------------------------------------------
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const ::rtl::OUString& rStr)
+const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _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 <string.h>
#include <vector>
-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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
if (nBytesToRead < 0)
- throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+ throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
if (nMaxBytesToRead < 0)
- throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+ throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
sal_uInt64 nPos;
FileBase::RC eError = m_pFile->getPos(nPos);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
sal_uInt64 nAvailable;
eError = m_pFile->getPos(nAvailable);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
nAvailable = nAvailable - nPos;
eError = m_pFile->setPos(osl_Pos_Absolut, nPos);
if (eError != FileBase::E_None)
- throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(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<staruno::XWeak*>(this));
+ throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(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<sal_Int8>& 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<const sal_Char*>(&aChaff[0]), nLength);
+ return OString(reinterpret_cast<const sal_Char*>(&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<DriversConfigImpl> 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<sal_Int8>& _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
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
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<sal_Int32,sal_Int32> 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 <em>end</em> 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 <i>append</i> _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<sal_Bool,sal_Bool> 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 <member>m_pOuterParameters</member> 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 <code>createObject( _rForName )</code>, 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 <NULL/> 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<OSQLColumns>& _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<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable);
+ void setSelectColumnName(::rtl::Reference<OSQLColumns>& _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<OSQLColumns>& _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 <FALSE/>, you're encouraged to check and handle the error in
<arg>_pErrorHolder</arg>.
*/
- 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
<TRUE/> if and only if parsing was successful, <FALSE/> 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<XColumnUpdate>& xVariant,
const Reference<XNumberFormatter>& 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<XColumnUpdate>& 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<XNumberFormatter>& _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<XColumn>& xVariant,
+OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
const Reference<XNumberFormatter>& 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<uno::Any> 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<sal_Int8> 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<sal_uInt64>(::rtl::OUString(m_aValue.m_pString).toInt64());
+ nRet = static_cast<sal_uInt64>(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<sal_Int8> ORowSetValue::getSequence() const
case DataType::VARCHAR:
case DataType::LONGVARCHAR:
{
- ::rtl::OUString sVal(m_aValue.m_pString);
+ OUString sVal(m_aValue.m_pString);
aSeq = Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(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> 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<XDatabaseMetaData> 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<XDatabaseMetaData> 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<XMultiServiceFactory> 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<sal_Int32>(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<sal_uInt16>(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<XPropertySet> 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<XPropertySet> 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; i<aOldProperties.getLength(); ++i)
{
@@ -1030,10 +1030,10 @@ try
{
OSL_UNUSED( e );
#ifdef DBG_UTIL
- ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
+ OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
sMessage += pResult->Name;
- 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<XPropertySet>& _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<XPropertySet>& _xTable )
+OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference<XPropertySet>& _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<XDatabaseMetaData>& _xMetaData,
+OUString composeTableName(const Reference<XDatabaseMetaData>& _xMetaData,
const Reference<XPropertySet>& _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<XNameAccess>& _rxContainer,const ::rtl::OUString& _rBaseName,sal_Bool _bStartWithNumber)
+OUString createUniqueName(const Reference<XNameAccess>& _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<bool, std::allocator<bool> > 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<sal_Int32> > TParameterPositions;
+ typedef ::std::map< OUString, ::std::vector<sal_Int32> > TParameterPositions;
TParameterPositions aParameterNames;
for(sal_Int32 i = 0; i < nParamCount; ++i)
{
Reference<XPropertySet> 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<XParameters>& _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<XParameters>& _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<XParameters>& _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<XDatabaseMetaData> 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<XPropertySetInfo> 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<XResultSet> xRes = xMetaData->getTypeInfo();
if(xRes.is())
@@ -100,7 +100,7 @@ namespace dbtools
Reference<XRow> 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<XDatabaseMetaData> 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<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -223,13 +223,13 @@ namespace dbtools
}
namespace
{
- ::rtl::OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData)
+ OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _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<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
- ::rtl::OUStringBuffer aSql;
+ OUStringBuffer aSql;
// keys
Reference<XKeysSupplier> xKeySup(descriptor,UNO_QUERY);
Reference<XIndexAccess> xKeys = xKeySup->getKeys();
@@ -260,7 +260,7 @@ namespace
Reference< XPropertySet > xColProp;
Reference<XIndexAccess> xColumns;
Reference<XColumnsSupplier> xColumnSup;
- ::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
+ OUString sCatalog,sSchema,sTable,sComposedName;
sal_Bool bPKey = sal_False;
for(sal_Int32 i=0;i<xKeys->getCount();++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<XPropertySet> lcl_createSDBCXColumn(const Reference<XNameAccess>& _xPrimaryKeyColumns,
const Reference<XConnection>& _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<XPropertySet> xProp;
Reference<XDatabaseMetaData> 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<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable,
const Reference<XConnection>& _xConnection,
- const ::rtl::OUString& _rName,
+ const OUString& _rName,
sal_Bool _bCase,
sal_Bool _bQueryForInfo,
sal_Bool _bIsAutoIncrement,
@@ -519,10 +519,10 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
Reference<XDatabaseMetaData> 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<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _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<XInterface>& _xProp,const ::rtl::OUString& _sProperty,sal_Bool _bDefault)
+sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const OUString& _sProperty,sal_Bool _bDefault)
{
sal_Bool bEnabled = _bDefault;
try
@@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _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<XInterface>& _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:
// <detail_column> = :<new_param_name>
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<ParameterWrapper*>( 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<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
@@ -363,9 +363,9 @@ namespace dbtools
Reference<XDatabaseMetaData> 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<XPropertySet> 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<OSQLParseNode> 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<sal_Int32 , rtl_uString*>::const_iterator aIter = m_aPropertyMap.find(_nIndex);
if(aIter == m_aPropertyMap.end())
sRet = const_cast<OPropertyMap*>(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<XInterface> 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<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw()
+Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw()
{
Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY);
Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY);
@@ -387,7 +387,7 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co
return xNode;
}
// -----------------------------------------------------------------------------
-Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference<XInterface>& _xTreeNode) throw()
+Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterface>& _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<OTypeInfoMap::value_type>())
@@ -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<nCount; ++i)
{
WpADOProperty aProp = aProps.GetItem(i);
- ::rtl::OUString sName = aProp.GetName();
- ::rtl::OUString sVal = aProp.GetValue();
+ OUString sName = aProp.GetName();
+ OUString sVal = aProp.GetValue();
}
#endif
}
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 5b918cdfef68..1dad74a6959a 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
using namespace com::sun::star::container;
-sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
{
return new OAdoColumn(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
}
@@ -59,7 +59,7 @@ Reference< XPropertySet > 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<XTypeProvider*>(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<ADOFields, ADOField, WpADOField> 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<sal_uInt32,LiteralInfo>::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<XTypeProvider*>(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<nCount; ++i)
{
WpADOProperty aProp = aProps.GetItem(i);
- ::rtl::OUString sName = aProp.GetName();
- ::rtl::OUString sVal = aProp.GetValue();
+ OUString sName = aProp.GetName();
+ OUString sVal = aProp.GetValue();
}
#endif
}
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 35664bdbbcb6..a55af080ba84 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -250,7 +250,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
m_RecordSet.PutRefDataSource( (IDispatch*)m_Command );
}
// -------------------------------------------------------------------------
-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);
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(S
return m_RecordSet.IsValid();
}
// -------------------------------------------------------------------------
-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);
@@ -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<XTypeProvider*>(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<XTypeProvider*>(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<XTypeProvider*>(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<LPCOLESTR>(_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<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : ::rtl::OUString();
+ return (m_sStr != NULL) ? OUString(reinterpret_cast<const sal_Unicode*>(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<const sal_Unicode*>(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 <cppuhelper/factory.hxx>
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<OSQLColumns> 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<PropertyValue> 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<XSpreadsheets>& xSheets, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName )
{
Any aAny = xSheets->getByName( rName );
Reference<XSpreadsheet> xSheet;
@@ -296,7 +296,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& 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<XSpreadsheets>& xSheets, co
return sal_False;
}
-static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUString& rName )
{
sal_Bool bUnnamed = sal_False;
@@ -339,7 +339,7 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& 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<XDatabaseRanges>& 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<XSpreadsheets> 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<nSheetCount; nSheet++)
{
- ::rtl::OUString aName = aSheetNames[nSheet];
+ OUString aName = aSheetNames[nSheet];
if ( !lcl_IsEmptyOrHidden( xSheets, aName ) && match(tableNamePattern,aName,'\0') )
{
ODatabaseMetaDataResultSet::ORow aRow(3);
@@ -424,15 +424,15 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") );
+ Any aRangesAny = xDocProp->getPropertyValue( OUString("DatabaseRanges") );
Reference<XDatabaseRanges> 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<nDBCount; nRange++)
{
- ::rtl::OUString aName = aDBNames[nRange];
+ OUString aName = aDBNames[nRange];
if ( !lcl_IsUnnamed( xRanges, aName ) && match(tableNamePattern,aName,'\0') )
{
ODatabaseMetaDataResultSet::ORow aRow(3);
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 27ea3e1e5467..c66fbe82e9fa 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -36,12 +36,12 @@ 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.calc.ODriver");
+ return OUString("com.sun.star.comp.sdbc.calc.ODriver");
}
-::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException)
{
return getImplementationName_Static();
}
@@ -57,7 +57,7 @@ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
return *(new ODriver(_rxFactory));
}
-Reference< XConnection > 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>& xCell
CellContentType eCellType = xCell->getType();
if ( eCellType == CellContentType_FORMULA )
{
- static const ::rtl::OUString s_sFormulaResultType("FormulaResultType");
+ static const OUString s_sFormulaResultType("FormulaResultType");
Reference<XPropertySet> xProp( xCell, UNO_QUERY );
try
{
@@ -228,7 +228,7 @@ static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int3
static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& 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<XSpreadsheet>& 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<XSpreadsheet>& 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<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") ),UNO_QUERY);
+ Reference<XDatabaseRanges> 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<XPropertySet> xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY );
if ( xFiltProp.is() )
- xFiltProp->getPropertyValue(::rtl::OUString("ContainsHeader")) >>= bRangeHeader;
+ xFiltProp->getPropertyValue(OUString("ContainsHeader")) >>= bRangeHeader;
Reference<XSheetCellRange> xSheetRange( xRefer->getReferredCells(), UNO_QUERY );
Reference<XCellRangeAddressable> 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<OFileCatalog&>(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 <cppuhelper/factory.hxx>
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<XPropertySetInfo> xColInfo = _xColumn->getPropertySetInfo();
Reference<XPropertySet> 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<XColumnsSupplier> 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<size_t>(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<XUnoTunnel> 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<XCommandEnvironment>(), 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<sal_Int32>(nLastPos+1), m_eEncoding);
+ *(_rRow->get())[i] = OUString::intern(pData, static_cast<sal_Int32>(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<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
Reference<XPropertySet> 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<XPropertySet> 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<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
Reference<XPropertySet> 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<XPropertySet> xIndex;
@@ -1663,7 +1663,7 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
return Reference<XPropertySet>();
}
//------------------------------------------------------------------
-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<XPropertySet> xCol;
Reference<XPropertySet> xIndex;
sal_uInt16 i;
- ::rtl::OUString aColName;
+ OUString aColName;
const sal_Int32 nColumnCount = m_pColumns->getCount();
::std::vector< Reference<XPropertySet> > 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<const sal_Char* , ::rtl::OUString > > aStringToSubstitutes;
- aStringToSubstitutes.push_back(::std::pair<const sal_Char* , ::rtl::OUString >("$columnname$", aColName));
+ ::std::list< ::std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
+ aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$columnname$", aColName));
aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen)));
aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
- aStringToSubstitutes.push_back(::std::pair<const sal_Char* , ::rtl::OUString >("$value$", ::rtl::OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
+ aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$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<sal_Int8> 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<ODbaseConnection*>(m_pConnection));
Reference<XPropertySet> 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> 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<ODbaseConnection*>(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> 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<ODbaseConnection*>(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> 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<sal_Int32>(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<OFileCatalog&>(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<XUnoTunnel> 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<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
+ const OUString sError( static_cast<OFileCatalog&>(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 <cppuhelper/factory.hxx>
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<char *>(&pBuf[0]), aText.getStr(),
std::min<size_t>(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<connectivity::OSQLColumns> &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<sal_Int32> m_aEvoabFields;
protected:
virtual ~OEvoabResultSetMetaData();
public:
- OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName);
+ OEvoabResultSetMetaData(const OUString& _aTableName);
void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &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 <osl/diagnose.h>
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;
// <properties>
- ::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<XDynamicResultSet> 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<XContentIdentifier> 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<XPropertySet> 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<XPropertySet> 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<XPropertySet> 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<OSQLColumns::Vector::iterator,sal_Bool> 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> 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<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable)
+OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _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<sal_Int32*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(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<ORowSetValue>& lhs) const
if ( lhs.empty() )
return ORowSetValue();
- ::rtl::OUString sRet;
+ OUString sRet;
::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin();
::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend();
for (; aIter != aEnd; ++aIter)
@@ -77,7 +77,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
{
sal_Char c = static_cast<sal_Char>(static_cast<sal_Int32>(*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<ORowSetValue>& lhs) const
if ( lhs.empty() )
return ORowSetValue();
- ::rtl::OUStringBuffer sRet;
+ OUStringBuffer sRet;
::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin();
::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend();
for (; aIter != aEnd; ++aIter)
@@ -98,7 +98,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& 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<ORowSetValue>& 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<ORowSetValue>& 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<ORowSetValue>& lhs) const
if ( lhs.size() != 4 )
return ORowSetValue();
- ::rtl::OUString sStr = lhs[3];
+ OUString sStr = lhs[3];
sal_Int32 nStart = static_cast<sal_Int32>(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; j<aColumnNames.getLength(); ++j )
m_aSelectionEvaluations.push_back( TPredicates() );
}
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 1712d5a00918..894f31d29436 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -154,7 +154,7 @@ const ORowSetValue& OOperandValue::getValue() const
}
//------------------------------------------------------------------
-OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const rtl::OUString& aStrValue)
+OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aStrValue)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandConst::OOperandConst" );
switch (rColumnRef.getNodeType())
@@ -336,7 +336,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
case DataType::VARCHAR:
case DataType::LONGVARCHAR:
{
- rtl::OUString sLH = aLH, sRH = aRH;
+ OUString sLH = aLH, sRH = aRH;
sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
(
sLH.pData->buffer,
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<XPropertySet> 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<OFileCatalog&>(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 <cppuhelper/factory.hxx>
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<XDriverManager2> 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> 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<SvStream> 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<XConnection> 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<XStatement> xStmt = _xConnection->createStatement();
if ( xStmt.is() )
{
- Reference<XResultSet> xRes(xStmt->executeQuery(::rtl::OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY);
+ Reference<XResultSet> xRes(xStmt->executeQuery(OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY);
Reference<XRow> 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<TWeakConnectionPair>(),::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<TWeakConnectionPair>(),::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<StreamHelper> 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<StreamHelper> 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<XTransactionListener>& _xListener)
+ void StorageContainer::revokeStorage(const OUString& _sKey,const Reference<XTransactionListener>& _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<XPropertySet>& _xDescriptor)
+void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _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<OHCatalog&>(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<XPropertySet> 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<OHCatalog&>(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<XContainerListener*>(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<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- ::rtl::OUString sCatalog,sSchema,sTable;
+ OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
Reference<XResultSet> 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<XRow> 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<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += ::rtl::OUString(" TO ");
+ sGrant += OUString(" TO ");
sGrant += m_Name;
Reference<XStatement> 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<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += ::rtl::OUString(" FROM ");
+ sGrant += OUString(" FROM ");
sGrant += m_Name;
Reference<XStatement> 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<XStatement> 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 <name> TO <command>
@@ -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<XPropertySet> 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> xConnection = static_cast<OHCatalog&>(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<OTables*>(static_cast<OHCatalog&>(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 <cppuhelper/factory.hxx>
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<jshort>(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 <com::sun::star::util::DateTime> (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<typeFilterCount; ++i, ++typeFilter )
{
@@ -222,21 +222,21 @@ Reference< XResultSet > 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<sal_Int32,sal_Int32> 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( "<empty string>" );
+ sLoggedResult = OUString( "<empty string>" );
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 <TRUE/> 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 <TRUE/> 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 <cppuhelper/factory.hxx>
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<connectivity::OSQLColumns> &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 <cppuhelper/factory.hxx>
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<MacabGroup *> _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<MacabGroup *> 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<connectivity::OSQLColumns> &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::Reference<connectivity:
for (aIter = xColumns->get().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<sal_Int32> 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 <cppuhelper/factory.hxx>
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<sal_Int16>(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/ustring.hxx>
-::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 <stdio.h>
#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::map<rtl::OUString,
+typedef std::map<OUString,
ini_Section
>IniSectionMap;
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<XPropertySet> 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<XPropertySet> 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<int> 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<sal_Int32>(column.size()));
OString valueOString(value.c_str(), static_cast<sal_Int32>(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<MQueryExpressionString*> (*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<OSQLColumns> 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<XPropertySet> 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<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
::std::vector<sal_Int32> m_aOrderbyColumnNumber;
::std::vector<TAscendingOrder> 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<OKeySet> m_pKeySet;
@@ -247,7 +247,7 @@ protected:
::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns
::rtl::Reference<connectivity::OSQLColumns> 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<connectivity::OSQLColumns> 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<connectivity::OSQLColumns>& _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 <comphelper/processfactory.hxx>
#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 <vector>
#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<sal_Int16>(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<XInterface> xInstance = m_xMSFactory->createInstance(::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap") );
+ Reference<XInterface> xInstance = m_xMSFactory->createInstance(OUString( "com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
OConnection* pCon = reinterpret_cast<OConnection*>((*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<XPropertySet> 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<XPropertySet> 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<OSQLColumns> 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<XPropertySet> 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<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
::std::vector<sal_Int32> m_aOrderbyColumnNumber;
::std::vector<TAscendingOrder> 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<OKeySet> m_pKeySet;
@@ -247,7 +247,7 @@ protected:
::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns
::rtl::Reference<connectivity::OSQLColumns> 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<connectivity::OSQLColumns> 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<connectivity::OSQLColumns>& _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 <tools/solar.h>
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<OMozabConnection_CreateInstanceFunction> 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/ustring.hxx>
-::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 <stdio.h>
#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::map<rtl::OUString,
+typedef std::map<OUString,
ini_Section
>IniSectionMap;
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<nsILocalFile> 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<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+ Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = Reference<XMozillaBootstrap>(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<const sal_Unicode *>(profileName));
+ OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only<const sal_Unicode *>(profileName));
nsCOMPtr<nsILocalFile> 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<const sal_Unicode *>(path.get()));
+ return OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(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<nsILocalFile> 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<nsIProfile> 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<const sal_Unicode *>(currentProfileStr.get()));
+ return OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(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<nsIProfile> 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<const PRUnichar *>(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<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+ Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = Reference<XMozillaBootstrap>(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<nsIRDFDataSource> 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<nsIRDFService> 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> xMozillaBootstrap;
Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+ Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
xMozillaBootstrap = Reference<XMozillaBootstrap>(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<nsIAbDirectoryProperties> 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<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
OSL_ENSURE( xFactory.is(), "can't get service factory" );
- ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+ ::com::sun::star::uno::Reference<XInterface> 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 <MNameMapper.hxx>
#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 <com/sun/star/mozilla/XMozillaBootstrap.hpp>
#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<nsIPref> 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<sal_Int32>(bufferEnd - buffer) );
+ return OString( buffer, static_cast<sal_Int32>(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<sal_Unicode *>(uc), nssLen);
+ OUString _ous(reinterpret_cast_mingw_only<sal_Unicode *>(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<const sal_Unicode *>(pru));
+ OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(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<XDriverManager2> 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<PropertyValue> 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<OTables*>(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<XPropertySet>& _xDescriptor)
+void OMySQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _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<XPropertySet> 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<OMySQLCatalog&>(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<XPropertySet> 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<OMySQLCatalog&>(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<XContainerListener*>(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<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
- ::rtl::OUString sCatalog,sSchema,sTable;
+ OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
Reference<XResultSet> 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<XRow> 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<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += ::rtl::OUString(" TO ");
+ sGrant += OUString(" TO ");
sGrant += m_Name;
Reference<XStatement> 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<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += ::rtl::OUString(" FROM ");
+ sGrant += OUString(" FROM ");
sGrant += m_Name;
Reference<XStatement> 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<XStatement> 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<XPropertySet> 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> xConnection = static_cast<OMySQLCatalog&>(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<OTables*>(static_cast<OMySQLCatalog&>(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 <cppuhelper/factory.hxx>
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 <cppuhelper/factory.hxx>
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>((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<sal_Int8>(reinterpret_cast<const sal_Int8*>(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<OSQLParseNode> 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 <typename T> 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<SQLUSMALLINT>::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<sal_Int8>(reinterpret_cast<const sal_Int8*>(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<sal_Int8>(reinterpret_cast<const sal_Int8*>(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<ORowSetValue>( 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<rtl::OUString>( columnIndex );
+ return getValue<OUString>( 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<SQLULEN, SQL_IS_UINTEGER>(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<SQLULEN, SQL_IS_UINTEGER>(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<SQLULEN, SQL_IS_UINTEGER>(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<sal_Int8> 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<sal_Int8> 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<sal_Int8> 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<sal_Int8> 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<sal_Int8> 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<sal_Int8> 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 <com/sun/star/script/Converter.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-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<rtl::OUString> ConnectionGetSupportedServiceNames(void)
+com::sun::star::uno::Sequence<OUString> 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 <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-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 <rtl/ustrbuf.hxx>
-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 <string.h>
-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;
-
- ::rtl::OUString NAME;
- ::rtl::OUString SCHEMA_NAME;
- ::rtl::OUString CATALOG_NAME;
- ::rtl::OUString DESCRIPTION;
- ::rtl::OUString TYPE;
- ::rtl::OUString TYPE_NAME;
- ::rtl::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;
-
- ::rtl::OUString cPERCENT;
-
- ::rtl::OUString BEGIN;
- ::rtl::OUString ROLLBACK;
- ::rtl::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;
-
- ::rtl::OUString KEY_COLUMN;
- ::rtl::OUString RELATED_COLUMN;
-
- ::rtl::OUString PASSWORD;
- ::rtl::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;
-
- ::rtl::OUString COMMAND;
- ::rtl::OUString CHECK_OPTION;
-
- ::rtl::OUString TRUE;
- ::rtl::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;
-
- ::rtl::OUString CATALOG;
- ::rtl::OUString IS_ASCENDING;
+ 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;
+
+ OUString NAME;
+ OUString SCHEMA_NAME;
+ OUString CATALOG_NAME;
+ OUString DESCRIPTION;
+ OUString TYPE;
+ OUString TYPE_NAME;
+ OUString PRIVILEGES;
+
+ OUString DEFAULT_VALUE;
+ OUString IS_AUTO_INCREMENT;
+ OUString IS_CURRENCY;
+ OUString IS_NULLABLE;
+ OUString IS_ROW_VERSISON;
+ OUString PRECISION;
+ OUString SCALE;
+
+ OUString cPERCENT;
+
+ OUString BEGIN;
+ OUString ROLLBACK;
+ OUString COMMIT;
+
+ OUString KEY;
+ OUString REFERENCED_TABLE;
+ OUString UPDATE_RULE;
+ OUString DELETE_RULE;
+ OUString PRIVATE_COLUMNS;
+ OUString PRIVATE_FOREIGN_COLUMNS;
+
+ OUString KEY_COLUMN;
+ OUString RELATED_COLUMN;
+
+ OUString PASSWORD;
+ OUString USER;
+
+ OUString CURSOR_NAME;
+ OUString ESCAPE_PROCESSING;
+ OUString FETCH_DIRECTION;
+ OUString FETCH_SIZE;
+ OUString IS_BOOKMARKABLE;
+ OUString RESULT_SET_CONCURRENCY;
+ OUString RESULT_SET_TYPE;
+
+ OUString COMMAND;
+ OUString CHECK_OPTION;
+
+ OUString TRUE;
+ OUString FALSE;
+
+ OUString IS_PRIMARY_KEY_INDEX;
+ OUString IS_CLUSTERED;
+ OUString IS_UNIQUE;
+ OUString PRIVATE_COLUMN_INDEXES;
+ OUString HELP_TEXT;
+
+ 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 <libpq-fe.h>
#include <string.h>
-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<T> sequence_of_vector ( const std::vector<T, Allocator> &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<bool,sal_Bool> m_isCatalogAtStart;
- ::std::pair<bool,::rtl::OUString> m_sCatalogSeparator;
- ::std::pair<bool,::rtl::OUString> m_sIdentifierQuoteString;
+ ::std::pair<bool,OUString> m_sCatalogSeparator;
+ ::std::pair<bool,OUString> m_sIdentifierQuoteString;
::std::pair<bool,sal_Bool> m_supportsCatalogsInTableDefinitions;
::std::pair<bool,sal_Bool> m_supportsSchemasInTableDefinitions;
::std::pair<bool,sal_Bool> 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<ORowSetValueDecoratorRef>::size_type i) const
+ OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::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<sal_Int32, TInt2IntMap > m_aValueRange;
::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter;
- ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> > m_aStrValueRange;
- ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> >::iterator m_aStrValueRangeIter;
+ ::std::map<sal_Int32, ::std::map< OUString,sal_Int32> > m_aStrValueRange;
+ ::std::map<sal_Int32, ::std::map< OUString,sal_Int32> >::iterator m_aStrValueRangeIter;
- ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> > m_aIntValueRange;
- ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> >::iterator m_aIntValueRangeIter;
+ ::std::map<sal_Int32, ::std::map< sal_Int32,OUString> > m_aIntValueRange;
+ ::std::map<sal_Int32, ::std::map< sal_Int32,OUString> >::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<sal_Int32>& 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<ADOParameter>::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<ADOView>::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<connectivity::OSQLColumns> 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<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable);
+ OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _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<sal_Int32, sal_Int32> 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<StreamHelper>,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
<arg>_bAllowSQLException</arg> is <TRUE/>
*/
- ::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. <OUT/>
*/
- 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 <member>m_xODBCDriver</member> or <member>m_xDBCDriver</member> may be <NULL/> 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<sal_Int8> 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 <rtl/ustring.hxx>
#include <connectivity/sqlnode.hxx>
-::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<sal_Int32 , rtl_uString*> 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<const sal_Char* , ::rtl::OUString > > _aStringToSubstitutes) const;
+ OUString getResourceStringWithSubstitution( ResourceId _nResId,
+ const ::std::list< ::std::pair<const sal_Char* , OUString > > _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<XPropertySet>& _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<XPropertySet> 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<XPropertySet>& _xColumn, const ::rtl::OUString& i_rOriginatingTableName,
+OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _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<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable)
+void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _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<OSQLColumns>& _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<OSQLColumns>& _rColum
}
}
//-----------------------------------------------------------------------------
-void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _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<OSQLColumns>& _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<OSQLColumns>& _
)
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<OSQLColumns>& _
{
// 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<OSQLColumns>& _
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<OSQLColumns>& _
}
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<OSQLColumns>& _
{
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<OSQLColumns>& _
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<OSQLColumns>& _
// 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<OSQLColumns>& _
}
}
//-----------------------------------------------------------------------------
-::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<OSQLColumns>& _
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<OSQLColumns>& _
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<XPropertySet> 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<XPropertySet> 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<XPropertySet> 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; i<nCount; i++)
{
const OSQLParseNode * pSubTree = m_aChildren[i];
@@ -476,7 +476,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString,
{
sal_Bool bFilter = sal_False;
// retrieve the fields name
- ::rtl::OUString aFieldName;
+ OUString aFieldName;
try
{
sal_Int32 nNamePropertyId = PROPERTY_ID_NAME;
@@ -545,7 +545,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString,
}
//-----------------------------------------------------------------------------
-bool OSQLParseNode::impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const
+bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::impl_parseTableNameNodeToString_throw" );
// is the table_name part of a table_ref?
@@ -563,7 +563,7 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer
try
{
- ::rtl::OUString sTableOrQueryName( getChild(0)->getTokenValue() );
+ 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;i<count();++i)
@@ -1733,7 +1733,7 @@ void OSQLParseNode::replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::
{
OSQLParseNode * pCol = removeAt((sal_uInt32)0);
append(new OSQLParseNode(rTableAlias,SQL_NODE_NAME));
- append(new OSQLParseNode(::rtl::OUString("."),SQL_NODE_PUNCTUATION));
+ append(new OSQLParseNode(OUString("."),SQL_NODE_PUNCTUATION));
append(pCol);
}
else
@@ -1758,18 +1758,18 @@ OSQLParseNode* OSQLParseNode::getByRule(OSQLParseNode::Rule eRule) const
//-----------------------------------------------------------------------------
OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
{
- 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(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<const sal_Char* , ::rtl::OUString > > _aStringToSubstitutes) const
+ OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+ const ::std::list< ::std::pair<const sal_Char* , OUString > > _aStringToSubstitutes) const
{
- ::rtl::OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
- ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > >::const_iterator aIter = _aStringToSubstitutes.begin();
- ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > >::const_iterator aEnd = _aStringToSubstitutes.end();
+ OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+ ::std::list< ::std::pair<const sal_Char* , OUString > >::const_iterator aIter = _aStringToSubstitutes.begin();
+ ::std::list< ::std::pair<const sal_Char* , OUString > >::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<OCatalog*>(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<sal_Int32>(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<sal_Int32>(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<XTypeProvider*>(this));
+ throw IndexOutOfBoundsException(OUString::valueOf(Index),static_cast<XTypeProvider*>(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<XTypeProvider*>(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<XTypeProvider*>(this));
+ throw IndexOutOfBoundsException(OUString::valueOf(index),static_cast<XTypeProvider*>(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<XContainer*>(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<XContainerListener*>(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<sal_Int32*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast<sal_Int32*>(0)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast<sal_Int32*>(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<OView*>(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 <map>
#include <list>
-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::map<rtl::OUString,
+typedef std::map<OUString,
ini_Section
>IniSectionMap;
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<XResultSet> xRes = xStmt->executeQuery(OUString("SELECT * FROM Tele"));
if(xRes.is())
{
- ::rtl::OUString aPat( "%s\t" );
+ OUString aPat( "%s\t" );
Reference<XRow> xRow(xRes,UNO_QUERY);
Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
for(sal_Int32 i=1;i<xMeta->getColumnCount();++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<rtl::OUString>()
+ Sequence<OUString>()
);
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<rtl::OUString>() );
+ Sequence<OUString>() );
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<rtl::OUString>() );
+ Sequence<OUString>() );
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<glyphsCount; i++) {
rMF >> 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<graphic::XGraphic > > 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<graphic::XGraphic > > 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 <com/sun/star/container/XChild.hpp>
#include <com/sun/star/frame/UICommandDescription.hpp>
-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<XDictionary> 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<XDictionary> xDict) { m_xDictionary = xDict; }
Reference<XDictionary> 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<XDictionaryEntry> xEntry = xChangeAll->getEntry(rString);
@@ -1750,10 +1749,10 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
DBG_ASSERT(static_cast<const SpellErrorAttrib*>(
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 <cmath>
#include <limits>
-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<unsigned>(cChar) );
if( cChar < 0x0100 )
snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(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<m_cmbSearchText.GetEntryCount(); ++i, ++pHistory)
*pHistory = m_cmbSearchText.GetEntry(i);
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index eec7c36c2d3f..ce6581001dce 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -822,12 +822,12 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
// ------------------------------------------------------------------------
-::rtl::OUString TPGalleryThemeProperties::addExtension( const ::rtl::OUString& _rDisplayText, const ::rtl::OUString& _rExtension )
+OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
{
- ::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
- ::rtl::OUString sOpenBracket( " (" );
- ::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
- ::rtl::OUString sRet = _rDisplayText;
+ OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
+ OUString sOpenBracket( " (" );
+ OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+ OUString sRet = _rDisplayText;
if ( sRet.indexOf( sAllFilter ) == -1 )
{
@@ -901,7 +901,7 @@ void TPGalleryThemeProperties::FillFilterList()
}
// media filters
- static const ::rtl::OUString aWildcard( "*." );
+ static const OUString aWildcard( "*." );
::avmedia::FilterNameVector aFilters;
::avmedia::MediaWindow::getMediaFilters( aFilters );
@@ -909,7 +909,7 @@ void TPGalleryThemeProperties::FillFilterList()
{
for( sal_Int32 nIndex = 0; nIndex >= 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 <com/sun/star/linguistic2/LinguServiceManager.hpp>
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 <algorithm>
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<rtl::OUString> aFormatText;
+ std::set<OUString> aFormatText;
DoubleStringTable aDoubleStringTable;
CollatorWrapper* pCompareClass;
CharClass* pCharClass;
@@ -287,8 +287,8 @@ public:
struct StringsArrays
{
- std::vector<rtl::OUString> aAbbrevStrings;
- std::vector<rtl::OUString> aDoubleCapsStrings;
+ std::vector<OUString> aAbbrevStrings;
+ std::vector<OUString> 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 <NULL/>, 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<rtl::OUString> aGrfNames;
+ std::vector<OUString> 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 <boost/unordered_map.hpp>
#include <vector>
-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<rtl::OUString*>(pCertPath) : rtl::OUString();
+ return pCertPath ? *static_cast<OUString*>(pCertPath) : OUString();
}
CertPathDialog::~CertPathDialog()
@@ -174,7 +174,7 @@ CertPathDialog::~CertPathDialog()
SvTreeListEntry* pEntry = m_aCertPathList.First();
while (pEntry)
{
- rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData());
+ OUString* pCertPath = static_cast<OUString*>(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<rtl::OUString*>(pEntry->GetUserData());
+ OUString* pCertPath = static_cast<OUString*>(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<ui::dialogs::XFolderPicker2> 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<Chapter>(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 <sal/types.h>
+#include <rtl/ustring.hxx>
#include <vector>
-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<rtl::OUString> aNames(1);
+ Sequence<OUString> 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<rtl::OUString> aList;
+ std::vector<OUString> aList;
sal_uInt16 nSelPos=0;
pNumFmtShell->GetCurrencySymbols(aList, &nSelPos);
- for(std::vector<rtl::OUString>::iterator i = aList.begin() + 1;i != aList.end(); ++i)
+ for(std::vector<OUString>::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 <cppuhelper/implementationentry.hxx>
-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
<TRUE/> if the command is allowed, otherwise <FALSE/>.
*/
- 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<XAppend> 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<XDatabaseMetaData> 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<sal_Bool> m_aSignedFlags;
::com::sun::star::uno::Sequence<sal_Int32> 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<SelectColumnsMetaData>& 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<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
- 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<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
+ 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<XComponentContext>& _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<XTablesSupplier>(_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<XNameAccess> xQueryColumns = xQueryColSup->getColumns();
const Reference<XTablesSupplier> xTabSup(m_xComposer,UNO_QUERY);
const Reference<XNameAccess> 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<XSingleSelectQueryComposer> 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<OSQLParseNode> 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<XDatabaseMetaData> 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<XDatabaseMetaData> 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<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL));
@@ -515,8 +515,8 @@ namespace
};
struct TableNameFunctor : ::std::unary_function<SelectColumnsMetaData::value_type,bool>
{
- ::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 <sal_Int8> 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<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)
: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<XTablesSupplier> xTabSup(_xAnalyzer,UNO_QUERY);
OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!");
Reference<XNameAccess> 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<XPropertySet> 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<XNameAccess> 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> 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<XMultiServiceFactory> 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<XDatabaseMetaData> 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<XPropertySet> xSource(xColumns->getByName( *pIter ),UNO_QUERY);
- ::rtl::OUString sLabel = *pIter;
+ OUString sLabel = *pIter;
if ( xColumnDefinitions.is() && xColumnDefinitions->hasByName(*pIter) )
{
Reference<XPropertySet> 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> 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<XPropertySet> 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<XPropertySet> xProp(Reference<XIndexAccess>(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<XIndexAccess>(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<OResultSet*>(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> 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> 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<XTypeProvider*>(static_cast<OFilteredContainer*>(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<XPropertySet> 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<XTypeProvider*>(static_cast<OFilteredContainer*>(this)));
- ::rtl::OUString aSql("DROP VIEW ");
+ OUString aSql("DROP VIEW ");
aSql += sComposedName;
Reference<XConnection> 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<XPropertySet> 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<XPropertySet> 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; i<aElementNames.getLength(); ++i )
{
if ( xRootStor->isStorageElement( 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<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException )
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& 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<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException )
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& 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<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException )
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& 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<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException )
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException )
{ OComponentDefinition::removeVetoableChangeListener(p1, p2); }
virtual com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> 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<com::sun::star::ucb::XContentEventListener>& 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<XComponentContext> m_xContext;
// </properties>
- ::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;
// </properties>
};
@@ -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<XComponentContext> 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> 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<OContentHelper> getContent(const ::rtl::OUString& _sName) const;
+ ::rtl::Reference<OContentHelper> 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<XContent> m_xParentContainer;
public:
ODocumentSaveContinuation() { }
inline Reference<XContent> 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<XContent>& _xParent) throw(RuntimeException);
+ virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException);
};
- void SAL_CALL ODocumentSaveContinuation::setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException)
+ void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _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<XNameAccess> 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<OContentHelper_Impl> 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_Int8> 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 <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> 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.<BR>
After using this method the object may be reconstructed by calling one of the <code>constrcuct</code> methods.
@@ -87,7 +87,7 @@ namespace dbaccess
/** retrieve a table type filter to pass to <member scope="com::sun::star::sdbc">XDatabaseMetaData::getTables</member>,
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 <type scope="com::sun::star::sdbc">XConnection</type>
@@ -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<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries
::std::vector<OPrivateTables*> 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<OPrivateColumns*> 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;
// <properties>
- ::rtl::OUString m_sOrignal;
+ OUString m_sOrignal;
// </properties>
@@ -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<bool,OSingleSelectQueryComposer,::rtl::OUString>& _aSetFunctor
+ ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString>& _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:
// <properties>
- ::rtl::OUString m_sName;
+ OUString m_sName;
// </properties>
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<rtl::OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
+ typedef ::boost::unordered_map<OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
typedef ::std::vector<OColumn*> 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
// <properties>
::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;
// </properties>
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:
// <properties>
- ::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:
// <properties>
- 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
{
// <properties>
- ::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;
// </properties>
::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.<BR>
@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.<BR>
@@ -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.<BR>
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<XComponentContext> & _rContext, const Any& _rError )
+ OUString extractExceptionMessage( const Reference<XComponentContext> & _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<XComponentContext>& 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<XComponentContext>& 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<XComponentContext>& 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<XComponentContext>& 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<XComponentContext>& 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<XComponentContext>& 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<ODBFilter&>(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; i<aSupported.getLength(); ++i, ++pSupported) \
if (pSupported->equals(_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<BR>
- <code>static ::rtl::OUString getImplementationName_Static()</code><BR>
- <code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><BR>
+ <code>static OUString getImplementationName_Static()</code><BR>
+ <code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR>
and<BR>
<code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code><BR>
@@ -118,8 +118,8 @@ class OOneInstanceAutoRegistration
{
public:
/** provided that the template argument has three methods<BR>
- <code>static ::rtl::OUString getImplementationName_Static()</code><BR>
- <code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><BR>
+ <code>static OUString getImplementationName_Static()</code><BR>
+ <code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR>
and<BR>
<code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code><BR>
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; i<nLen; ++i, ++pImplNames)
{
if (pImplNames->equals(_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
<TRUE/> if it is a table, otherwise <FALSE/>
@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
<TRUE/> if it is a table, otherwise <FALSE/>
@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
<TRUE/> if it is a table, otherwise <FALSE/>
@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<sal_Int64>(pTextLen->GetValue()));
+ return OUString::valueOf(static_cast<sal_Int64>(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<sal_Int32>(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 <<none>>
- ::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<XPropertySet> 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<XColumnsSupplier> xSup(_xDest,UNO_QUERY);
Reference<XNameAccess> 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<nCount; ++i )
{
- ::rtl::OUString sPropertyName( aProperties[i].Name );
+ OUString sPropertyName( aProperties[i].Name );
if ( sPropertyName == "Label" )
{
aProperties[i].Value >>= 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<Reference< XGraphic> > 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<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager())));
- Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument"));
+ Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(OUString("com.sun.star.sdb.OfficeDatabaseDocument"));
Reference<XImageManager> 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<XInterface>(),eClass,eError,aValues);
@@ -253,7 +253,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView)
Reference<XNameAccess> 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> 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<sal_uInt16, ::rtl::OUString> 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<sal_uInt16, OUString> 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<nCnt ; i+=2 )
{
- rtl::OUString sTVal(
+ OUString sTVal(
static_cast< sal_Unicode >(
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<XPropertySet> 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> 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
<FALSE/> if an error occurred, otherwise <TRUE/>
*/
- 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<sal_Unicode *>(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 <osl/module.h>
#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<sal_Int32>(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<XCommandEnvironment>(), 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<XComponentContext> & 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<XComponentContext> & 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<PathId>(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<XDatabaseMetaData> 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<const char*>(szDSN),pcbDSN, nTextEncoding);
+ OUString aCurrentDsn(reinterpret_cast<const char*>(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<XPropertySet> 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. <schema>.<table> becomes "<schema>"."<table>"
- ::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<XPropertySet> 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<XPropertySet> 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<XDatabaseMetaData> 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 ; i<DOG_ROWS; i++ )
{
if(m_aColumnList[i]->GetSelectEntryPos() != 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<XModifiable> 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 <member>m_aTablesList</member> according to <arg>_rTables</arg>
*/
- 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 <member>m_aTablesList</member>
*/
- ::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<TColumns::const_iterator> TColumnVector;
typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > 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<ORelationDesignView*>( 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 <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>.
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 <TRUE/> 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<ODbDataSourceAdministrationHelper> 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; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/>
@@ -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 <rtl/ustring.hxx>
+
namespace dbtools { class SQLExceptionInfo; }
//........................................................................
@@ -48,7 +49,7 @@ namespace dbaui
<TRUE/> 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; i<aContained.getLength(); ++i, ++pContained) \
nLen += m_aListeners.getContainer(*pContained)->getLength(); \
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:
// <properties>
::com::sun::star::uno::Any m_aException;
- ::rtl::OUString m_sHelpURL;
+ OUString m_sHelpURL;
// </properties>
protected:
@@ -47,12 +47,12 @@ 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 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<sal_Int32>(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<sal_Int32>(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<sal_Int32>( 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<sal_Int32>( 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<XPropertySet> 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<XColumnsSupplier> 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<XResultSetMetaDataSupplier>(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<XConnection>& i_rSourceConnection,
- const ::rtl::OUString& i_rCommand, const sal_Int32 i_nCommandType,
+void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const Reference<XConnection>& 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<XConnection>& i_rDestConnection)
+ const OUString& i_rDestDataSource, const Reference<XConnection>& 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<XConnection> 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<XColumnsSupplier> xColSup(m_xObject,UNO_QUERY);
Reference<XNameAccess> 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<XPropertySet> 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<sal_Int32>(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<XNameAccess> 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<XPropertySet> 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
// <FONT FACE="xxx">
- ::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> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
::connectivity::ORowSetValue aValue;
::std::vector<sal_Int32> aTypes;
@@ -664,13 +664,13 @@ void setColumnProperties(const Reference<XPropertySet>& _rxColumn,const OFieldDe
_rxColumn->setPropertyValue(PROPERTY_AUTOINCREMENTCREATION,makeAny(_pFieldDesc->GetAutoIncrementValue()));
}
// -----------------------------------------------------------------------------
-::rtl::OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const Reference<XNameAccess>& _xTables,const ::rtl::OUString& _sName)
+OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const Reference<XNameAccess>& _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<XPropertySet>& _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>& _xConnection,
- const ::rtl::OUString& _sName,
+ const OUString& _sName,
const Reference< XComponentContext >& _rxContext,
Window* _pParent)
{
@@ -1010,12 +1010,12 @@ sal_Bool appendToFilter(const Reference<XConnection>& _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>& _xConnection)
// -----------------------------------------------------------------------------
void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource,
sal_Bool& _rAutoIncrementValueEnabled,
- ::rtl::OUString& _rsAutoIncrementValue)
+ OUString& _rsAutoIncrementValue)
{
if ( _xDatasource.is() )
{
@@ -1143,7 +1143,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _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<XPropertySet>& _xDatasource,
// -----------------------------------------------------------------------------
void fillAutoIncrementValue(const Reference<XConnection>& _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>& _xConnection,
}
}
// -----------------------------------------------------------------------------
-::rtl::OUString getStrippedDatabaseName(const Reference<XPropertySet>& _xDataSource,::rtl::OUString& _rsDatabaseName)
+OUString getStrippedDatabaseName(const Reference<XPropertySet>& _xDataSource,OUString& _rsDatabaseName)
{
if ( _rsDatabaseName.isEmpty() && _xDataSource.is() )
{
@@ -1174,27 +1174,27 @@ void fillAutoIncrementValue(const Reference<XConnection>& _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<XViewsSupplier> 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<XPropertySet> createView( const ::rtl::OUString& _rName, const Reference< XConnection >& _rxConnection
+Reference<XPropertySet> createView( const OUString& _rName, const Reference< XConnection >& _rxConnection
,const Reference<XPropertySet>& _rxSourceObject)
{
- ::rtl::OUString sCommand;
+ OUString sCommand;
Reference< XPropertySetInfo > xPSI( _rxSourceObject->getPropertySetInfo(), UNO_SET_THROW );
if ( xPSI->hasPropertyByName( PROPERTY_COMMAND ) )
{
@@ -1483,7 +1483,7 @@ Reference<XPropertySet> 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> xNameAccess( _xNames, UNO_QUERY );
- ::rtl::OUString sName = _sParentFolder;
+ OUString sName = _sParentFolder;
if ( _xNames->hasByHierarchicalName(sName) )
{
Reference<XChild> 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<XPropertySet> 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<XContent > 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<XNameAccess> 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<XKeysSupplier>& _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> 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<OWizTypeSelect*>(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> 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<XPropertySet> 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;
// </properties>
- ::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<XHierarchicalNameContainer> 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; i<m_aList.getLength(); ++i, ++pMyStrings, ++pCompareStrings)
if (!pMyStrings->equals(*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<sal_Int32>((*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<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); }
+ inline OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(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<OQueryTableView*>(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<OTableFieldInfo*>(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<OQueryTableWindowData*>(GetData().get())->GetAliasName();
}
- void SetAliasName(const ::rtl::OUString& strNewAlias)
+ void SetAliasName(const OUString& strNewAlias)
{
static_cast<OQueryTableWindowData*>(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<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rColumnName,sal_Int32 _nKeyType)
+ sal_Bool isColumnInKeyType(const Reference<XIndexAccess>& _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<XIndexAccess> 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<XPropertySet> 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<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKeys,const ::rtl::OUString& _rReferencedTable)
+Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKeys,const OUString& _rReferencedTable)
{
if(!_rxKeys.is())
return Reference<XPropertySet>();
@@ -449,7 +449,7 @@ Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _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<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKey
return Reference<XPropertySet>();
}
//------------------------------------------------------------------------------
-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<XNameAccess> xFKeyColumns;
- ::rtl::OUString aReferencedTable;
+ OUString aReferencedTable;
Reference<XColumnsSupplier> 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<XDatabaseMetaData>& _xMetaData,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction)
+sal_Bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName,const OUString& _sTableRange,const Reference<XDatabaseMetaData>& _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<XPropertySet> 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
<TRUE/> if the table name was set otherwise <FALSE/>
*/
- 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<nIdx;++i)
- m_aCriteria.push_back( ::rtl::OUString());
+ m_aCriteria.push_back( OUString());
m_aCriteria.push_back(rCrit);
}
}
//------------------------------------------------------------------------------
-::rtl::OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const
+OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const
{
DBG_CHKTHIS(OTableFieldDesc,NULL);
- ::rtl::OUString aRetStr;
+ OUString aRetStr;
if( nIdx < m_aCriteria.size())
aRetStr = m_aCriteria[nIdx];
@@ -144,11 +144,11 @@ void OTableFieldDesc::SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit
// -----------------------------------------------------------------------------
namespace
{
- struct SelectPropertyValueAsString : public ::std::unary_function< PropertyValue, ::rtl::OUString >
+ 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<XNameAccess> 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;i<xKeys->getCount();++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<XNameAccess> 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<XPropertySet> 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<XNameAccess> 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<XPropertySet> 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<OTableWindowData>,::comphelper::UStringMixLess,TTableDataHelper);
+ DECLARE_STL_MAP(OUString,::boost::shared_ptr<OTableWindowData>,::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<XPropertySet> 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<XColumnsSupplier> xColsSup(xKey,UNO_QUERY);
OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!");
const Reference<XNameAccess> 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<XPropertySet> 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<XConnection> 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<XPropertySet> 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<XNameAccess>& _rxTable,const ::rtl::OUString& _sTableName)
+ void dropTable(const Reference<XNameAccess>& _rxTable,const OUString& _sTableName)
{
if ( _rxTable->hasByName(_sTableName) )
{
@@ -112,9 +112,9 @@ namespace
}
}
//------------------------------------------------------------------------------
- struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr<OTableRow> , ::rtl::OUString, bool>
+ struct OTableRowCompare : public ::std::binary_function< ::boost::shared_ptr<OTableRow> , OUString, bool>
{
- bool operator() (const ::boost::shared_ptr<OTableRow> lhs, const ::rtl::OUString& rhs) const
+ bool operator() (const ::boost::shared_ptr<OTableRow> 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<XNameAccess> 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<XNameAccess> 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<OTableRow> >::iterator aIter = m_vRowList.begin();
::std::vector< ::boost::shared_ptr<OTableRow> >::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<XPropertySet> 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<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */);
+ InsertHandleColumn(static_cast<sal_uInt16>(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 knnen nicht verndert werden
Reference<XPropertySet> 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<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().isAutoIncrementValueEnabled();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OTableFieldControl::getAutoIncrementValue() const
+OUString OTableFieldControl::getAutoIncrementValue() const
{
return const_cast<OTableFieldControl*>(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_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);
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<XObjectOutputStream>& /*_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<OFieldDescControl*>( 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_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);
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_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);
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_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);
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_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);
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_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);
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<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
{ ODatabaseAdministrationDialog::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::uno::RuntimeException)
{ ODatabaseAdministrationDialog::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
{ ODatabaseAdministrationDialog::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::uno::RuntimeException)
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& 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<XInitialization> > {};
+class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
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<XMultiServiceFactory> 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 <osl/thread.hxx>
#include <rtl/instance.hxx>
-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() ?
- "<default_printer>" : ::rtl::OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ "<default_printer>" : 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<sal_Unicode>(';') );
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<TheExtensionManager> 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<TheExtensionManager> 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<UpdateCommandEnv> 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<OUString, cssu::Exception > >::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
&ldquo;unknown&rdquo; 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 <code>optional</code> 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 <code>optional</code> 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<css::ucb::XCommandEnvironment> const & xCmdEnv )
{
if (xCmdEnv.is()) {
@@ -52,16 +52,16 @@ public:
inline ~ProgressLevel();
inline ProgressLevel(
css::uno::Reference<css::ucb::XCommandEnvironment> 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 <typename Unique, sal_uInt16 id>
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<rtl::OUString>() );
+ return OUString( rContent.getPropertyValue(
+ OUString::createFromAscii( "Title" ) ).get<OUString>() );
}
// 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<css::ucb::XCommandEnvironment> 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<css::ucb::XCommandEnvironment> const & xCmdEnv,
bool throw_exc = true );
//==============================================================================
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool erase_path(
- ::rtl::OUString const & url,
+ OUString const & url,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<ucb::XCommandEnvironment> 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<css::io::XInputStream> 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::task::XAbortChannel>(),
css::uno::Reference<css::ucb::XCommandEnvironment>());
} catch (...) {
@@ -212,7 +211,7 @@ Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
}
css::uno::Reference<css::deployment::XPackageManager>
-ExtensionManager::getPackageManager(::rtl::OUString const & repository)
+ExtensionManager::getPackageManager(OUString const & repository)
throw (css::lang::IllegalArgumentException)
{
Reference<deploy::XPackageManager> 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<css::uno::Reference<css::deployment::XPackage> >,
- ::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<css::deployment::XPackage> SAL_CALL addExtension(
- ::rtl::OUString const & url,
+ OUString const & url,
css::uno::Sequence<css::beans::NamedValue> const & properties,
- ::rtl::OUString const & repository,
+ OUString const & repository,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
throw (css::deployment::DeploymentException,
@@ -128,7 +128,7 @@ public:
virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
SAL_CALL getDeployedExtensions(
- ::rtl::OUString const & repository,
+ OUString const & repository,
css::uno::Reference<css::task::XAbortChannel> const &,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<css::uno::Reference<css::deployment::XPackage> >
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<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
getExtensionsWithUnacceptedLicenses(
- ::rtl::OUString const & repository,
+ OUString const & repository,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<css::deployment::XPackageManager> getUserRepository();
css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
@@ -230,15 +230,15 @@ private:
css::uno::Reference<css::deployment::XPackageManager> getTmpRepository();
css::uno::Reference<css::deployment::XPackageManager> getBakRepository();
- bool isUserDisabled(::rtl::OUString const & identifier,
- ::rtl::OUString const & filename);
+ bool isUserDisabled(OUString const & identifier,
+ OUString const & filename);
bool isUserDisabled(
css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > 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<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
@@ -250,33 +250,33 @@ private:
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
::std::list<css::uno::Reference<css::deployment::XPackage> >
- 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<css::deployment::XPackage> backupExtension(
- ::rtl::OUString const & identifier, ::rtl::OUString const & fileName,
+ OUString const & identifier, OUString const & fileName,
css::uno::Reference<css::deployment::XPackageManager> const & xPackageManager,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
void checkInstall(
- ::rtl::OUString const & displayName,
+ OUString const & displayName,
css::uno::Reference<css::ucb::XCommandEnvironment> const & cmdEnv);
void checkUpdate(
- ::rtl::OUString const & newVersion,
- ::rtl::OUString const & newDisplayName,
+ OUString const & newVersion,
+ OUString const & newDisplayName,
css::uno::Reference<css::deployment::XPackage> const & oldExtension,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
void addExtensionsToMap(
id2extensions & mapExt,
css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExt,
- ::rtl::OUString const & repository);
+ OUString const & repository);
css::uno::Reference<css::deployment::XPackageManager>
- 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<deployment::XExtensionManager> 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<deployment::XExtensionManager> 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<deployment::XExtensionManager> 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<deployment::XPackage > > >
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<XCommandEnvironment>(), m_xComponentContext);
::rtl::ByteSequence data = dp_misc::readFile(remFileContent);
- ::rtl::OString osData(reinterpret_cast<const sal_Char*>(data.getConstArray()),
+ OString osData(reinterpret_cast<const sal_Char*>(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<task::XAbortChannel> const & /*xAbortChannel*/,
Reference<XCommandEnvironment> 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<css::io::XInputStream> 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<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
if (INetContentTypes::parse( data.mediaType, type, subType, &params ))
{
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<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
- OUString const & id, ::rtl::OUString const & fileName,
+ OUString const & id, OUString const & fileName,
Reference<XCommandEnvironment> 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<css::uno::XComponentContext> 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<css::ucb::XCommandEnvironment> const & xCmdEnv );
- ::rtl::OUString detectMediaType(
+ OUString detectMediaType(
::ucbhelper::Content const & ucbContent, bool throw_exc = true );
- ::rtl::OUString insertToActivationLayer(
+ OUString insertToActivationLayer(
css::uno::Sequence<css::beans::NamedValue> 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<css::deployment::XPackage> const & xPackage,
- ::rtl::OUString const & destFolder );
+ OUString const & destFolder );
bool isInstalled(
css::uno::Reference<css::deployment::XPackage> const & package);
@@ -124,7 +124,7 @@ protected:
virtual ~PackageManagerImpl();
inline PackageManagerImpl(
css::uno::Reference<css::uno::XComponentContext>
- 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<css::deployment::XPackageManager> create(
css::uno::Reference<css::uno::XComponentContext>
- 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<css::deployment::XPackageTypeInfo> > SAL_CALL
@@ -164,9 +164,9 @@ public:
createAbortChannel() throw (css::uno::RuntimeException);
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage(
- ::rtl::OUString const & url,
+ OUString const & url,
css::uno::Sequence<css::beans::NamedValue> const & properties,
- ::rtl::OUString const & mediaType,
+ OUString const & mediaType,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<css::deployment::XPackage> SAL_CALL getDeployedPackage_(
- ::rtl::OUString const & id, ::rtl::OUString const & fileName,
+ OUString const & id, OUString const & fileName,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
css::uno::Reference<css::deployment::XPackage> getDeployedPackage_(
- ::rtl::OUString const & id, ActivePackages::Data const & data,
+ OUString const & id, ActivePackages::Data const & data,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
bool ignoreAlienPlatforms = false );
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL
getDeployedPackage(
- ::rtl::OUString const & id, ::rtl::OUString const & fileName,
+ OUString const & id, OUString const & fileName,
css::uno::Reference<css::ucb::XCommandEnvironment> 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<deployment::XPackageManager> m_xBakMgr;
typedef ::boost::unordered_map<
OUString, WeakReference<deployment::XPackageManager>,
- ::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<css::io::XInputStream> 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<css::ucb::XCommandEnvironment> m_xCmdEnv;
const css::uno::Reference<css::uno::XComponentContext> 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<css::ucb::XCommandEnvironment> const & xCmdEnv,
css::uno::Reference<css::uno::XComponentContext> const & xContext);
- ExtensionProperties(::rtl::OUString const & urlExtension,
+ ExtensionProperties(OUString const & urlExtension,
css::uno::Sequence<css::beans::NamedValue> const & properties,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
css::uno::Reference<css::uno::XComponentContext> 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<css::uno::XComponentContext>& 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<css::xml::dom::XNode> 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<nLen; i++) {
@@ -479,12 +478,12 @@ bool DescriptionInfoset::checkBlacklistVersion(
return false;
}
-::rtl::OUString DescriptionInfoset::getVersion() const
+OUString DescriptionInfoset::getVersion() const
{
return getNodeValueFromExpression( "desc:version/@value" );
}
-css::uno::Sequence< ::rtl::OUString > 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<SimpleLicenseAttributes>();
}
-::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<css::xml::dom::XNode> 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<sal_Int32>(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<sal_Int32>(bytes[ i ]), 0x10 );
}
@@ -462,14 +460,14 @@ Reference<XInterface> 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<sal_Unicode>('_') );
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<std::pair<Reference<deployment::XPackage>, 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<XComponentContext> 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<css::uno::XComponentContext> 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<XCommandEnvironment> 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<XInterface>,
- ::rtl::OUStringHash > t_string2object;
+ OUStringHash > t_string2object;
t_string2object m_backendObjects;
// PackageRegistryBackend
@@ -673,7 +672,7 @@ Reference<deployment::XPackage> 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<deployment::XPackage> 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<deployment::XPackage> 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<deployment::XPackage> 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<XCommandEnvironment> 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<XCommandEnvironment> 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<XCommandEnvironment> 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<XCommandEnvironment> 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<XCommandEnvironment> 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<XCommandEnvironment> 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<XComponentContext> 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<registry::XSimpleRegistry> 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<XCommandEnvironment> 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<XCommandEnvironment> 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<PersistentMap> 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<XCommandEnvironment> 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<sal_Bool> >(
@@ -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<sal_Char const *>(
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<XComponentContext> 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::Data>
-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<css::uno::XComponentContext> 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<Data> getEntry(::rtl::OUString const & url);
- ::std::list< ::rtl::OUString> getAllDataUrls();
+ ::boost::optional<Data> 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<css::uno::XComponentContext> const & xContext,
- ::rtl::OUString const & url):
+ OUString const & url):
m_xContext(xContext)
{
m_urlDb = dp_misc::expandUnoRcUrl(url);
@@ -119,7 +118,7 @@ Reference<css::xml::xpath::XXPathAPI> 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<css::xml::dom::XNode> 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<css::xml::dom::XNode> 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<css::xml::dom::XNode> const & xParent)
@@ -463,7 +462,7 @@ void BackendDb::writeSimpleElement(
element.
*/
Reference<css::xml::dom::XNode> BackendDb::writeKeyElement(
- ::rtl::OUString const & url)
+ OUString const & url)
{
try
{
@@ -579,7 +578,7 @@ OUString BackendDb::readSimpleElement(
Reference<css::xml::xpath::XXPathAPI> 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<XComponentContext> 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<deployment::XPackageRegistry> const & xBackend )
{
m_allBackends.insert( xBackend );
- typedef ::boost::unordered_set<OUString, ::rtl::OUStringHash> t_stringset;
+ typedef ::boost::unordered_set<OUString, OUStringHash> t_stringset;
t_stringset ambiguousFilters;
const Sequence< Reference<deployment::XPackageTypeInfo> > 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<deployment::XPackageRegistry> 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<deployment::XPackageRegistry> PackageRegistryImpl::create(
that->m_ambiguousBackends.begin() );
iPos != that->m_ambiguousBackends.end(); ++iPos )
{
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append(
Reference<lang::XServiceInfo>(
*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<XInterface>,
- ::rtl::OUStringHash > t_string2object;
+ OUStringHash > t_string2object;
// PackageRegistryBackend
virtual Reference<deployment::XPackage> 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<XComponentContext> 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<css::uno::XComponentContext> 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<ucb::XCommandEnvironment> 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<HelpBackendDb::Data> readDataFromDb(OUString const & url);
@@ -132,7 +131,7 @@ BackendImpl::BackendImpl(
Reference<XComponentContext> 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<OWeakObject *>(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<OWeakObject *>(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<XComponentContext> 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::Data>
-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<css::uno::XComponentContext> 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<Data> getEntry(::rtl::OUString const & url);
+ ::boost::optional<Data> 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<PackageRegistryBackend> 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<css::deployment::XPackageTypeInfo> 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<PackageRegistryBackend> 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<css::deployment::XPackageTypeInfo> const &
xPackageType,
bool bRemoved,
- ::rtl::OUString const & identifier);
+ OUString const & identifier);
public:
class TypeInfo :
public ::cppu::WeakImplHelper1<css::deployment::XPackageTypeInfo>
{
- 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<css::deployment::XPackageTypeInfo> 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<css::ucb::XCommandEnvironment> 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<css::deployment::XPackage>,
- ::rtl::OUStringHash > t_string2ref;
+ OUString, css::uno::Reference<css::deployment::XPackage>,
+ OUStringHash > t_string2ref;
t_string2ref m_bound;
protected:
- ::rtl::OUString m_cachePath;
+ OUString m_cachePath;
css::uno::Reference<css::uno::XComponentContext> 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<css::deployment::XPackage> 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<css::ucb::XCommandEnvironment> 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<css::ucb::XCommandEnvironment> 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<css::deployment::XPackage> const & extension,
css::uno::Reference<css::deployment::XPackage> 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<css::uno::XComponentContext> 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<css::deployment::XPackage> 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<css::ucb::XCommandEnvironment> 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<css::uno::XComponentContext> m_xContext;
- ::rtl::OUString m_urlDb;
+ OUString m_urlDb;
protected:
@@ -64,88 +64,88 @@ protected:
*/
css::uno::Reference<css::xml::xpath::XXPathAPI> getXPathAPI();
void save();
- void removeElement(::rtl::OUString const & sXPathExpression);
+ void removeElement(OUString const & sXPathExpression);
css::uno::Reference<css::xml::dom::XNode> 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<css::xml::dom::XNode> 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<css::xml::dom::XNode> const & xParent);
void writeSimpleElement(
- ::rtl::OUString const & sElementName, ::rtl::OUString const & value,
+ OUString const & sElementName, OUString const & value,
css::uno::Reference<css::xml::dom::XNode> const & xParent);
css::uno::Reference<css::xml::dom::XNode> writeKeyElement(
- ::rtl::OUString const & url);
+ OUString const & url);
- ::rtl::OUString readSimpleElement(
- ::rtl::OUString const & sElementName,
+ OUString readSimpleElement(
+ OUString const & sElementName,
css::uno::Reference<css::xml::dom::XNode> const & xParent);
- ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > >
+ ::std::vector< ::std::pair< OUString, OUString > >
readVectorOfPair(
css::uno::Reference<css::xml::dom::XNode> 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<css::xml::dom::XNode> 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<css::uno::XComponentContext> 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<css::uno::XComponentContext> 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<XComponentContext> 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<css::uno::XComponentContext> 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<sal_Char const *>(
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<css::ucb::XCommandEnvironment> const & xCmdEnv,
css::uno::Reference<css::uno::XComponentContext> 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<XComponentContext> 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<css::uno::XComponentContext> 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<vModulesInfo.size(); ++i)
{
- ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
+ OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
if (sModuleIdentifier.isEmpty())
continue;
uno::Sequence< uno::Any > 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<nToolbars; ++j)
{
- ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
- ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
+ OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
+ OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
uno::Reference< container::XIndexContainer > 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<tmpSeq.getLength(); j++)
@@ -551,10 +549,10 @@ OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir)
void MigrationImpl::setInstallInfoIfExist(
install_info& aInfo,
- const ::rtl::OUString& rConfigDir,
- const ::rtl::OUString& rVersion)
+ const OUString& rConfigDir,
+ const OUString& rVersion)
{
- rtl::OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::NO_DECODE));
+ OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::NO_DECODE));
osl::DirectoryItem item;
osl::FileStatus stat(osl_FileStatus_Mask_Type);
@@ -583,7 +581,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions)
strings_v::const_iterator i_ver = rVersions.begin();
while (i_ver != rVersions.end())
{
- ::rtl::OUString aVersion, aProfileName;
+ OUString aVersion, aProfileName;
sal_Int32 nSeparatorIndex = (*i_ver).indexOf('=');
if ( nSeparatorIndex != -1 )
{
@@ -629,9 +627,9 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available
}
OSL_TRACE( " preferred migration is from product '%s'\n",
- rtl::OUStringToOString( m_aInfo.productname, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OUStringToOString( m_aInfo.productname, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( " and settings directory '%s'\n",
- rtl::OUStringToOString( m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OUStringToOString( m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US ).getStr() );
return nIndex;
}
@@ -744,19 +742,19 @@ strings_vr MigrationImpl::compileFileList()
namespace {
struct componentParts {
- std::set< rtl::OUString > 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<nLength; ++i)
{
- ::rtl::OUString sModuleShortName = lNames[i];
+ OUString sModuleShortName = lNames[i];
uno::Reference< embed::XStorage > 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<lToolbars.getLength(); ++j)
{
- ::rtl::OUString sToolbarName = lToolbars[j];
+ OUString sToolbarName = lToolbars[j];
if (sToolbarName.getLength()>=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<nCount; ++i)
{
- ::rtl::OUString sCommandURL;
- ::rtl::OUString sLabel;
+ OUString sCommandURL;
+ OUString sLabel;
uno::Reference< container::XIndexContainer > xChild;
uno::Sequence< beans::PropertyValue > aPropSeq;
xTemp->getByIndex(i) >>= aPropSeq;
for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j)
{
- ::rtl::OUString sPropName = aPropSeq[j].Name;
+ OUString sPropName = aPropSeq[j].Name;
if ( sPropName == ITEM_DESCRIPTOR_COMMANDURL )
aPropSeq[j].Value >>= 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<nCount; ++i)
{
- ::rtl::OUString sCmd;
+ OUString sCmd;
uno::Sequence< beans::PropertyValue > aTempPropSeq;
xTemp->getByIndex(i) >>= aTempPropSeq;
for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j)
@@ -1284,7 +1282,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
xUIConfigurationPersistence->store();
}
-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<vModulesInfo.size(); ++i)
{
- ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
+ OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
if (!sModuleIdentifier.isEmpty())
{
uno::Reference< ui::XUIConfigurationManager > 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; j<nToolbars; ++j)
{
- ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
- ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
+ OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
+ OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
lPropSeq[j].Name = sToolbarName;
lPropSeq[j].Value <<= xCfgManager->getSettings(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 <stdio.h>
#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 <stdio.h>
-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<XComponentContext> 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<XComponentContext> 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<css::ucb::XCommandEnvironment> createCmdEnv(
css::uno::Reference<css::uno::XComponentContext> 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<com::sun::star::drawing::XShapes> xPageShapes);
+ OUString dump(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> 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<com::sun::star::awt::XBitmap> xBitmap, xmlTextWriterPtr xmlWriter);
-void dumpFillBitmapURLAsAttribute(rtl::OUString sBitmapURL, xmlTextWriterPtr xmlWriter);
+void dumpFillBitmapURLAsAttribute(OUString sBitmapURL, xmlTextWriterPtr xmlWriter);
void dumpFillBitmapPositionOffsetXAsAttribute(sal_Int32 aBitmapPositionOffsetX, xmlTextWriterPtr xmlWriter);
void dumpFillBitmapPositionOffsetYAsAttribute(sal_Int32 aBitmapPositionOffsetY, xmlTextWriterPtr xmlWriter);
void dumpFillBitmapOffsetXAsAttribute(sal_Int32 aBitmapOffsetX, xmlTextWriterPtr xmlWriter);
@@ -84,13 +84,13 @@ void dumpFillBitmapTileAsAttribute(sal_Bool bBitmapTile, xmlTextWriterPtr xmlWri
// LineProperties.idl
void dumpLineStyleAsAttribute(com::sun::star::drawing::LineStyle eLineStyle, xmlTextWriterPtr xmlWriter);
void dumpLineDashAsElement(com::sun::star::drawing::LineDash aLineDash, xmlTextWriterPtr xmlWriter);
-void dumpLineDashNameAsAttribute(rtl::OUString sLineDashName, xmlTextWriterPtr xmlWriter);
+void dumpLineDashNameAsAttribute(OUString sLineDashName, xmlTextWriterPtr xmlWriter);
void dumpLineColorAsAttribute(sal_Int32 aLineColor, xmlTextWriterPtr xmlWriter);
void dumpLineTransparenceAsAttribute(sal_Int32 aLineTransparence, xmlTextWriterPtr xmlWriter);
void dumpLineWidthAsAttribute(sal_Int32 aLineWidth, xmlTextWriterPtr xmlWriter);
void dumpLineJointAsAttribute(com::sun::star::drawing::LineJoint eLineJoint, xmlTextWriterPtr xmlWriter);
-void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName, xmlTextWriterPtr xmlWriter);
-void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName, xmlTextWriterPtr xmlWriter);
+void dumpLineStartNameAsAttribute(OUString sLineStartName, xmlTextWriterPtr xmlWriter);
+void dumpLineEndNameAsAttribute(OUString sLineEndName, xmlTextWriterPtr xmlWriter);
void dumpLineStartAsElement(com::sun::star::drawing::PolyPolygonBezierCoords aLineStart, xmlTextWriterPtr xmlWriter);
void dumpLineEndAsElement(com::sun::star::drawing::PolyPolygonBezierCoords aLineEnd, xmlTextWriterPtr xmlWriter);
void dumpLineStartCenterAsAttribute(sal_Bool bLineStartCenter, xmlTextWriterPtr xmlWriter);
@@ -138,22 +138,22 @@ void dumpShadowYDistanceAsAttribute(sal_Int32 aShadowYDistance, xmlTextWriterPtr
//Shape.idl
void dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter);
void dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter);
-void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter);
+void dumpLayerNameAsAttribute(OUString sLayerName, xmlTextWriterPtr xmlWriter);
void dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter);
void dumpPrintableAsAttribute(sal_Bool bPrintable, xmlTextWriterPtr xmlWriter);
void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWriter);
-void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter);
+void dumpNameAsAttribute(OUString sName, xmlTextWriterPtr xmlWriter);
void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter);
void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 aLine, xmlTextWriterPtr xmlWriter);
void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 aTransformation, xmlTextWriterPtr xmlWriter);
void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, xmlTextWriterPtr xmlWriter);
-void dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, xmlTextWriterPtr xmlWriter);
+void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter);
// CustomShape.idl
-void dumpCustomShapeEngineAsAttribute(rtl::OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter);
-void dumpCustomShapeDataAsAttribute(rtl::OUString sCustomShapeData, xmlTextWriterPtr xmlWriter);
+void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter);
+void dumpCustomShapeDataAsAttribute(OUString sCustomShapeData, xmlTextWriterPtr xmlWriter);
void dumpCustomShapeGeometryAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue> aCustomShapeGeometry, xmlTextWriterPtr xmlWriter);
-void dumpCustomShapeReplacementURLAsAttribute(rtl::OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter);
+void dumpCustomShapeReplacementURLAsAttribute(OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter);
// XShape.idl
void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, xmlTextWriterPtr xmlWriter);
@@ -175,7 +175,7 @@ void dumpCustomShapeService(com::sun::star::uno::Reference< com::sun::star::bean
int writeCallback(void* pContext, const char* sBuffer, int nLen)
{
- rtl::OStringBuffer* pBuffer = static_cast<rtl::OStringBuffer*>(pContext);
+ OStringBuffer* pBuffer = static_cast<OStringBuffer*>(pContext);
pBuffer->append(sBuffer);
return nLen;
}
@@ -222,10 +222,10 @@ void dumpFillTransparenceAsAttribute(sal_Int32 aTransparence, xmlTextWriterPtr x
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillTransparence"), "%" SAL_PRIdINT32, aTransparence);
}
-void dumpFillTransparenceGradientNameAsAttribute(rtl::OUString sTranspGradName, xmlTextWriterPtr xmlWriter)
+void dumpFillTransparenceGradientNameAsAttribute(OUString sTranspGradName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillTransparenceGradientName"), "%s",
- rtl::OUStringToOString(sTranspGradName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sTranspGradName, RTL_TEXTENCODING_UTF8).getStr());
}
//because there's more awt::Gradient properties to dump
@@ -272,10 +272,10 @@ void dumpFillTransparenceGradientAsElement(awt::Gradient aTranspGrad, xmlTextWri
xmlTextWriterEndElement( xmlWriter );
}
-void dumpFillGradientNameAsAttribute(rtl::OUString sGradName, xmlTextWriterPtr xmlWriter)
+void dumpFillGradientNameAsAttribute(OUString sGradName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillGradientName"), "%s",
- rtl::OUStringToOString(sGradName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sGradName, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpFillGradientAsElement(awt::Gradient aGradient, xmlTextWriterPtr xmlWriter)
@@ -328,10 +328,10 @@ void dumpFillBitmapAsElement(uno::Reference<awt::XBitmap> xBitmap, xmlTextWriter
xmlTextWriterEndElement( xmlWriter );
}
-void dumpFillBitmapURLAsAttribute(rtl::OUString sBitmapURL, xmlTextWriterPtr xmlWriter)
+void dumpFillBitmapURLAsAttribute(OUString sBitmapURL, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillBitmapURL"), "%s",
- rtl::OUStringToOString(sBitmapURL, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sBitmapURL, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpFillBitmapPositionOffsetXAsAttribute(sal_Int32 aBitmapPositionOffsetX, xmlTextWriterPtr xmlWriter)
@@ -492,10 +492,10 @@ void dumpLineDashAsElement(drawing::LineDash aLineDash, xmlTextWriterPtr xmlWrit
xmlTextWriterEndElement( xmlWriter );
}
-void dumpLineDashNameAsAttribute(rtl::OUString sLineDashName, xmlTextWriterPtr xmlWriter)
+void dumpLineDashNameAsAttribute(OUString sLineDashName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineDashName"), "%s",
- rtl::OUStringToOString(sLineDashName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sLineDashName, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpLineColorAsAttribute(sal_Int32 aLineColor, xmlTextWriterPtr xmlWriter)
@@ -537,16 +537,16 @@ void dumpLineJointAsAttribute(drawing::LineJoint eLineJoint, xmlTextWriterPtr xm
}
}
-void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName, xmlTextWriterPtr xmlWriter)
+void dumpLineStartNameAsAttribute(OUString sLineStartName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineStartName"), "%s",
- rtl::OUStringToOString(sLineStartName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sLineStartName, RTL_TEXTENCODING_UTF8).getStr());
}
-void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName, xmlTextWriterPtr xmlWriter)
+void dumpLineEndNameAsAttribute(OUString sLineEndName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineEndName"), "%s",
- rtl::OUStringToOString(sLineEndName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sLineEndName, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpPolyPolygonBezierCoords(drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter)
@@ -977,10 +977,10 @@ void dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter)
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerID"), "%" SAL_PRIdINT32, aLayerID);
}
-void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter)
+void dumpLayerNameAsAttribute(OUString sLayerName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerName"), "%s",
- rtl::OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter)
@@ -1007,10 +1007,10 @@ void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWrite
xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("moveProtect"), "%s", "false");
}
-void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter)
+void dumpNameAsAttribute(OUString sName, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s",
- rtl::OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter)
@@ -1050,10 +1050,10 @@ void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, xmlTextWriterPtr
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("navigationOrder"), "%" SAL_PRIdINT32, aNavigationOrder);
}
-void dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, xmlTextWriterPtr xmlWriter)
+void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("hyperlink"), "%s",
- rtl::OUStringToOString(sHyperlink, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sHyperlink, RTL_TEXTENCODING_UTF8).getStr());
}
// --------------------------------
@@ -1075,23 +1075,23 @@ void dumpSizeAsAttribute(const awt::Size& rSize, xmlTextWriterPtr xmlWriter)
void dumpShapeDescriptorAsAttribute( uno::Reference< drawing::XShapeDescriptor > xDescr, xmlTextWriterPtr xmlWriter )
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("type"), "%s",
- rtl::OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr());
}
// -------------------------------------
// ---------- CustomShape.idl ----------
// -------------------------------------
-void dumpCustomShapeEngineAsAttribute(rtl::OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter)
+void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("customShapeEngine"), "%s",
- rtl::OUStringToOString(sCustomShapeEngine, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sCustomShapeEngine, RTL_TEXTENCODING_UTF8).getStr());
}
-void dumpCustomShapeDataAsAttribute(rtl::OUString sCustomShapeData, xmlTextWriterPtr xmlWriter)
+void dumpCustomShapeDataAsAttribute(OUString sCustomShapeData, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("customShapeData"), "%s",
- rtl::OUStringToOString(sCustomShapeData, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sCustomShapeData, RTL_TEXTENCODING_UTF8).getStr());
}
void dumpCustomShapeGeometryAsElement(uno::Sequence< beans::PropertyValue> aCustomShapeGeometry, xmlTextWriterPtr xmlWriter)
@@ -1103,15 +1103,15 @@ void dumpCustomShapeGeometryAsElement(uno::Sequence< beans::PropertyValue> aCust
xmlTextWriterStartElement(xmlWriter, BAD_CAST( "PropertyValue" ));
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s",
- rtl::OUStringToOString(aCustomShapeGeometry[i].Name, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(aCustomShapeGeometry[i].Name, RTL_TEXTENCODING_UTF8).getStr());
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("handle"), "%" SAL_PRIdINT32, aCustomShapeGeometry[i].Handle);
uno::Any aAny = aCustomShapeGeometry[i].Value;
- rtl::OUString sValue;
+ OUString sValue;
if(aAny >>= sValue)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("value"), "%s",
- rtl::OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr());
}
switch(aCustomShapeGeometry[i].State)
{
@@ -1132,10 +1132,10 @@ void dumpCustomShapeGeometryAsElement(uno::Sequence< beans::PropertyValue> aCust
xmlTextWriterEndElement( xmlWriter );
}
-void dumpCustomShapeReplacementURLAsAttribute(rtl::OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter)
+void dumpCustomShapeReplacementURLAsAttribute(OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("customShapeReplacementURL"), "%s",
- rtl::OUStringToOString(sCustomShapeReplacementURL, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(sCustomShapeReplacementURL, RTL_TEXTENCODING_UTF8).getStr());
}
// methods dumping whole services
@@ -1306,7 +1306,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("FillTransparenceGradientName");
- rtl::OUString sTranspGradName;
+ OUString sTranspGradName;
if(anotherAny >>= sTranspGradName)
dumpFillTransparenceGradientNameAsAttribute(sTranspGradName, xmlWriter);
}
@@ -1318,7 +1318,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("FillGradientName");
- rtl::OUString sGradName;
+ OUString sGradName;
if(anotherAny >>= sGradName)
dumpFillGradientNameAsAttribute(sGradName, xmlWriter);
}
@@ -1330,7 +1330,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("FillHatchName");
- rtl::OUString sHatchName;
+ OUString sHatchName;
if(anotherAny >>= sHatchName)
dumpFillGradientNameAsAttribute(sHatchName, xmlWriter);
}
@@ -1348,7 +1348,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("FillBitmapName");
- rtl::OUString sBitmapName;
+ OUString sBitmapName;
if(anotherAny >>= sBitmapName)
dumpFillGradientNameAsAttribute(sBitmapName, xmlWriter);
}
@@ -1360,7 +1360,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("FillBitmapURL");
- rtl::OUString sBitmapURL;
+ OUString sBitmapURL;
if(anotherAny >>= sBitmapURL)
dumpFillBitmapURLAsAttribute(sBitmapURL, xmlWriter);
}
@@ -1448,7 +1448,7 @@ void dumpLinePropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("LineDashName");
- rtl::OUString sLineDashName;
+ OUString sLineDashName;
if(anotherAny >>= sLineDashName)
dumpLineDashNameAsAttribute(sLineDashName, xmlWriter);
}
@@ -1478,13 +1478,13 @@ void dumpLinePropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("LineStartName");
- rtl::OUString sLineStartName;
+ OUString sLineStartName;
if(anotherAny >>= sLineStartName)
dumpLineStartNameAsAttribute(sLineStartName, xmlWriter);
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("LineEndName");
- rtl::OUString sLineEndName;
+ OUString sLineEndName;
if(anotherAny >>= sLineEndName)
dumpLineEndNameAsAttribute(sLineEndName, xmlWriter);
}
@@ -1599,7 +1599,7 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("LayerName");
- rtl::OUString sLayerName;
+ OUString sLayerName;
if(anotherAny >>= sLayerName)
dumpLayerNameAsAttribute(sLayerName, xmlWriter);
}
@@ -1623,7 +1623,7 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("Name");
- rtl::OUString sName;
+ OUString sName;
if(anotherAny >>= sName)
dumpNameAsAttribute(sName, xmlWriter);
}
@@ -1648,7 +1648,7 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri
if(xInfo->hasPropertyByName("Hyperlink"))
{
uno::Any anotherAny = xPropSet->getPropertyValue("Hyperlink");
- rtl::OUString sHyperlink;
+ OUString sHyperlink;
if(anotherAny >>= sHyperlink)
dumpHyperlinkAsAttribute(sHyperlink, xmlWriter);
}
@@ -1681,13 +1681,13 @@ void dumpCustomShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlT
uno::Reference< beans::XPropertySetInfo> xInfo = xPropSet->getPropertySetInfo();
{
uno::Any anotherAny = xPropSet->getPropertyValue("CustomShapeEngine");
- rtl::OUString sCustomShapeEngine;
+ OUString sCustomShapeEngine;
if(anotherAny >>= sCustomShapeEngine)
dumpCustomShapeEngineAsAttribute(sCustomShapeEngine, xmlWriter);
}
{
uno::Any anotherAny = xPropSet->getPropertyValue("CustomShapeData");
- rtl::OUString sCustomShapeData;
+ OUString sCustomShapeData;
if(anotherAny >>= sCustomShapeData)
dumpCustomShapeDataAsAttribute(sCustomShapeData, xmlWriter);
}
@@ -1700,7 +1700,7 @@ void dumpCustomShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlT
if(xInfo->hasPropertyByName("CustomShapeReplacementURL"))
{
uno::Any anotherAny = xPropSet->getPropertyValue("CustomShapeReplacementURL");
- rtl::OUString sCustomShapeReplacementURL;
+ OUString sCustomShapeReplacementURL;
if(anotherAny >>= sCustomShapeReplacementURL)
dumpCustomShapeReplacementURLAsAttribute(sCustomShapeReplacementURL, xmlWriter);
}
@@ -1711,7 +1711,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr
xmlTextWriterStartElement( xmlWriter, BAD_CAST( "XShape" ) );
uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySetInfo> xPropSetInfo = xPropSet->getPropertySetInfo();
- rtl::OUString aName;
+ OUString aName;
dumpPositionAsAttribute(xShape->getPosition(), xmlWriter);
dumpSizeAsAttribute(xShape->getSize(), xmlWriter);
@@ -1721,7 +1721,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr
// uno::Sequence<beans::Property> aProperties = xPropSetInfo->getProperties();
uno::Reference< lang::XServiceInfo > xServiceInfo( xShape, uno::UNO_QUERY_THROW );
- uno::Sequence< rtl::OUString > aServiceNames = xServiceInfo->getSupportedServiceNames();
+ uno::Sequence< OUString > aServiceNames = xServiceInfo->getSupportedServiceNames();
uno::Reference< beans::XPropertySetInfo> xInfo = xPropSet->getPropertySetInfo();
if(xInfo->hasPropertyByName("Name"))
@@ -1730,7 +1730,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr
if (aAny >>= aName)
{
if (!aName.isEmpty())
- xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("name"), "%s", rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
+ xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("name"), "%s", OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
}
}
@@ -1739,9 +1739,9 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr
if (xServiceInfo->supportsService("com.sun.star.drawing.Text"))
{
uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY_THROW);
- rtl::OUString aText = xText->getString();
+ OUString aText = xText->getString();
if(!aText.isEmpty())
- xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("text"), "%s", rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
+ xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("text"), "%s", OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
}
if(xServiceInfo->supportsService("com.sun.star.drawing.TextProperties"))
dumpTextPropertiesService(xPropSet, xmlWriter);
@@ -1810,7 +1810,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr
for (sal_Int32 i = 0; i < nServices; ++i)
{
xmlTextWriterStartElement(xmlWriter, BAD_CAST( "ServiceName" ));
- xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST( "name" ), "%s", rtl::OUStringToOString(aServiceNames[i], RTL_TEXTENCODING_UTF8).getStr());
+ xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST( "name" ), "%s", OUStringToOString(aServiceNames[i], RTL_TEXTENCODING_UTF8).getStr());
xmlTextWriterEndElement( xmlWriter );
}
#endif
@@ -1833,10 +1833,10 @@ void dumpXShapes( uno::Reference< drawing::XShapes > xShapes, xmlTextWriterPtr x
}
} //end of namespace
-rtl::OUString XShapeDumper::dump(uno::Reference<drawing::XShapes> xPageShapes)
+OUString XShapeDumper::dump(uno::Reference<drawing::XShapes> xPageShapes)
{
- rtl::OStringBuffer aString;
+ OStringBuffer aString;
xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO( writeCallback, closeCallback, &aString, NULL );
xmlTextWriterPtr xmlWriter = xmlNewTextWriter( xmlOutBuffer );
xmlTextWriterSetIndent( xmlWriter, 1 );
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 69b541d6ee7d..f7d0de8f0b85 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -80,39 +80,39 @@ namespace drawinglayer
uno::Sequence< beans::PropertyValue > mxExtendedInformation;
// the local UNO API strings
- const ::rtl::OUString& getNamePropertyObjectTransformation()
+ const OUString& getNamePropertyObjectTransformation()
{
- static ::rtl::OUString s_sNameProperty("ObjectTransformation");
+ static OUString s_sNameProperty("ObjectTransformation");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyViewTransformation()
+ const OUString& getNamePropertyViewTransformation()
{
- static ::rtl::OUString s_sNameProperty("ViewTransformation");
+ static OUString s_sNameProperty("ViewTransformation");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyViewport()
+ const OUString& getNamePropertyViewport()
{
- static ::rtl::OUString s_sNameProperty("Viewport");
+ static OUString s_sNameProperty("Viewport");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyTime()
+ const OUString& getNamePropertyTime()
{
- static ::rtl::OUString s_sNameProperty("Time");
+ static OUString s_sNameProperty("Time");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyVisualizedPage()
+ const OUString& getNamePropertyVisualizedPage()
{
- static ::rtl::OUString s_sNameProperty("VisualizedPage");
+ static OUString s_sNameProperty("VisualizedPage");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyReducedDisplayQuality()
+ const OUString& getNamePropertyReducedDisplayQuality()
{
- static ::rtl::OUString s_sNameProperty("ReducedDisplayQuality");
+ static OUString s_sNameProperty("ReducedDisplayQuality");
return s_sNameProperty;
}
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index 3569a2d298bc..7593dc0045f0 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -77,57 +77,57 @@ namespace drawinglayer
uno::Sequence< beans::PropertyValue > mxExtendedInformation;
// the local UNO API strings
- const ::rtl::OUString& getNamePropertyObjectTransformation()
+ const OUString& getNamePropertyObjectTransformation()
{
- static ::rtl::OUString s_sNameProperty("ObjectTransformation");
+ static OUString s_sNameProperty("ObjectTransformation");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyOrientation()
+ const OUString& getNamePropertyOrientation()
{
- static ::rtl::OUString s_sNameProperty("Orientation");
+ static OUString s_sNameProperty("Orientation");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyProjection()
+ const OUString& getNamePropertyProjection()
{
- static ::rtl::OUString s_sNameProperty("Projection");
+ static OUString s_sNameProperty("Projection");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyProjection_30()
+ const OUString& getNamePropertyProjection_30()
{
- static ::rtl::OUString s_sNameProperty("Projection30");
+ static OUString s_sNameProperty("Projection30");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyProjection_31()
+ const OUString& getNamePropertyProjection_31()
{
- static ::rtl::OUString s_sNameProperty("Projection31");
+ static OUString s_sNameProperty("Projection31");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyProjection_32()
+ const OUString& getNamePropertyProjection_32()
{
- static ::rtl::OUString s_sNameProperty("Projection32");
+ static OUString s_sNameProperty("Projection32");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyProjection_33()
+ const OUString& getNamePropertyProjection_33()
{
- static ::rtl::OUString s_sNameProperty("Projection33");
+ static OUString s_sNameProperty("Projection33");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyDeviceToView()
+ const OUString& getNamePropertyDeviceToView()
{
- static ::rtl::OUString s_sNameProperty("DeviceToView");
+ static OUString s_sNameProperty("DeviceToView");
return s_sNameProperty;
}
- const ::rtl::OUString& getNamePropertyTime()
+ const OUString& getNamePropertyTime()
{
- static ::rtl::OUString s_sNamePropertyTime("Time");
+ static OUString s_sNamePropertyTime("Time");
return s_sNamePropertyTime;
}
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 0c94adaa6857..74c40dfc773e 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -56,7 +56,7 @@ namespace drawinglayer
if(xSet.is())
{
uno::Any aValue(xSet->getPropertyValue("DefaultControl"));
- rtl::OUString aUnoControlTypeName;
+ OUString aUnoControlTypeName;
if(aValue >>= aUnoControlTypeName)
{
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 5597bfc40b97..2f314dd6424e 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -95,7 +95,7 @@ namespace drawinglayer
MediaPrimitive2D::MediaPrimitive2D(
const basegfx::B2DHomMatrix& rTransform,
- const rtl::OUString& rURL,
+ const OUString& rURL,
const basegfx::BColor& rBackgroundColor,
sal_uInt32 nDiscreteBorder,
const Graphic &rSnapshot)
diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
index e87b7c184ba7..d4df4ea60bcd 100644
--- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
@@ -30,9 +30,9 @@ namespace drawinglayer
{
ObjectInfoPrimitive2D::ObjectInfoPrimitive2D(
const Primitive2DSequence& rChildren,
- const rtl::OUString& rName,
- const rtl::OUString& rTitle,
- const rtl::OUString& rDesc)
+ const OUString& rName,
+ const OUString& rTitle,
+ const OUString& rDesc)
: GroupPrimitive2D(rChildren),
maName(rName),
maTitle(rTitle),
diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx
index 60f943d94b20..33554bd92624 100644
--- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx
+++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx
@@ -197,7 +197,7 @@ namespace drawinglayer
xBreakIterator = ::com::sun::star::i18n::BreakIterator::create(xContext);
}
- const rtl::OUString& rTxt = mrSource.getText();
+ const OUString& rTxt = mrSource.getText();
const sal_Int32 nTextLength(mrSource.getTextLength());
const ::com::sun::star::lang::Locale& rLocale = mrSource.getLocale();
const sal_Int32 nTextPosition(mrSource.getTextPosition());
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index c100496fd8c8..9799060da899 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -101,7 +101,7 @@ namespace drawinglayer
TextHierarchyFieldPrimitive2D::TextHierarchyFieldPrimitive2D(
const Primitive2DSequence& rChildren,
const FieldType& rFieldType,
- const rtl::OUString& rString)
+ const OUString& rString)
: GroupPrimitive2D(rChildren),
meType(rFieldType),
maString(rString)
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index ec0ae58e1fe8..f3e2abb5448a 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -69,7 +69,7 @@ namespace drawinglayer
Primitive2DSequence TextCharacterStrikeoutPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// strikeout with character
- const rtl::OUString aSingleCharString(getStrikeoutChar());
+ const OUString aSingleCharString(getStrikeoutChar());
basegfx::B2DVector aScale, aTranslate;
double fRotate, fShearX;
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index ada69e6e29ed..73746e53149f 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -877,7 +877,7 @@ namespace drawinglayer
uno::Reference< beans::XPropertySetInfo > xPropertyInfo(xModelProperties.is()
? xModelProperties->getPropertySetInfo()
: uno::Reference< beans::XPropertySetInfo >());
- const ::rtl::OUString sPrintablePropertyName("Printable");
+ const OUString sPrintablePropertyName("Printable");
if(xPropertyInfo.is() && xPropertyInfo->hasPropertyByName(sPrintablePropertyName))
{
@@ -981,9 +981,9 @@ namespace drawinglayer
// support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text primitives (but is not limited to)
// thus do the MetafileAction embedding stuff but just handle recursively.
const primitive2d::TextHierarchyFieldPrimitive2D& rFieldPrimitive = static_cast< const primitive2d::TextHierarchyFieldPrimitive2D& >(rCandidate);
- const rtl::OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN"));
- const rtl::OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField"));
- const rtl::OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END"));
+ const OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN"));
+ const OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField"));
+ const OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END"));
switch(rFieldPrimitive.getType())
{
@@ -999,7 +999,7 @@ namespace drawinglayer
}
case drawinglayer::primitive2d::FIELD_TYPE_URL :
{
- const rtl::OUString& rURL = rFieldPrimitive.getString();
+ const OUString& rURL = rFieldPrimitive.getString();
const String aOldString(rURL);
mpMetaFile->AddAction(new MetaCommentAction(aCommentStringCommon, 0, reinterpret_cast< const sal_uInt8* >(aOldString.GetBuffer()), 2 * aOldString.Len()));
break;
@@ -1032,7 +1032,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D :
{
const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive = static_cast< const primitive2d::TextHierarchyLinePrimitive2D& >(rCandidate);
- const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL"));
+ const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL"));
// process recursively and add MetaFile comment
process(rLinePrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1045,7 +1045,7 @@ namespace drawinglayer
// in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The
// "XTEXT_EOC" is used, use here, too.
const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive = static_cast< const primitive2d::TextHierarchyBulletPrimitive2D& >(rCandidate);
- const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
+ const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
// process recursively and add MetaFile comment
process(rBulletPrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1056,7 +1056,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D :
{
const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive = static_cast< const primitive2d::TextHierarchyParagraphPrimitive2D& >(rCandidate);
- const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP"));
+ const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP"));
if(mpPDFExtOutDevData)
{
@@ -1079,8 +1079,8 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D :
{
const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive = static_cast< const primitive2d::TextHierarchyBlockPrimitive2D& >(rCandidate);
- const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN"));
- const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END"));
+ const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN"));
+ const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END"));
// add MetaFile comment, process recursively and add MetaFile comment
mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA));
@@ -1115,7 +1115,7 @@ namespace drawinglayer
mxBreakIterator = i18n::BreakIterator::create(xContext);
}
- const rtl::OUString& rTxt = rTextCandidate.getText();
+ const OUString& rTxt = rTextCandidate.getText();
const sal_Int32 nTextLength(rTextCandidate.getTextLength()); // rTxt.getLength());
if(nTextLength)
@@ -1127,9 +1127,9 @@ namespace drawinglayer
sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True));
sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
- const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
- const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
- const rtl::OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
+ const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
+ const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
+ const OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++)
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 92d843c3acc9..e209f188158f 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -296,7 +296,7 @@ namespace drawinglayer
if ( nWidth )
nChars = nWidthToFill / nWidth;
- rtl::OUStringBuffer aFilled;
+ OUStringBuffer aFilled;
comphelper::string::padToLength(aFilled, (sal_uInt16)nChars, aText.GetChar(0));
aText = aFilled.makeStringAndClear();
nPos = 0;
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index c4d5bc90fe8b..dc53f27d9b5d 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -122,7 +122,7 @@ namespace drawinglayer
static bool bDoSaveForVisualControl(false);
if(bDoSaveForVisualControl)
{
- SvFileStream aNew(rtl::OUString("c:\\test.png"), STREAM_WRITE|STREAM_TRUNC);
+ SvFileStream aNew(OUString("c:\\test.png"), STREAM_WRITE|STREAM_TRUNC);
aNew << aRetval;
}
#endif
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 <systools/win32/comtools.hxx>
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 <rtl/ustring.hxx>
-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<sal_Int8>*)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<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> 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<rtl::OUString>& aPropertyNames);
+ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
void SetModified() {ConfigItem::SetModified();}
};
class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
{
SvxAutoCorrCfg& rParent;
- com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> 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<rtl::OUString>& aPropertyNames);
+ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& 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<SvxAutocorrWord*, CompareSvxAutocorrWordList> 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<com::sun::star::beans::PropertyValue> 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<rtl::OUString>& rSeq, const rtl::OUString& rVal)
+bool includes(const uno::Sequence<OUString>& 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<rtl::OUString> aSvcs = aField.getSupportedServiceNames();
+ uno::Sequence<OUString> 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<sal_Int32>(((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<sal_Int32>(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<sal_Int32>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(rIStream);
- pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding);
+ OString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(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 <linguistic/lngprops.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-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<const EditCharAttribField*>(pField)->GetFieldValue();
+ OUString aFldText = static_cast<const EditCharAttribField*>(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<const SvxFieldItem&>(*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 <rtl/ustrbuf.hxx>
#include <comphelper/string.hxx>
-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<sal_Int32>(nProp100)).getStr() << '}';
}
long nUpDown = nFontHeight * Abs( nEsc ) / 100;
- rtl::OString aUpDown = rtl::OString::valueOf(
+ OString aUpDown = OString::valueOf(
static_cast<sal_Int32>(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 <textconv.hxx>
-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<sal_Int32>(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<text::XTextContent>& 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<text::XTextContent>& 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<text::XTextContent>& 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<text::XTextContent>& 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<sal_uInt16>(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; n<nCount; n++)//we had 0 already
@@ -475,7 +475,7 @@ namespace editeng
{
sal_Bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional;
- m_sCurrentPortion = ::rtl::OUString();
+ m_sCurrentPortion = OUString();
m_nCurrentPortionLang = LANGUAGE_NONE;
m_pAntiImpl->GetNextPortion( 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: " --[<AnySttChars>][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][<AnyEndChars>] --[<AnySttChars>][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: " - [<AnySttChars>][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][<AnyEndChars>] - [<AnySttChars>][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<rtl::OUString, SvxAutocorrWord *>( aShort, pWord ) ).second;
+ OUString aShort( pWord->GetShort() );
+ return maHash.insert( std::pair<OUString, SvxAutocorrWord *>( 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 <editeng/swafopt.hxx>
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 <editeng/unonrule.hxx>
#include <editeng/editids.hrc>
-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<aSupportedServices.getLength(); i++)
if (sServiceName == aSupportedServices[i])
@@ -146,7 +146,7 @@ sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const ::rtl::OU
return sal_False;
}
-uno::Sequence< ::rtl::OUString> 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<beans::XPropertySet>();
@@ -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<uno::XInterface>(
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<frame::XFrame>(
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<awt::XSystemDependentMenuPeer> 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<beans::PropertyValue> 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<container::XNameAccess> 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<const sal_Unicode*>(pFilePath) );
+ aURL.Complete = OUString( reinterpret_cast<const sal_Unicode*>(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<const sal_Unicode*>(pszFileName) );
+ m_aFileName = OUString( reinterpret_cast<const sal_Unicode*>(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<const sal_Unicode*>( pszFileName ) );
+ aURL.Complete = OUString( reinterpret_cast<const sal_Unicode*>( 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<const sal_Unicode*>(pszFileName) );
+ m_aFileName = OUString( reinterpret_cast<const sal_Unicode*>(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 <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-::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<awt::XWindow> 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_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);
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<rtl::OUString>& )
+void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& )
{
}
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<Mapping> 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<rtl::OUString> GetPropertyNames();
+ com::sun::star::uno::Sequence<OUString> GetPropertyNames();
public:
BibConfig();
~BibConfig();
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);
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<rtl::OUString> aSourceNames;
+ com::sun::star::uno::Sequence<OUString> aSourceNames;
public:
DBChangeDialogConfig_Impl();
~DBChangeDialogConfig_Impl();
- const com::sun::star::uno::Sequence<rtl::OUString>& GetDataSourceNames();
+ const com::sun::star::uno::Sequence<OUString>& 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<rtl::OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( );
+ static Sequence<OUString> 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<XDatabaseMetaData> 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<nCount; i++ )
{
String aName= pFields[i];
@@ -1538,11 +1538,11 @@ void BibDataManager::RemoveMeAsUidListener()
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<nCount; i++ )
{
String aName= pFields[i];
@@ -1582,9 +1582,9 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
delete pDlg;
}
-::rtl::OUString BibDataManager::CreateDBChangeDialog(Window* pParent)
+OUString BibDataManager::CreateDBChangeDialog(Window* pParent)
{
- ::rtl::OUString uRet;
+ OUString uRet;
DBChangeDialog_Impl * pDlg = new DBChangeDialog_Impl(pParent, this );
if(RET_OK == pDlg->Execute())
{
@@ -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<rtl::OUString> aStringSeq=pDatMan->getQueryFields();
- aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0));
+ uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields();
+ aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)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<rtl::OUString> aStringSeq=pDatMan->getDataSources();
- aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0));
+ uno::Sequence<OUString> aStringSeq=pDatMan->getDataSources();
+ aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)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<rtl::OUString> aStringSeq=pDatMan->getQueryFields();
+ uno::Sequence<OUString> 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<rtl::OUString> aListSource(TYPE_COUNT);
- rtl::OUString* pListSourceArr = aListSource.getArray();
+ uno::Sequence<OUString> 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<rtl::OUString>*)0));
+ pListSourceArr[i] = OUString::valueOf(i);
+ aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<OUString>*)0));
xPropSet->setPropertyValue("ListSource", aAny);
- uno::Sequence<rtl::OUString> aValues(TYPE_COUNT + 1);
- rtl::OUString* pValuesArr = aValues.getArray();
+ uno::Sequence<OUString> 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<rtl::OUString>*)0));
+ aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)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<rtl::OUString>*)0))
+ if(aState.getValueType() == ::getCppuType((Sequence<OUString>*)0))
{
pToolBar->UpdateSourceList(sal_False);
pToolBar->ClearSourceList();
- Sequence<rtl::OUString>* pStringSeq = (Sequence<rtl::OUString>*)aState.getValue();
- const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray();
+ Sequence<OUString>* pStringSeq = (Sequence<OUString>*)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<rtl::OUString>*)0))
+ if(aState.getValueType()==::getCppuType((Sequence<OUString>*)0))
{
pToolBar->ClearFilterMenu();
- Sequence<rtl::OUString>* pStringSeq = (Sequence<rtl::OUString>*) aState.getValue();
- const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray();
+ Sequence<OUString>* pStringSeq = (Sequence<OUString>*) aState.getValue();
+ const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray();
sal_uInt32 nCount = pStringSeq->getLength();
for( sal_uInt32 i=0; i<nCount; i++ )
@@ -155,7 +155,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
}
};
-BibTBEditListener::BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
+BibTBEditListener::BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
BibToolBarListener(pTB,aStr,nId)
{
}
@@ -315,7 +315,7 @@ void BibToolBar::Select()
Sequence<PropertyValue> 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<PropertyValue> 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<PropertyValue> 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<sal_Unicode*>( attr ) );
- const rtl::OUString aValues( reinterpret_cast<sal_Unicode*>( *values ) );
+ const OUString aAttr( reinterpret_cast<sal_Unicode*>( attr ) );
+ const OUString aValues( reinterpret_cast<sal_Unicode*>( *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<sal_Char *>(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<const sal_Unicode*>( charsDn ) );
+ userDn = OUString( reinterpret_cast<const sal_Unicode*>( 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<uno::XComponentContex
BackendBase(mMutex)
{
LdapDefinition aDefinition;
- rtl::OUString loggedOnUser;
+ OUString loggedOnUser;
// This whole rigmarole is to prevent an infinite recursion where reading
// the configuration for the backend would create another instance of the
@@ -61,7 +61,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
xContext, &aDefinition, &loggedOnUser))
{
throw css::uno::RuntimeException(
- rtl::OUString("LdapUserProfileBe- LDAP not configured"),
+ OUString("LdapUserProfileBe- LDAP not configured"),
NULL);
}
@@ -87,19 +87,19 @@ LdapUserProfileBe::~LdapUserProfileBe()
bool LdapUserProfileBe::readLdapConfiguration(
css::uno::Reference< css::uno::XComponentContext > 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<container::XNameAccess>& 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<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void)
+uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void)
{
- uno::Sequence<rtl::OUString> aServices(1) ;
- aServices[0] = rtl::OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ;
+ uno::Sequence<OUString> 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<rtl::OUString>
+uno::Sequence<OUString>
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<rtl::OUString> SAL_CALL
+ virtual uno::Sequence<OUString> 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<rtl::OUString> SAL_CALL
+ static uno::Sequence<OUString> SAL_CALL
getLdapUserProfileBeServiceNames(void) ;
private:
/** Check if LDAP is configured */
bool readLdapConfiguration(
uno::Reference<uno::XComponentContext> const & context,
- LdapDefinition * definition, rtl::OUString * loggedOnUser);
+ LdapDefinition * definition, OUString * loggedOnUser);
bool getLdapStringParam(uno::Reference<container::XNameAccess>& 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 (<void/> => 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<nSelected; ++i, ++pSelected)
*pSelected = m_aSelFields.GetEntry(i);
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index b837e3da4989..1cb62c58c0e9 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -33,7 +33,7 @@ namespace dbp
//=====================================================================
struct OGridSettings : public OControlWizardSettings
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > 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; i<m_aExistingRadios.GetEntryCount(); ++i)
{
rSettings.aLabels.push_back(m_aExistingRadios.GetEntry(i));
- rSettings.aValues.push_back(rtl::OUString::valueOf((sal_Int32)(i + 1)));
+ rSettings.aValues.push_back(OUString::valueOf((sal_Int32)(i + 1)));
}
return sal_True;
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 08e365807d95..eea291394515 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -164,11 +164,11 @@ namespace dbp
// do some quotings
if (xMetaData.is())
{
- ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString();
+ 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_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);
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; i<nLen; ++i, ++pImplNames)
{
if (pImplNames->equals(_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.
<p>Usually used from within component_getFactory.<p/>
@@ -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
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/>
+ <li><code>static OUString getImplementationName_Static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
@@ -215,8 +215,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
/** automatically registeres a single instance component
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/>
+ <li><code>static OUString getImplementationName_Static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
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<len; i++)
if(quote_trigger_chars.indexOf(str[i])!=-1)
@@ -119,7 +119,7 @@ namespace
return false;
};
- inline void appendEncodedString(::rtl::OUStringBuffer& buf, const ::rtl::OUString& str)
+ inline void appendEncodedString(OUStringBuffer& buf, const OUString& str)
{
if(needsQuoting(str))
{
@@ -145,10 +145,10 @@ namespace
buf.append(str);
};
- ::com::sun::star::uno::Sequence< ::rtl::OUString> 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<columns; i++)
{
appendEncodedString(buf, column_data[i]);
@@ -315,10 +315,10 @@ namespace logging
return buf.makeStringAndClear();
}
- ::sal_Bool SAL_CALL CsvFormatter::supportsService( const ::rtl::OUString& service_name ) throw(RuntimeException)
+ ::sal_Bool SAL_CALL CsvFormatter::supportsService( const OUString& service_name ) 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
)
@@ -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
// <attributes>
sal_Int32 m_nLogLevel;
- ::rtl::OUString m_sName;
+ OUString m_sName;
// </attributes>
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,
<TRUE/> 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 <TRUE/> in case of success, <FALSE/> 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 <TRUE/> in case of success, <FALSE/> 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<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
case DISP_E_PARAMNOTFOUND:
- throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(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<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(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<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"),static_cast<XInterface*>(
static_cast<XWeak*>(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<const sal_Unicode*>(LPCOLESTR(sName)));
+ OUString sTmp( reinterpret_cast<const sal_Unicode*>(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<const sal_Unicode*>(LPCOLESTR(sName)));
- m_sTypeName = sLibName.concat( rtl::OUString(".") ).concat( sTmp );
+ OUString sLibName( reinterpret_cast<const sal_Unicode*>(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<XInterface>( static_cast<XWeak*>(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<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
case DISP_E_PARAMNOTFOUND:
- throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(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<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"),static_cast<XInterface*>(
static_cast<XWeak*>(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<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(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<XInterface*>(
static_cast<XWeak*>(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<XInterface*>(
static_cast<XWeak*>(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<Type> m_seqTypes;
CComPtr<IUnknown> m_spUnknown;
CComPtr<IDispatch> 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<LPCOLESTR>(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<CComMultiThreadModel>,
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<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug
Sequence<com::sun::star::plugin::PluginDescription> 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<com::sun::star::plugin::PluginDescription> 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<sal_Int8> 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<sal_Int8> 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 <osl/file.hxx>
#include <plugin/impl.hxx>
-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<PluginInputStream*> m_aInputStreams;
::std::list<PluginOutputStream*> m_aOutputStreams;
::std::list<PluginEventListener*> 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<PluginInputStream*>& getInputStreams() { return m_aInputStreams; }
::std::list<PluginOutputStream*>& 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<PluginComm*>& getPluginComms() { return m_aPluginComms; }
::std::list<XPlugin_Impl*>& 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<PluginDescription> 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<PluginDescription> 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<PluginDescription> 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 <tools/debug.hxx>
-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_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);
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
<TRUE/> if and only if a non-<NULL/> 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 <NULL/>
@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 <NULL/>
@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 <member>m_pUIChangeNotification</member> at <member>m_rMaster</member>
*/
@@ -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_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);
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; i<nCategories; ++i, ++pReturn )
{
- pReturn->ProgrammaticName = ::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<const rtl::OUString&>(PROPERTY_HSCROLL) );
- aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_VSCROLL) );
+ aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_HSCROLL) );
+ aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_VSCROLL) );
}
if ( implHaveTextTypeProperty() )
{
- aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_RICHTEXT) );
- aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) );
+ aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_RICHTEXT) );
+ aSuperseded.push_back( static_cast<const OUString&>(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<const rtl::OUString&>(PROPERTY_TEXTTYPE) );
- aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) );
- return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() );
+ aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_TEXTTYPE) );
+ aInterestingActuatingProps.push_back( static_cast<const OUString&>(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 <member>getOrCreateBindingForModel</member>
::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 <member>m_sBindingLessModelName</member>
*/
- ::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<const SvxFontItem&>(_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<const rtl::OUString&>(PROPERTY_DATASOURCE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMAND) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMANDTYPE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SUBMIT_ENCODING) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_REPEAT) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TABSTOP) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BORDER) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DROPDOWN) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_IMAGE_URL) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TARGET_URL) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_STRINGITEMLIST) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BUTTONTYPE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_ESCAPE_PROCESSING) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TRISTATE) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SHOWTHOUSANDSEP) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
- aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TOGGLE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DATASOURCE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMAND) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMANDTYPE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_SUBMIT_ENCODING) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_REPEAT) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TABSTOP) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_BORDER) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DROPDOWN) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_IMAGE_URL) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TARGET_URL) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_STRINGITEMLIST) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_BUTTONTYPE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_ESCAPE_PROCESSING) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TRISTATE) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_SHOWTHOUSANDSEP) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_FORMATKEY) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) );
+ aInterestingProperties.push_back( static_cast<const OUString&>(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 <NULL/>
*/
- 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 <NULL/>
*/
- 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 <NULL/>
*/
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
<TRUE/> 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
<TRUE/> 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
<TRUE/> 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 <NULL/>.
*/
- ::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_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);
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 <FALSE/>, 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
<TRUE/> if and only if the property could be found. In this case, <arg>_pProperty</arg> (if
not <NULL/> 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 <member>m_aSupportedProperties</member>
*/
- 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<void,OBrowserListBox>& _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);
};
</pre>
*/
@@ -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; i<xContainer->getCount(); ++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<sal_Unicode>(nValue));
+ sText = OUString(static_cast<sal_Unicode>(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<labs(nRelPos); i++)
{
diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx
index 1b4df6e0b344..2c66b83e52b3 100644
--- a/extensions/source/propctrlr/unourl.cxx
+++ b/extensions/source/propctrlr/unourl.cxx
@@ -34,7 +34,7 @@ namespace pcr
//====================================================================
//= UnoURL
//====================================================================
- UnoURL::UnoURL( const ::rtl::OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _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<const rtl::OUString&>(PROPERTY_NAME) );
+ std::set< OUString > aFilter; aFilter.insert( static_cast<const OUString&>(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<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_FILTERPROPOSAL) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_BOUNDCOLUMN) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_FILTERPROPOSAL) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_BOUNDCOLUMN) );
bool bAllowBinding = m_pHelper->canBindToAnyDataType();
if ( bAllowBinding )
{
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_MAXTEXTLEN) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMIN) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMAX) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMIN) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMAX) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMIN) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMAX) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MIN) );
- aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MAX) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_MAXTEXTLEN) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMIN) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMAX) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMIN) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMAX) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMIN) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMAX) );
+ aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MIN) );
+ aSuperfluous.push_back( static_cast<const OUString&>(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<const rtl::OUString&>(PROPERTY_XSD_DATA_TYPE) );
- aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XML_DATA_MODEL) );
+ aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XSD_DATA_TYPE) );
+ aInterestedInActuations.push_back( static_cast<const OUString&>(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
<TRUE/> 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<ResourceBundleDescriptor, ResourceBundleDescriptor, bool>
{
@@ -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<sal_Int32>(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<SaneHolder> 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<SaneHolder> 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::OUString>(), RTL_TEXTENCODING_UTF8);
+ return OUStringToOString(aValue.get<OUString>(), 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<uno::XComponentContext>& 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<uno::XComponentContext> 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<beans::NamedValue>& )
DownloadThread::DownloadThread(osl::Condition& rCondition,
const uno::Reference<uno::XComponentContext>& 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<uno::XComponentContext>& 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<com::sun::star::uno::XComponentContext>& 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<UpdateHandler> 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; i<nChanges; ++i )
{
@@ -647,8 +647,8 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException)
}
//------------------------------------------------------------------------------
-bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
- const rtl::OUString& rVersion )
+bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
+ const OUString& rVersion )
{
bool bNotify = true;
@@ -663,7 +663,7 @@ bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionNa
if ( m_xIgnoredUpdates->hasByName( 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<uno::XComponentContext>& 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<beans::NamedValue>& namedValues)
uno::Sequence<beans::NamedValue> aEnvironment =
getValue< uno::Sequence<beans::NamedValue> > (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<beans::NamedValue>& 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<<CANCEL_BUTTON) + (1<<THROBBER_CTRL) );
enableControls( 1<<CANCEL_BUTTON );
setControlProperty( TEXT_STATUS, "Text", uno::Any( substVariables(msChecking) ) );
- setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rtl::OUString() ) );
+ setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( OUString() ) );
focusControl( CANCEL_BUTTON );
break;
case UPDATESTATE_ERROR_CHECKING:
@@ -566,7 +566,7 @@ void UpdateHandler::updateState( UpdateState eState )
showControls( 0 );
enableControls( 1 << CLOSE_BUTTON );
setControlProperty( TEXT_STATUS, "Text", uno::Any( substVariables(msNoUpdFound) ) );
- setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rtl::OUString() ) );
+ setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( OUString() ) );
focusControl( CLOSE_BUTTON );
break;
case UPDATESTATE_DOWNLOADING:
@@ -610,9 +610,9 @@ void UpdateHandler::updateState( UpdateState eState )
}
//--------------------------------------------------------------------
-void UpdateHandler::searchAndReplaceAll( rtl::OUString &rText,
- const rtl::OUString &rWhat,
- const rtl::OUString &rWith ) const
+void UpdateHandler::searchAndReplaceAll( OUString &rText,
+ const OUString &rWhat,
+ const OUString &rWith ) const
{
sal_Int32 nIndex = rText.indexOf( rWhat );
@@ -624,11 +624,11 @@ void UpdateHandler::searchAndReplaceAll( rtl::OUString &rText,
}
//--------------------------------------------------------------------
-rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle > 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) <status>
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) <description>
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<uno::XComponentContext>& 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<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item);
+ static uno::Any getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> 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<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item)
+UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> 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<XInvocation> convertComObject( IUnknown* pUnk);
Reference<XInvocation> 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<T>& seqIn, const Sequence<Any> & 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<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( 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<rtl::OUString> aNames(1);
- rtl::OUString* pNames = aNames.getArray();
- pNames[0] = rtl::OUString(
+ 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( 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<c; ++i)
{
if (pNames[i].equals(sServiceName))
@@ -182,7 +182,7 @@ sal_Bool SAL_CALL BaseContainer::supportsService(const ::rtl::OUString& sService
-css::uno::Sequence< ::rtl::OUString > 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<c; ++i)
{
if (pNames[i].equals(sServiceName))
@@ -65,7 +65,7 @@ sal_Bool SAL_CALL ConfigFlush::supportsService(const ::rtl::OUString& sServiceNa
}
//-----------------------------------------------
-css::uno::Sequence< ::rtl::OUString > 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<ce; ++e)
{
// Note: We must be sure that address the right hash entry
// does not depend from any upper/lower case problems ...
- ::rtl::OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase();
+ OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase();
OUStringList& lTypesForExtension = m_lExtensions2Types[sNormalizedExtension];
if (::std::find(lTypesForExtension.begin(), lTypesForExtension.end(), sType) != lTypesForExtension.end())
@@ -1111,7 +1111,7 @@ void FilterCache::impl_validateAndOptimize()
lTypesForExtension.push_back(sType);
}
- const ::rtl::OUString* pURLPattern = lURLPattern.getConstArray();
+ const OUString* pURLPattern = lURLPattern.getConstArray();
for (sal_Int32 u=0; u<cu; ++u)
{
OUStringList& lTypesForURLPattern = m_lURLPattern2Types[pURLPattern[u]];
@@ -1133,7 +1133,7 @@ void FilterCache::impl_validateAndOptimize()
if (!bAllFiltersShouldExist)
continue;
- ::rtl::OUString sPrefFilter;
+ OUString sPrefFilter;
aType[PROPNAME_PREFERREDFILTER] >>= 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<c; ++i)
{
@@ -1581,9 +1581,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
// SAFE -> ----------------------------------
::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; i<c; ++i)
{
@@ -2156,7 +2156,7 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence<
-void FilterCache::impl_interpretDataVal4Type(const ::rtl::OUString& sValue,
+void FilterCache::impl_interpretDataVal4Type(const OUString& sValue,
sal_Int32 nProp ,
CacheItem& rItem )
{
@@ -2187,7 +2187,7 @@ void FilterCache::impl_interpretDataVal4Type(const ::rtl::OUString& sValue,
-void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue,
+void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue,
sal_Int32 nProp ,
CacheItem& rItem )
{
@@ -2254,27 +2254,27 @@ void FilterCache::impl_readOldFormat()
catch(const css::uno::Exception&)
{ return; }
- ::rtl::OUString TYPES_SET("Types");
+ OUString TYPES_SET("Types");
// May be there is no type set ...
if (xCfg->hasByName(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; i<lItems.getLength(); ++i)
m_lTypes[pItems[i]] = impl_readOldItem(xSet, E_TYPE, pItems[i]);
}
- ::rtl::OUString FILTER_SET("Filters");
+ OUString FILTER_SET("Filters");
// May be there is no filter set ...
if (xCfg->hasByName(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<lItems.getLength(); ++i)
m_lFilters[pItems[i]] = impl_readOldItem(xSet, E_FILTER, pItems[i]);
}
@@ -2284,7 +2284,7 @@ void FilterCache::impl_readOldFormat()
CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& 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<rtl::OUString>();
+ return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get<OUString>();
}
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<sal_uInt32, sal_uInt16> 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 <vcl/fltcall.hxx>
#include <vcl/cvtgrf.hxx>
-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>( (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>( (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 <cppuhelper/implementationentry.hxx>
-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 <boost/preprocessor/repetition/repeat.hpp>
-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<rtl::OUString,sal_Size> ElementRefMapType;
+typedef std::map<OUString,sal_Size> ElementRefMapType;
struct AnnotatingVisitor
{
@@ -187,7 +187,7 @@ struct AnnotatingVisitor
uno::Reference<xml::dom::XNode> 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<xml::dom::XNode> 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; i<nNumAttrs; ++i )
{
sAttributeValue = xAttributes->item(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<xml::sax::XAttributeList> 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; i<nNumAttrs; ++i )
{
@@ -1258,9 +1258,9 @@ struct ShapeWritingVisitor
}
if ( x1 != x2 || y1 != y2 ) {
- rtl::OUString sLinePath = "M"+rtl::OUString::valueOf(x1)+","
- +rtl::OUString::valueOf(y1)+"L"+rtl::OUString::valueOf(x2)+","
- +rtl::OUString::valueOf(y2);
+ OUString sLinePath = "M"+OUString::valueOf(x1)+","
+ +OUString::valueOf(y1)+"L"+OUString::valueOf(x2)+","
+ +OUString::valueOf(y2);
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD(aPoly, sLinePath);
@@ -1276,7 +1276,7 @@ struct ShapeWritingVisitor
case XML_POLYGON:
case XML_POLYLINE:
{
- rtl::OUString sPoints = xElem->hasAttribute("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; i<nNumAttrs; ++i )
@@ -1350,7 +1350,7 @@ struct ShapeWritingVisitor
}
case XML_PATH:
{
- rtl::OUString sPath = xElem->hasAttribute("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; i<nNumAttrs; ++i )
{
@@ -1400,7 +1400,7 @@ struct ShapeWritingVisitor
{
// collect attributes
const sal_Int32 nNumAttrs( xAttributes->getLength() );
- rtl::OUString sAttributeValue;
+ OUString sAttributeValue;
double cx=0.0,cy=0.0,rx=0.0, ry=0.0;
for( sal_Int32 i=0; i<nNumAttrs; ++i )
{
@@ -1438,7 +1438,7 @@ struct ShapeWritingVisitor
{
// collect attributes
const sal_Int32 nNumAttrs( xAttributes->getLength() );
- rtl::OUString sAttributeValue;
+ OUString sAttributeValue;
double x=0.0,y=0.0,width=0.0,height=0.0;
for( sal_Int32 i=0; i<nNumAttrs; ++i )
{
@@ -1465,8 +1465,8 @@ struct ShapeWritingVisitor
}
}
- rtl::OUString sValue = xElem->hasAttribute("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; i<nNumAttrs; ++i )
{
@@ -1533,8 +1533,8 @@ struct ShapeWritingVisitor
y -= 2.0*maCurrState.mnFontSize/3.0;
}
- xAttrs->AddAttribute( "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<SvXMLAttributeList>& xAttrs,
const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs,
const uno::Reference<xml::dom::XElement>& 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<SvXMLAttributeList>& xAttrs,
const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs,
const uno::Reference<xml::dom::XElement>& 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<basegfx::B2DPolyPolygon> 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<SvXMLAttributeList>& xAttrs,
const uno::Reference<xml::dom::XElement>& /* 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<xml::sax::XAttributeList> 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<xml::dom::XElement>& xElem )
{
OSL_TRACE("name: %s",
- rtl::OUStringToOString(
+ OUStringToOString(
xElem->getTagName(),
RTL_TEXTENCODING_UTF8 ).getStr());
}
@@ -1865,17 +1865,17 @@ struct DumpingVisitor
const uno::Reference<xml::dom::XNamedNodeMap>& 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; i<nNumAttrs; ++i )
{
OSL_TRACE(" %s=%s",
- rtl::OUStringToOString(
+ OUStringToOString(
xAttributes->item(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 <boost/shared_array.hpp>
-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<XText> mrTextShape;
- ::rtl::OUString msShapeId;
+ OUString msShapeId;
Reference<XEnumeration> mrParagraphEnumeration;
Reference<XTextContent> mrCurrentTextParagraph;
Reference<XEnumeration> 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("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
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("</" + aName + ">");
}
-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 <sal/config.h>
+#include <rtl/ustring.hxx>
-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<uno::XComponen
PlainTextFilterDetect::~PlainTextFilterDetect() {}
-rtl::OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException)
+OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException)
{
OUString aType;
OUString aDocService;
@@ -126,21 +126,21 @@ void SAL_CALL PlainTextFilterDetect::initialize(const uno::Sequence<uno::Any>& /
{
}
-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<rtl::OUString> PlainTextFilterDetect_getSupportedServiceNames()
+uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(2);
- rtl::OUString* pArray = aRet.getArray();
+ uno::Sequence<OUString> 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<uno::XInterface> 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<rtl::OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames()
+uno::Sequence<OUString> 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<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 );
// 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<rtl::OUString> SAL_CALL getSupportedServiceNames()
+ virtual com::sun::star::uno::Sequence<OUString> 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<rtl::OUString> PlainTextFilterDetect_getSupportedServiceNames();
+com::sun::star::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames();
com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
PlainTextFilterDetect_createInstance(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& 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<staruno::XWeak*>(this));
+ throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(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 <com/sun/star/beans/PropertyState.hpp>
#include <ucbhelper/content.hxx>
-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<PropertyValue > 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 <XNameAccess> 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;
-
- 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 ::rtl::OUString sCdataAttribute;
- const ::rtl::OUString sWhiteSpace;
+ OUString maValue;
+ OUString maNodeName;
+ OUString maPropertyName;
+
+ 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 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<OleHandler*> (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<sal_Int8> oleData;
- ::sax::Converter::decodeBase64(oleData, ::rtl::OStringToOUString(
+ ::sax::Converter::decodeBase64(oleData, OStringToOUString(
content, RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS));
m_rootStream = createTempFile();
Reference<XOutputStream> 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<sal_Int8> 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<XStream> subStream = createTempFile();
Reference<XInputStream> 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<xslt::XXSLTTransformer> impl_createTransformer(const rtl::OUString& rTransformer, const Sequence<Any>& rArgs);
+ css::uno::Reference<xslt::XXSLTTransformer> impl_createTransformer(const OUString& rTransformer, const Sequence<Any>& 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<XComponentContext> xContext(
@@ -201,7 +201,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
}
css::uno::Reference<xslt::XXSLTTransformer>
- XSLTFilter::impl_createTransformer(const rtl::OUString& rTransformer, const Sequence<Any>& rArgs)
+ XSLTFilter::impl_createTransformer(const OUString& rTransformer, const Sequence<Any>& rArgs)
{
css::uno::Reference<xslt::XXSLTTransformer> xTransformer;
@@ -379,7 +379,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
if (xInterActionHandler.is()) {
Sequence<Any> 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<XObjectOutputStream>& _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<XObjectInputStream>& _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> 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<stario::XObjectInputStream>&
// 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<Property>& 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<XPropertySet>
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<stario::XObjectInputStream>&
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<stario::XObjectInputStream>&
}
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<XNameAccess> xFieldsByName = getTableFields(xConnection, m_aListSource);
Reference<XIndexAccess> 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<XPropertySet> 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; k<nFieldsCount; ++k)
aStringList.push_back(pustrNames[k]);
@@ -671,7 +671,7 @@ void OComboBoxModel::loadData( bool _bForce )
// Create StringSequence for ListBox
StringSequence aStringSeq(aStringList.size());
- ::rtl::OUString* pStringAry = aStringSeq.getArray();
+ OUString* pStringAry = aStringSeq.getArray();
for (sal_Int32 i = 0; i<aStringSeq.getLength(); ++i)
pStringAry[i] = aStringList[i];
@@ -726,7 +726,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
{
Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( 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; i<aStringItemList.getLength(); ++i, ++pStringItems)
{
@@ -801,7 +801,7 @@ Any OComboBoxModel::translateDbColumnToControlValue()
OSL_PRECOND( m_pValueFormatter.get(), "OComboBoxModel::translateDbColumnToControlValue: no value formatter!" );
if ( m_pValueFormatter.get() )
{
- ::rtl::OUString sValue( m_pValueFormatter->getFormattedValue() );
+ 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<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
+OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
{
return GetDataEncoded(true,SubmitButton,MouseEvt);
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
+OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& 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<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
+OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
{
return GetDataEncoded(false,SubmitButton,MouseEvt);
}
//------------------------------------------------------------------------
-Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, ::rtl::OUString& rContentType)
+Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, OUString& rContentType)
{
// Create Parent
@@ -555,7 +555,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt );
- // Aggregate Liste to ::rtl::OUString
+ // Aggregate Liste to OUString
for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
pSuccObj < aSuccObjList.end();
++pSuccObj
@@ -596,7 +596,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
//------------------------------------------------------------------------
namespace
{
- static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, ::rtl::OUStringBuffer& _rOut )
+ static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut )
{
sal_Int32 nCurLen = _rOut.getLength();
_rOut.append( _nNumber );
@@ -606,7 +606,7 @@ namespace
}
//------------------------------------------------------------------------
-void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference<XPropertySet>& xComponentSet, const ::rtl::OUString& rNamePrefix,
+void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference<XPropertySet>& xComponentSet, const OUString& rNamePrefix,
const Reference<XControl>& 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))
{
// <name>=<label>
- ::rtl::OUString aLabel;
+ OUString aLabel;
xComponentSet->getPropertyValue( PROPERTY_LABEL ) >>= aLabel;
rList.push_back( HtmlSuccessfulObj(aName, aLabel) );
}
@@ -660,10 +660,10 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
if (xSubmitButtonComponent == xComponentSet)
{
// <name>.x=<pos.X>&<name>.y=<pos.Y>
- ::rtl::OUString aRhs = ::rtl::OUString::valueOf( MouseEvt.X );
+ OUString aRhs = OUString::valueOf( MouseEvt.X );
// Only if a name is available we have a name.x
- rtl::OUStringBuffer aLhs(aName);
+ OUStringBuffer aLhs(aName);
if (!aName.isEmpty())
aLhs.append(".x");
else
@@ -671,7 +671,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
rList.push_back( HtmlSuccessfulObj(aLhs.makeStringAndClear(), aRhs) );
aLhs.append(aName);
- aRhs = ::rtl::OUString::valueOf( MouseEvt.Y );
+ aRhs = OUString::valueOf( MouseEvt.Y );
if (!aName.isEmpty())
aLhs.append(".y");
else
@@ -693,7 +693,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
if( nChecked != 1 )
break;
- ::rtl::OUString aStrValue;
+ OUString aStrValue;
if( hasProperty(PROPERTY_REFVALUE, xComponentSet) )
xComponentSet->getPropertyValue( PROPERTY_REFVALUE ) >>= aStrValue;
@@ -712,7 +712,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
sal_Bool bMulti = rxSubmitButton.is()
&& (aTmp.getValueType().getTypeClass() == TypeClass_BOOLEAN)
&& getBOOL(aTmp);
- ::rtl::OUString sText;
+ OUString sText;
if ( bMulti ) // For multiline edit, get the text at the control
{
@@ -754,7 +754,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
// <name>=<text>
if( hasProperty(PROPERTY_TEXT, xComponentSet) )
{
- ::rtl::OUString aText;
+ OUString aText;
xComponentSet->getPropertyValue( PROPERTY_TEXT ) >>= aText;
rList.push_back( HtmlSuccessfulObj(aName, aText) );
}
@@ -766,7 +766,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
// no value (NULL) means empty value
if( hasProperty(PROPERTY_VALUE, xComponentSet) )
{
- ::rtl::OUString aText;
+ OUString aText;
Any aVal = xComponentSet->getPropertyValue( PROPERTY_VALUE );
double aDoubleVal = 0;
@@ -785,13 +785,13 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
// no value (NULL) means empty value
if( hasProperty(PROPERTY_DATE, xComponentSet) )
{
- ::rtl::OUString aText;
+ OUString aText;
Any aVal = xComponentSet->getPropertyValue( PROPERTY_DATE );
sal_Int32 nInt32Val = 0;
if (aVal >>= nInt32Val)
{
::Date aDate( nInt32Val );
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
appendDigits( aDate.GetMonth(), 2, aBuffer );
aBuffer.append( (sal_Unicode)'-' );
appendDigits( aDate.GetDay(), 2, aBuffer );
@@ -808,13 +808,13 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
// no value (NULL) means empty value
if( hasProperty(PROPERTY_TIME, xComponentSet) )
{
- ::rtl::OUString aText;
+ OUString aText;
Any aVal = xComponentSet->getPropertyValue( PROPERTY_TIME );
sal_Int32 nInt32Val = 0;
if (aVal >>= nInt32Val)
{
::Time aTime(nInt32Val);
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
appendDigits( aTime.GetHour(), 2, aBuffer );
aBuffer.append( (sal_Unicode)'-' );
appendDigits( aTime.GetMin(), 2, aBuffer );
@@ -833,7 +833,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
// <name>=<value>
if( hasProperty(PROPERTY_HIDDEN_VALUE, xComponentSet) )
{
- ::rtl::OUString aText;
+ OUString aText;
xComponentSet->getPropertyValue( PROPERTY_HIDDEN_VALUE ) >>= aText;
rList.push_back( HtmlSuccessfulObj(aName, aText) );
}
@@ -846,7 +846,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
if( hasProperty(PROPERTY_TEXT, xComponentSet) )
{
- ::rtl::OUString aText;
+ OUString aText;
xComponentSet->getPropertyValue( PROPERTY_TEXT ) >>= aText;
rList.push_back( HtmlSuccessfulObj(aName, aText, SUCCESSFUL_REPRESENT_FILE) );
}
@@ -862,16 +862,16 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
break;
// Displayed values
- Sequence< ::rtl::OUString > aVisibleList;
+ Sequence< OUString > aVisibleList;
xComponentSet->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aVisibleList;
sal_Int32 nStringCnt = aVisibleList.getLength();
- const ::rtl::OUString* pStrings = aVisibleList.getConstArray();
+ const OUString* pStrings = aVisibleList.getConstArray();
// Value list
- Sequence< ::rtl::OUString > aValueList;
+ Sequence< OUString > aValueList;
xComponentSet->getPropertyValue( PROPERTY_VALUE_SEQ ) >>= aValueList;
sal_Int32 nValCnt = aValueList.getLength();
- const ::rtl::OUString* pVals = aValueList.getConstArray();
+ const OUString* pVals = aValueList.getConstArray();
// Selection
Sequence<sal_Int16> aSelectList;
@@ -894,7 +894,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
++nCurCnt;
}
- ::rtl::OUString aSubValue;
+ OUString aSubValue;
for(i=0; i<nCurCnt; ++i )
{
sal_Int16 nSelPos = pSels[i];
@@ -917,7 +917,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
if (!xContainer.is())
break;
- aName += rtl::OUString(static_cast<sal_Unicode>('.'));
+ aName += OUString(static_cast<sal_Unicode>('.'));
Reference<XPropertySet> xSet;
sal_Int32 nCount = xContainer->getCount();
@@ -942,7 +942,7 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList,
rList.clear();
// Iterate over Components
Reference<XPropertySet> xComponentSet;
- ::rtl::OUString aPrefix;
+ OUString aPrefix;
// we know already how many objects should be appended,
// so why not allocate the space for them
@@ -955,9 +955,9 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList,
}
//------------------------------------------------------------------------
-void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
+void ODatabaseForm::Encode( OUString& rString ) const
{
- ::rtl::OUStringBuffer aResult;
+ OUStringBuffer aResult;
// Line endings are represented as CR
rString = convertLineEnd(rString, LINEEND_CR);
@@ -1010,8 +1010,8 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
}
//------------------------------------------------------------------------
-void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUString& rName,
- const ::rtl::OUString& rData )
+void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rName,
+ const OUString& rData )
{
// Create part as MessageChild
@@ -1019,21 +1019,21 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
// Header
- ::rtl::OUStringBuffer aContentDisp;
+ OUStringBuffer aContentDisp;
aContentDisp.append("form-data; name=\"");
aContentDisp.append(rName);
aContentDisp.append('\"');
pChild->SetContentDisposition(aContentDisp.makeStringAndClear());
- pChild->SetContentType(::rtl::OUString("text/plain"));
+ pChild->SetContentType(OUString("text/plain"));
rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
const sal_Char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding );
- rtl::OUString aBestMatchingEncoding = rtl::OUString::createFromAscii(pBestMatchingEncoding);
+ OUString aBestMatchingEncoding = OUString::createFromAscii(pBestMatchingEncoding);
pChild->SetContentTransferEncoding(aBestMatchingEncoding);
// Body
SvMemoryStream* pStream = new SvMemoryStream;
- pStream->WriteLine( rtl::OUStringToOString(rData, rtl_getTextEncodingFromMimeCharset(pBestMatchingEncoding)) );
+ pStream->WriteLine( OUStringToOString(rData, rtl_getTextEncodingFromMimeCharset(pBestMatchingEncoding)) );
pStream->Flush();
pStream->Seek( 0 );
pChild->SetDocumentLB( new SvLockBytes(pStream, sal_True) );
@@ -1041,11 +1041,11 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
}
//------------------------------------------------------------------------
-sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::OUString& rName,
- const ::rtl::OUString& rFileName )
+sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rName,
+ const OUString& rFileName )
{
- rtl::OUString aFileName(rFileName);
- rtl::OUString aContentType(CONTENT_TYPE_STR_TEXT_PLAIN);
+ OUString aFileName(rFileName);
+ OUString aContentType(CONTENT_TYPE_STR_TEXT_PLAIN);
SvStream *pStream = 0;
if (!aFileName.isEmpty())
@@ -1081,7 +1081,7 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O
// Header
- ::rtl::OUStringBuffer aContentDisp;
+ OUStringBuffer aContentDisp;
aContentDisp.append("form-data; name=\"");
aContentDisp.append(rName);
aContentDisp.append('\"');
@@ -1090,7 +1090,7 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O
aContentDisp.append('\"');
pChild->SetContentDisposition(aContentDisp.makeStringAndClear());
pChild->SetContentType( aContentType );
- pChild->SetContentTransferEncoding(::rtl::OUString("8bit"));
+ pChild->SetContentTransferEncoding(OUString("8bit"));
// Body
@@ -1109,7 +1109,7 @@ void ODatabaseForm::onError( const SQLErrorEvent& _rEvent )
}
//------------------------------------------------------------------------------
-void ODatabaseForm::onError( const SQLException& _rException, const ::rtl::OUString& _rContextDescription )
+void ODatabaseForm::onError( const SQLException& _rException, const OUString& _rContextDescription )
{
if ( !m_aErrorListeners.getLength() )
return;
@@ -1385,20 +1385,20 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
DECL_IFACE_PROP4(ACTIVE_CONNECTION, XConnection, BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED);
DECL_BOOL_PROP2 ( APPLYFILTER, BOUND, MAYBEDEFAULT );
- DECL_PROP1 ( NAME, ::rtl::OUString, BOUND );
- DECL_PROP1 ( MASTERFIELDS, Sequence< ::rtl::OUString >, BOUND );
- DECL_PROP1 ( DETAILFIELDS, Sequence< ::rtl::OUString >, BOUND );
- DECL_PROP2 ( DATASOURCE, ::rtl::OUString, BOUND, CONSTRAINED );
+ DECL_PROP1 ( NAME, OUString, BOUND );
+ DECL_PROP1 ( MASTERFIELDS, Sequence< OUString >, BOUND );
+ DECL_PROP1 ( DETAILFIELDS, Sequence< OUString >, BOUND );
+ DECL_PROP2 ( DATASOURCE, OUString, BOUND, CONSTRAINED );
DECL_PROP3 ( CYCLE, TabulatorCycle, BOUND, MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP2 ( FILTER, ::rtl::OUString, BOUND, MAYBEDEFAULT );
+ DECL_PROP2 ( FILTER, OUString, BOUND, MAYBEDEFAULT );
DECL_BOOL_PROP2 ( INSERTONLY, BOUND, MAYBEDEFAULT );
DECL_PROP1 ( NAVIGATION, NavigationBarMode, BOUND );
DECL_BOOL_PROP1 ( ALLOWADDITIONS, BOUND );
DECL_BOOL_PROP1 ( ALLOWEDITS, BOUND );
DECL_BOOL_PROP1 ( ALLOWDELETIONS, BOUND );
DECL_PROP2 ( PRIVILEGES, sal_Int32, TRANSIENT, READONLY );
- 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 ( SUBMIT_METHOD, FormSubmitMethod, BOUND );
DECL_PROP1 ( SUBMIT_ENCODING, FormSubmitEncoding, BOUND );
DECL_BOOL_PROP3 ( DYNAMIC_CONTROL_BORDER, BOUND, MAYBEVOID, MAYBEDEFAULT );
@@ -1427,13 +1427,13 @@ Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( Runtime
}
//--------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
+void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
{
m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue );
}
//--------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
+void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
{
m_aPropertyBagHelper.removeProperty( _rName );
}
@@ -1625,7 +1625,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl
{
Any aAggregateProperty;
getFastPropertyValue(aAggregateProperty, PROPERTY_ID_DATASOURCE);
- bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, aAggregateProperty, ::getCppuType(static_cast<const ::rtl::OUString*>(NULL)));
+ bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, aAggregateProperty, ::getCppuType(static_cast<const OUString*>(NULL)));
}
break;
case PROPERTY_ID_TARGET_URL:
@@ -1701,7 +1701,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A
case PROPERTY_ID_FILTER:
{
- ::rtl::OUString sNewFilter;
+ OUString sNewFilter;
rValue >>= sNewFilter;
m_aFilterManager.setFilterComponent( FilterManager::fcPublicFilter, sNewFilter );
}
@@ -1912,7 +1912,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
break;
case PROPERTY_ID_FILTER:
- aReturn <<= ::rtl::OUString();
+ aReturn <<= OUString();
break;
case PROPERTY_ID_APPLYFILTER:
@@ -2012,7 +2012,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
if ( xColProps.is() )
xPSI = xColProps->getPropertySetInfo( );
- static const ::rtl::OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" );
+ static const OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" );
if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_CONTROLDEFAULT ) )
{
Any aDefault = xColProps->getPropertyValue( PROPERTY_CONTROLDEFAULT );
@@ -2147,8 +2147,8 @@ void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control,
}
}
// -----------------------------------------------------------------------------
-void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransformer>& xTransformer,const ::rtl::OUString& aURLStr,const ::rtl::OUString& aReferer,const ::rtl::OUString& aTargetName
- ,const ::rtl::OUString& aData,rtl_TextEncoding _eEncoding)
+void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransformer>& xTransformer,const OUString& aURLStr,const OUString& aReferer,const OUString& aTargetName
+ ,const OUString& aData,rtl_TextEncoding _eEncoding)
{
URL aURL;
aURL.Complete = aURLStr;
@@ -2161,16 +2161,16 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
if (xDisp.is())
{
Sequence<PropertyValue> aArgs(2);
- aArgs.getArray()[0].Name = ::rtl::OUString("Referer");
+ aArgs.getArray()[0].Name = OUString("Referer");
aArgs.getArray()[0].Value <<= aReferer;
// build a sequence from the to-be-submitted string
- rtl::OString a8BitData(rtl::OUStringToOString(aData, _eEncoding));
+ OString a8BitData(OUStringToOString(aData, _eEncoding));
// always ANSI #58641
Sequence< sal_Int8 > aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength());
Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
- aArgs.getArray()[1].Name = ::rtl::OUString("PostData");
+ aArgs.getArray()[1].Name = OUString("PostData");
aArgs.getArray()[1].Value <<= xPostData;
xDisp->dispatch(aURL, aArgs);
@@ -2197,9 +2197,9 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
FormSubmitEncoding eSubmitEncoding;
FormSubmitMethod eSubmitMethod;
- ::rtl::OUString aURLStr;
- ::rtl::OUString aReferer;
- ::rtl::OUString aTargetName;
+ OUString aURLStr;
+ OUString aReferer;
+ OUString aTargetName;
Reference< XModel > xModel;
{
SolarMutexGuard aGuard;
@@ -2232,7 +2232,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
// URL encoding
if( eSubmitEncoding == FormSubmitEncoding_URL )
{
- ::rtl::OUString aData;
+ OUString aData;
{
SolarMutexGuard aGuard;
aData = GetDataURLEncoded( Control, MouseEvt );
@@ -2255,7 +2255,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
if (xDisp.is())
{
Sequence<PropertyValue> aArgs(1);
- aArgs.getArray()->Name = ::rtl::OUString("Referer");
+ aArgs.getArray()->Name = OUString("Referer");
aArgs.getArray()->Value <<= aReferer;
xDisp->dispatch(aURL, aArgs);
}
@@ -2278,7 +2278,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
if (xDisp.is())
{
- ::rtl::OUString aContentType;
+ OUString aContentType;
Sequence<sal_Int8> aData;
{
SolarMutexGuard aGuard;
@@ -2288,15 +2288,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
return;
Sequence<PropertyValue> aArgs(3);
- aArgs.getArray()[0].Name = ::rtl::OUString("Referer");
+ aArgs.getArray()[0].Name = OUString("Referer");
aArgs.getArray()[0].Value <<= aReferer;
- aArgs.getArray()[1].Name = ::rtl::OUString("ContentType");
+ aArgs.getArray()[1].Name = OUString("ContentType");
aArgs.getArray()[1].Value <<= aContentType;
// build a sequence from the to-be-submitted string
Reference< XInputStream > xPostData = new SequenceInputStream(aData);
- aArgs.getArray()[2].Name = ::rtl::OUString("PostData");
+ aArgs.getArray()[2].Name = OUString("PostData");
aArgs.getArray()[2].Value <<= xPostData;
xDisp->dispatch(aURL, aArgs);
@@ -2304,7 +2304,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
}
else if( eSubmitEncoding == FormSubmitEncoding_TEXT )
{
- ::rtl::OUString aData;
+ OUString aData;
{
SolarMutexGuard aGuard;
aData = GetDataTextEncoded( Reference<XControl> (), MouseEvt );
@@ -2429,7 +2429,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com
sal_Bool bIsEmbedded = ::dbtools::isEmbeddedInDatabase( Parent, xOuterConnection );
if ( bIsEmbedded )
- xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, makeAny( ::rtl::OUString() ) );
+ xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, makeAny( OUString() ) );
}
//==============================================================================
@@ -2499,7 +2499,7 @@ Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() t
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const ::rtl::OUString& Name ) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name ) throw( RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -2507,7 +2507,7 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
// first control of the sequence
const Reference<XControlModel>* pControls = _rGroup.getConstArray();
Reference< XPropertySet > xSet;
- ::rtl::OUString sGroupName( Name );
+ OUString sGroupName( Name );
for( sal_Int32 i=0; i<_rGroup.getLength(); ++i, ++pControls )
{
@@ -2535,11 +2535,11 @@ sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException )
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName ) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName ) throw( RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
_rGroup.realloc(0);
- _rName = ::rtl::OUString();
+ _rName = OUString();
if ((nGroup < 0) || (nGroup >= m_pGroupManager->getGroupCount()))
return;
@@ -2547,7 +2547,7 @@ void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XCon
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::getGroupByName(const ::rtl::OUString& Name, Sequence< Reference<XControlModel> >& _rGroup) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel> >& _rGroup) throw( RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
_rGroup.realloc(0);
@@ -2679,11 +2679,11 @@ void SAL_CALL ODatabaseForm::load() throw( RuntimeException )
sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rxParentProps )
{
// our own data source
- ::rtl::OUString sOwnDatasource;
+ OUString sOwnDatasource;
m_xAggregateSet->getPropertyValue( PROPERTY_DATASOURCE ) >>= sOwnDatasource;
// our parents data source
- ::rtl::OUString sParentDataSource;
+ OUString sParentDataSource;
OSL_ENSURE( _rxParentProps.is() && _rxParentProps->getPropertySetInfo().is() && _rxParentProps->getPropertySetInfo()->hasPropertyByName( PROPERTY_DATASOURCE ),
"ODatabaseForm::doShareConnection: invalid parent form!" );
if ( _rxParentProps.is() )
@@ -2700,8 +2700,8 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx
else
{ // the data source name is empty
// -> ook for the URL
- ::rtl::OUString sParentURL;
- ::rtl::OUString sMyURL;
+ OUString sParentURL;
+ OUString sMyURL;
_rxParentProps->getPropertyValue( PROPERTY_URL ) >>= sParentURL;
m_xAggregateSet->getPropertyValue( PROPERTY_URL ) >>= sMyURL;
@@ -2714,11 +2714,11 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx
// check for the user/password
// take the user property on the rowset (if any) into account
- ::rtl::OUString sParentUser, sParentPwd;
+ OUString sParentUser, sParentPwd;
_rxParentProps->getPropertyValue( PROPERTY_USER ) >>= sParentUser;
_rxParentProps->getPropertyValue( PROPERTY_PASSWORD ) >>= sParentPwd;
- ::rtl::OUString sMyUser, sMyPwd;
+ OUString sMyUser, sMyPwd;
m_xAggregateSet->getPropertyValue( PROPERTY_USER ) >>= sMyUser;
m_xAggregateSet->getPropertyValue( PROPERTY_PASSWORD ) >>= sMyPwd;
@@ -3625,7 +3625,7 @@ void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw( SQLException, RuntimeException )
+void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException )
{
m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName);
}
@@ -3673,7 +3673,7 @@ void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw( SQLException, RuntimeException )
+void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException )
{
m_aParameterManager.setString(parameterIndex, x);
}
@@ -3775,16 +3775,16 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th
// com::sun::star::lang::XServiceInfo
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static()
+OUString SAL_CALL ODatabaseForm::getImplementationName_Static()
{
- return ::rtl::OUString( "com.sun.star.comp.forms.ODatabaseForm" );
+ return OUString( "com.sun.star.comp.forms.ODatabaseForm" );
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static()
+Sequence< OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices( 1 );
- ::rtl::OUString* pServices = aServices.getArray();
+ Sequence< OUString > aServices( 1 );
+ OUString* pServices = aServices.getArray();
*pServices++ = FRM_COMPONENT_FORM;
@@ -3792,13 +3792,13 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_St
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static()
+Sequence< OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices( 5 );
- ::rtl::OUString* pServices = aServices.getArray();
+ Sequence< OUString > aServices( 5 );
+ OUString* pServices = aServices.getArray();
*pServices++ = FRM_SUN_FORMCOMPONENT;
- *pServices++ = ::rtl::OUString("com.sun.star.form.FormComponents");
+ *pServices++ = OUString("com.sun.star.form.FormComponents");
*pServices++ = FRM_SUN_COMPONENT_FORM;
*pServices++ = FRM_SUN_COMPONENT_HTMLFORM;
*pServices++ = FRM_SUN_COMPONENT_DATAFORM;
@@ -3807,7 +3807,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static()
+Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static()
{
return ::comphelper::concatSequences(
getCurrentServiceNames_Static(),
@@ -3816,16 +3816,16 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Sta
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException )
+OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException )
{
return getImplementationName_Static();
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException )
{
// the services of our aggregate
- Sequence< ::rtl::OUString > aServices;
+ Sequence< OUString > aServices;
Reference< XServiceInfo > xInfo;
if (query_aggregation(m_xAggregate, xInfo))
aServices = xInfo->getSupportedServiceNames();
@@ -3842,10 +3842,10 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() t
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL ODatabaseForm::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException )
+sal_Bool SAL_CALL ODatabaseForm::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;
@@ -3860,7 +3860,7 @@ const sal_uInt16 CYCLE = 0x0001;
const sal_uInt16 DONTAPPLYFILTER = 0x0002;
//------------------------------------------------------------------------------
-::rtl::OUString ODatabaseForm::getServiceName() throw( RuntimeException )
+OUString ODatabaseForm::getServiceName() throw( RuntimeException )
{
return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility !
}
@@ -3879,13 +3879,13 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
// Name
_rxOutStream << m_sName;
- ::rtl::OUString sDataSource;
+ OUString sDataSource;
if (m_xAggregateSet.is())
m_xAggregateSet->getPropertyValue(PROPERTY_DATASOURCE) >>= sDataSource;
_rxOutStream << sDataSource;
// former CursorSource
- ::rtl::OUString sCommand;
+ OUString sCommand;
if (m_xAggregateSet.is())
m_xAggregateSet->getPropertyValue(PROPERTY_COMMAND) >>= sCommand;
_rxOutStream << sCommand;
@@ -3932,7 +3932,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
_rxOutStream->writeBoolean(m_bAllowDelete);
// html form stuff
- ::rtl::OUString sTmp = INetURLObject::decode( m_aTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS);
+ OUString sTmp = INetURLObject::decode( m_aTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS);
_rxOutStream << sTmp;
_rxOutStream->writeShort( (sal_Int16)m_eSubmitMethod );
_rxOutStream->writeShort( (sal_Int16)m_eSubmitEncoding );
@@ -3951,8 +3951,8 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
_rxOutStream->writeShort((sal_Int16)m_eNavigation);
- ::rtl::OUString sFilter;
- ::rtl::OUString sOrder;
+ OUString sFilter;
+ OUString sOrder;
if (m_xAggregateSet.is())
{
m_xAggregateSet->getPropertyValue(PROPERTY_FILTER) >>= sFilter;
@@ -3992,7 +3992,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
_rxInStream >> m_sName;
- ::rtl::OUString sAggregateProp;
+ OUString sAggregateProp;
_rxInStream >> sAggregateProp;
if (m_xAggregateSet.is())
m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, makeAny(sAggregateProp));
@@ -4040,7 +4040,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
m_bAllowDelete = _rxInStream->readBoolean();
// html stuff
- ::rtl::OUString sTmp;
+ OUString sTmp;
_rxInStream >> sTmp;
m_aTargetURL = INetURLObject::decode( sTmp, '%', INetURLObject::DECODE_UNAMBIGUOUS);
m_eSubmitMethod = (FormSubmitMethod)_rxInStream->readShort();
@@ -4115,15 +4115,15 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R
// com::sun::star::container::XNamed
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException )
+OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException )
{
- ::rtl::OUString sReturn;
+ OUString sReturn;
OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= sReturn;
return sReturn;
}
//------------------------------------------------------------------------------
-void SAL_CALL ODatabaseForm::setName(const ::rtl::OUString& aName) throw( RuntimeException )
+void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException )
{
setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName));
}
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 4e250a0fa7e9..776b5fed1830 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -94,11 +94,11 @@ const sal_uInt16 SUCCESSFUL_REPRESENT_FILE = 0x0002;
class HtmlSuccessfulObj
{
public:
- ::rtl::OUString aName;
- ::rtl::OUString aValue;
+ OUString aName;
+ OUString aValue;
sal_uInt16 nRepresentation;
- HtmlSuccessfulObj( const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue,
+ HtmlSuccessfulObj( const OUString& _rName, const OUString& _rValue,
sal_uInt16 _nRepresent = SUCCESSFUL_REPRESENT_TEXT )
:aName( _rName )
,aValue( _rValue )
@@ -169,8 +169,8 @@ class ODatabaseForm :public OFormComponents
::osl::Mutex m_aResetSafety;
::com::sun::star::uno::Any m_aCycle;
::com::sun::star::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row
- ::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;
// the object doin' most of the work - an SDB-rowset
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate;
@@ -187,7 +187,7 @@ class ODatabaseForm :public OFormComponents
Timer* m_pLoadTimer;
OFormSubmitResetThread* m_pThread;
- ::rtl::OUString m_sCurrentErrorContext;
+ OUString m_sCurrentErrorContext;
// will be used as additional context information
// when an exception is catched and forwarded to the listeners
@@ -202,9 +202,9 @@ class ODatabaseForm :public OFormComponents
::com::sun::star::uno::Any m_aControlBorderColorMouse;
::com::sun::star::uno::Any m_aControlBorderColorInvalid;
::com::sun::star::uno::Any m_aDynamicControlBorder;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_aTargetURL;
- ::rtl::OUString m_aTargetFrame;
+ OUString m_sName;
+ OUString m_aTargetURL;
+ OUString m_aTargetFrame;
::com::sun::star::form::FormSubmitMethod m_eSubmitMethod;
::com::sun::star::form::FormSubmitEncoding m_eSubmitEncoding;
::com::sun::star::form::NavigationBarMode m_eNavigation;
@@ -280,18 +280,18 @@ public:
virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::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::awt::XTabControllerModel
virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) 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 > >& _rControls) 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& _rGroupName) 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& _rGroupName) 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 > >& _rxGroup, ::rtl::OUString& _rName) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL getGroupByName(const ::rtl::OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) 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 > >& _rxGroup, OUString& _rName) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL getGroupByName(const OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) throw(::com::sun::star::uno::RuntimeException);
// com::sun::star::lang::XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException);
@@ -376,19 +376,19 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& rows) throw(::com::sun::star::sdbc::SQLException, ::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 ::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);
// com::sun::star::lang::XServiceInfo - static version
- static ::rtl::OUString SAL_CALL getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCurrentServiceNames_Static();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCompatibleServiceNames_Static();
+ static OUString SAL_CALL getImplementationName_Static();
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCurrentServiceNames_Static();
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCompatibleServiceNames_Static();
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 );
// 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);
@@ -397,7 +397,7 @@ public:
// 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);
@@ -405,7 +405,7 @@ public:
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);
@@ -424,8 +424,8 @@ public:
virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) 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);
@@ -516,23 +516,23 @@ private:
// error handling
void onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent);
- void onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription);
+ void onError(const ::com::sun::star::sdbc::SQLException&, const OUString& _rContextDescription);
// html tools
- ::rtl::OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
- ::rtl::OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
- ::rtl::OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
+ OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
+ OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
+ OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
::com::sun::star::uno::Sequence<sal_Int8> GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt,
- ::rtl::OUString& rContentType);
+ OUString& rContentType);
- void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const ::rtl::OUString& rNamePrefix,
+ void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const OUString& rNamePrefix,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
void FillSuccessfulList(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt);
- void InsertTextPart(INetMIMEMessage& rParent, const ::rtl::OUString& rName, const ::rtl::OUString& rData);
- sal_Bool InsertFilePart(INetMIMEMessage& rParent, const ::rtl::OUString& rName, const ::rtl::OUString& rFileName);
- void Encode(::rtl::OUString& rString) const;
+ void InsertTextPart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rData);
+ sal_Bool InsertFilePart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rFileName);
+ void Encode(OUString& rString) const;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection();
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index bc59971729f6..7ebc20d53389 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -68,7 +68,7 @@ StringSequence SAL_CALL ODateControl::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_DATEFIELD;
return aSupported;
}
@@ -143,7 +143,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
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;
@@ -160,7 +160,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility !
}
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 7384c93a7c55..1160945550fb 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -45,7 +45,7 @@ public:
DECLARE_DEFAULT_LEAF_XTOR( ODateModel );
// XPersistObject
- virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::beans::XPropertySet
virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 81b816c55427..e3e3b76cf0b4 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -153,7 +153,7 @@ StringSequence OEditControl::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_TEXTFIELD;
return aSupported;
}
@@ -180,7 +180,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star
Reference<XPropertySet> xSet(getModel(), UNO_QUERY);
if (xSet.is())
{
- ::rtl::OUString sNewHtmlChangeValue;
+ OUString sNewHtmlChangeValue;
xSet->getPropertyValue( PROPERTY_TEXT ) >>= sNewHtmlChangeValue;
if( sNewHtmlChangeValue != m_aHtmlChangeValue )
{
@@ -217,7 +217,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
return;
aTmp = xFormSet->getPropertyValue( PROPERTY_TARGET_URL );
- if (!aTmp.getValueType().equals(::getCppuType((const ::rtl::OUString*)NULL)) ||
+ if (!aTmp.getValueType().equals(::getCppuType((const OUString*)NULL)) ||
getString(aTmp).isEmpty() )
return;
@@ -338,7 +338,7 @@ void OEditModel::disposing()
// XPersistObject
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility !
}
@@ -351,7 +351,7 @@ StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw()
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;
@@ -388,7 +388,7 @@ void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel )
DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT);
- DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT);
+ DECL_PROP2(DEFAULT_TEXT, OUString, BOUND, MAYBEDEFAULT);
DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT);
@@ -477,13 +477,13 @@ namespace
catch(const IllegalArgumentException& e)
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sMessage( "could not transfer the property named '" );
- sMessage += ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US );
- sMessage += ::rtl::OString( "'." );
+ OString sMessage( "could not transfer the property named '" );
+ sMessage += OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US );
+ sMessage += OString( "'." );
if ( !e.Message.isEmpty() )
{
- sMessage += ::rtl::OString( "\n\nMessage:\n" );
- sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US );
+ sMessage += OString( "\n\nMessage:\n" );
+ sMessage += OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US );
}
OSL_FAIL( sMessage.getStr() );
#else
@@ -508,7 +508,7 @@ void OEditModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutS
// but for compatibility, we need to use an "old" aggregate for writing and reading
Reference< XPropertySet > xFakedAggregate(
- getContext().createComponent( (rtl::OUString)VCL_CONTROLMODEL_EDIT ),
+ getContext().createComponent( (OUString)VCL_CONTROLMODEL_EDIT ),
UNO_QUERY
);
OSL_ENSURE( xFakedAggregate.is(), "OEditModel::writeAggregate: could not create an old EditControlModel!" );
@@ -530,7 +530,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre
// but for compatibility, we need to use an "old" aggregate for writing and reading
Reference< XPropertySet > xFakedAggregate(
- getContext().createComponent( (rtl::OUString)VCL_CONTROLMODEL_EDIT ),
+ getContext().createComponent( (OUString)VCL_CONTROLMODEL_EDIT ),
UNO_QUERY
);
Reference< XPersistObject > xFakedPersist( xFakedAggregate, UNO_QUERY );
@@ -567,7 +567,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw
// First we set it to an empty string : Without this the second setPropertyValue would not do anything as it thinks
// we aren't changing the prop (it didn't notify the - implicite - change of the text prop while setting the max text len)
// This seems to be a bug with in toolkit's EditControl-implementation.
- m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(::rtl::OUString()));
+ m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(OUString()));
m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, aCurrentText);
}
}
@@ -587,7 +587,7 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (
&& (getString(aDefaultControl) == STARDIV_ONE_FORM_CONTROL_TEXTFIELD )
)
{
- m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (::rtl::OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) );
// Older as well as current versions should understand this : the former knew only the STARDIV_ONE_FORM_CONTROL_EDIT,
// the latter are registered for both STARDIV_ONE_FORM_CONTROL_EDIT and STARDIV_ONE_FORM_CONTROL_TEXTFIELD.
}
@@ -619,7 +619,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
if ( !m_bMaxTextLenModified )
{
sal_Int32 nFieldLen = 0;
- xField->getPropertyValue(::rtl::OUString("Precision") ) >>= nFieldLen;
+ xField->getPropertyValue(OUString("Precision") ) >>= nFieldLen;
if (nFieldLen && nFieldLen <= USHRT_MAX)
{
@@ -673,7 +673,7 @@ sal_Bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
{
Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
- ::rtl::OUString sNewValue;
+ OUString sNewValue;
aNewValue >>= sNewValue;
if ( !aNewValue.hasValue()
@@ -713,7 +713,7 @@ Any OEditModel::translateDbColumnToControlValue()
Any aRet;
if ( m_pValueFormatter.get() )
{
- ::rtl::OUString sValue( m_pValueFormatter->getFormattedValue() );
+ OUString sValue( m_pValueFormatter->getFormattedValue() );
if ( sValue.isEmpty()
&& m_pValueFormatter->getColumn().is()
&& m_pValueFormatter->getColumn()->wasNull()
@@ -727,14 +727,14 @@ Any OEditModel::translateDbColumnToControlValue()
if ( nMaxTextLen && sValue.getLength() > nMaxTextLen )
{
sal_Int32 nDiff = sValue.getLength() - nMaxTextLen;
- sValue = sValue.replaceAt( nMaxTextLen, nDiff, ::rtl::OUString() );
+ sValue = sValue.replaceAt( nMaxTextLen, nDiff, OUString() );
}
aRet <<= sValue;
}
}
- return aRet.hasValue() ? aRet : makeAny( ::rtl::OUString() );
+ return aRet.hasValue() ? aRet : makeAny( OUString() );
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index bf39ef19957f..5ef4daf247e4 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -66,7 +66,7 @@ public:
// XPersistObject
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);
- virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
// XPropertySet
using OBoundControlModel::getFastPropertyValue;
@@ -131,7 +131,7 @@ class OEditControl : public OBoundControl
::cppu::OInterfaceContainerHelper
m_aChangeListeners;
- ::rtl::OUString m_aHtmlChangeValue;
+ OUString m_aHtmlChangeValue;
sal_uInt32 m_nKeyEvent;
public:
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index a9c6b4366c99..bfbb76f1d86a 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -48,8 +48,8 @@ const sal_uInt16 FILTERPROPOSAL = 0x0004;
DBG_NAME( OEditBaseModel )
//------------------------------------------------------------------
-OEditBaseModel::OEditBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const ::rtl::OUString& rUnoControlModelName,
- const ::rtl::OUString& rDefault, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation )
+OEditBaseModel::OEditBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const OUString& rUnoControlModelName,
+ const OUString& rDefault, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation )
:OBoundControlModel( _rxFactory, rUnoControlModelName, rDefault, sal_True, _bSupportExternalBinding, _bSupportsValidation )
,m_nLastReadVersion(0)
,m_bEmptyIsNull(sal_True)
@@ -331,7 +331,7 @@ Any OEditBaseModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
switch (nHandle)
{
case PROPERTY_ID_DEFAULT_TEXT:
- return makeAny(::rtl::OUString());
+ return makeAny(OUString());
case PROPERTY_ID_FILTERPROPOSAL:
return Any(makeAny((sal_Bool)sal_False));
case PROPERTY_ID_DEFAULT_VALUE:
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 9fdcca7858d3..3d22332657b5 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -59,7 +59,7 @@ class OEditBaseModel : public OBoundControlModel
protected:
// [properties] for all EditingFields
::com::sun::star::uno::Any m_aDefault;
- ::rtl::OUString m_aDefaultText; // default value
+ OUString m_aDefaultText; // default value
sal_Bool m_bEmptyIsNull : 1; // empty string will be interepreted as NULL when committing
sal_Bool m_bFilterProposal : 1; // use a list of possible value in filtermode
// [properties]
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 3b3cb127443e..43798c4dce26 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -76,7 +76,7 @@ StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeExcep
StringSequence aSupported = OControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 1);
- ::rtl::OUString*pArray = aSupported.getArray();
+ OUString*pArray = aSupported.getArray();
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FILECONTROL;
return aSupported;
}
@@ -145,7 +145,7 @@ Any OFileControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
switch ( _nHandle )
{
case PROPERTY_ID_DEFAULT_TEXT:
- return makeAny( ::rtl::OUString() );
+ return makeAny( OUString() );
}
return OControlModel::getPropertyDefaultByHandle( _nHandle );
}
@@ -192,13 +192,13 @@ sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any&
void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel )
- DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND);
+ DECL_PROP1(DEFAULT_TEXT, OUString, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
END_DESCRIBE_PROPERTIES();
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility !
}
@@ -236,7 +236,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS
break;
default:
OSL_FAIL("OFileControlModel::read : unknown version !");
- m_sDefaultValue = ::rtl::OUString();
+ m_sDefaultValue = OUString();
}
// Display default values after read
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 13d813a139d6..992e90776848 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -35,7 +35,7 @@ class OFileControlModel
,public ::com::sun::star::form::XReset
{
::cppu::OInterfaceContainerHelper m_aResetListeners;
- ::rtl::OUString m_sDefaultValue;
+ OUString m_sDefaultValue;
protected:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
@@ -63,7 +63,7 @@ public:
virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const;
// 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/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index c6c665f5db41..e7775267abb9 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -152,28 +152,28 @@ namespace frm
}
//------------------------------------------------------------------
- ::rtl::OUString OFilterControl::GetComponentServiceName()
+ OUString OFilterControl::GetComponentServiceName()
{
- ::rtl::OUString aServiceName;
+ OUString aServiceName;
switch (m_nControlClass)
{
case FormComponentType::RADIOBUTTON:
- aServiceName = rtl::OUString("radiobutton");
+ aServiceName = OUString("radiobutton");
break;
case FormComponentType::CHECKBOX:
- aServiceName = rtl::OUString("checkbox");
+ aServiceName = OUString("checkbox");
break;
case FormComponentType::COMBOBOX:
- aServiceName = rtl::OUString("combobox");
+ aServiceName = OUString("combobox");
break;
case FormComponentType::LISTBOX:
- aServiceName = rtl::OUString("listbox");
+ aServiceName = OUString("listbox");
break;
default:
if (m_bMultiLine)
- aServiceName = rtl::OUString("MultiLineEdit");
+ aServiceName = OUString("MultiLineEdit");
else
- aServiceName = rtl::OUString("Edit");
+ aServiceName = OUString("Edit");
}
return aServiceName;
}
@@ -268,7 +268,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void OFilterControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal )
+ void OFilterControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal )
{
// these properties are ignored
if (rPropName == PROPERTY_TEXT ||
@@ -289,7 +289,7 @@ namespace frm
//---------------------------------------------------------------------
void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException)
{
- ::rtl::OUStringBuffer aText;
+ OUStringBuffer aText;
switch (m_nControlClass)
{
case FormComponentType::CHECKBOX:
@@ -300,7 +300,7 @@ namespace frm
bool bSelected = ( rEvent.Selected == STATE_CHECK );
- ::rtl::OUString sExpressionMarker( "$expression$" );
+ OUString sExpressionMarker( "$expression$" );
::dbtools::getBoleanComparisonPredicate(
sExpressionMarker,
bSelected,
@@ -308,7 +308,7 @@ namespace frm
aText
);
- ::rtl::OUString sText( aText.makeStringAndClear() );
+ OUString sText( aText.makeStringAndClear() );
sal_Int32 nMarkerPos( sText.indexOf( sExpressionMarker ) );
OSL_ENSURE( nMarkerPos == 0, "OFilterControl::itemStateChanged: unsupported boolean comparison mode!" );
// If this assertion fails, then getBoleanComparisonPredicate created a predicate which
@@ -335,7 +335,7 @@ namespace frm
try
{
const Reference< XItemList > xItemList( getModel(), UNO_QUERY_THROW );
- ::rtl::OUString sItemText( xItemList->getItemText( rEvent.Selected ) );
+ OUString sItemText( xItemList->getItemText( rEvent.Selected ) );
const MapString2String::const_iterator itemPos = m_aDisplayItemToValueItem.find( sItemText );
if ( itemPos != m_aDisplayItemToValueItem.end() )
@@ -344,7 +344,7 @@ namespace frm
if ( !sItemText.isEmpty() )
{
::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() );
- ::rtl::OUString sErrorMessage;
+ OUString sErrorMessage;
OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) );
}
}
@@ -365,7 +365,7 @@ namespace frm
break;
}
- ::rtl::OUString sText( aText.makeStringAndClear() );
+ OUString sText( aText.makeStringAndClear() );
if ( m_aText.compareTo( sText ) )
{
m_aText = sText;
@@ -395,7 +395,7 @@ namespace frm
if ( !m_xField.is() )
return;
- ::rtl::OUString sFieldName;
+ OUString sFieldName;
m_xField->getPropertyValue( PROPERTY_NAME ) >>= sFieldName;
// here we need a table to which the field belongs to
@@ -405,13 +405,13 @@ namespace frm
// create a query composer
Reference< XColumnsSupplier > xSuppColumns;
- xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSuppColumns;
+ xFormProps->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSuppColumns;
const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW );
const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW );
if ( !xFieldNames->hasByName( sFieldName ) )
return;
- ::rtl::OUString sRealFieldName, sTableName;
+ OUString sRealFieldName, sTableName;
const Reference< XPropertySet > xComposerFieldProps( xFieldNames->getByName( sFieldName ), UNO_QUERY_THROW );
xComposerFieldProps->getPropertyValue( PROPERTY_REALNAME ) >>= sRealFieldName;
xComposerFieldProps->getPropertyValue( PROPERTY_TABLENAME ) >>= sTableName;
@@ -423,10 +423,10 @@ namespace frm
sTableName = xNamedTable->getName();
// create a statement selecting all values for the given field
- ::rtl::OUStringBuffer aStatement;
+ OUStringBuffer aStatement;
const Reference< XDatabaseMetaData > xMeta( xConnection->getMetaData(), UNO_SET_THROW );
- const ::rtl::OUString sQuoteChar = xMeta->getIdentifierQuoteString();
+ const OUString sQuoteChar = xMeta->getIdentifierQuoteString();
aStatement.appendAscii( "SELECT DISTINCT " );
aStatement.append( sQuoteChar );
@@ -444,13 +444,13 @@ namespace frm
aStatement.appendAscii( " FROM " );
- ::rtl::OUString sCatalog, sSchema, sTable;
+ OUString sCatalog, sSchema, sTable;
::dbtools::qualifiedNameComponents( xMeta, sTableName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
aStatement.append( ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sTable ) );
// execute the statement
xStatement.reset( xConnection->createStatement() );
- const ::rtl::OUString sSelectStatement( aStatement.makeStringAndClear( ) );
+ const OUString sSelectStatement( aStatement.makeStringAndClear( ) );
xListCursor.reset( xStatement->executeQuery( sSelectStatement ) );
// retrieve the one column which we take the values from
@@ -461,17 +461,17 @@ namespace frm
// ensure the values will be formatted according to the field format
const ::dbtools::FormattedColumnValue aFormatter( m_xFormatter, xDataField );
- ::std::vector< ::rtl::OUString > aProposals;
+ ::std::vector< OUString > aProposals;
aProposals.reserve(16);
while ( xListCursor->next() && ( aProposals.size() < size_t( SHRT_MAX ) ) )
{
- const ::rtl::OUString sCurrentValue = aFormatter.getFormattedValue();
+ const OUString sCurrentValue = aFormatter.getFormattedValue();
aProposals.push_back( sCurrentValue );
}
// fill the list items into our peer
- Sequence< ::rtl::OUString> aStringSeq( aProposals.size() );
+ Sequence< OUString> aStringSeq( aProposals.size() );
::std::copy( aProposals.begin(), aProposals.end(), aStringSeq.getArray() );
const Reference< XComboBox > xComboBox( getPeer(), UNO_QUERY_THROW );
@@ -508,7 +508,7 @@ namespace frm
// already asserted in ensureInitialized
return sal_True;
- ::rtl::OUString aText;
+ OUString aText;
switch (m_nControlClass)
{
case FormComponentType::TEXTFIELD:
@@ -524,12 +524,12 @@ namespace frm
if (m_aText.compareTo(aText))
{
// check the text with the SQL-Parser
- ::rtl::OUString aNewText(aText);
+ OUString aNewText(aText);
aNewText = aNewText.trim();
if ( !aNewText.isEmpty() )
{
::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() );
- ::rtl::OUString sErrorMessage;
+ OUString sErrorMessage;
if ( !aPredicateInput.normalizePredicateString( aNewText, m_xField, &sErrorMessage ) )
{
// display the error and outta here
@@ -565,7 +565,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void SAL_CALL OFilterControl::setText( const ::rtl::OUString& aText ) throw(RuntimeException)
+ void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException)
{
if ( !ensureInitialized( ) )
// already asserted in ensureInitialized
@@ -602,7 +602,7 @@ namespace frm
Reference< XVclWindowPeer > xVclWindow( getPeer(), UNO_QUERY );
if (xVclWindow.is())
{
- ::rtl::OUString aRefText = ::comphelper::getString(com::sun::star::uno::Reference< XPropertySet > (getModel(), UNO_QUERY)->getPropertyValue(PROPERTY_REFVALUE));
+ OUString aRefText = ::comphelper::getString(com::sun::star::uno::Reference< XPropertySet > (getModel(), UNO_QUERY)->getPropertyValue(PROPERTY_REFVALUE));
Any aValue;
if (aText == aRefText)
aValue <<= (sal_Int32)STATE_CHECK;
@@ -634,7 +634,7 @@ namespace frm
OSL_ENSURE( ( itemPos != m_aDisplayItemToValueItem.end() ) || m_aText.isEmpty(),
"OFilterControl::setText: this text is not in my display list!" );
if ( itemPos == m_aDisplayItemToValueItem.end() )
- m_aText = ::rtl::OUString();
+ m_aText = OUString();
if ( m_aText.isEmpty() )
{
@@ -664,7 +664,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
+ void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
{
Reference< XTextComponent > xText( getPeer(), UNO_QUERY );
if (xText.is())
@@ -675,15 +675,15 @@ namespace frm
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OFilterControl::getText() throw(RuntimeException)
+ OUString SAL_CALL OFilterControl::getText() throw(RuntimeException)
{
return m_aText;
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException)
+ OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException)
{
- ::rtl::OUString aSelected;
+ OUString aSelected;
Reference< XTextComponent > xText( getPeer(), UNO_QUERY );
if (xText.is())
aSelected = xText->getSelectedText();
@@ -761,7 +761,7 @@ namespace frm
PropertyValue aProp;
NamedValue aValue;
- const ::rtl::OUString* pName = NULL;
+ const OUString* pName = NULL;
const Any* pValue = NULL;
Reference< XPropertySet > xControlModel;
@@ -847,9 +847,9 @@ namespace frm
m_nControlClass = nClassId;
if ( FormComponentType::LISTBOX == nClassId )
{
- Sequence< ::rtl::OUString > aDisplayItems;
+ Sequence< OUString > aDisplayItems;
OSL_VERIFY( xControlModel->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aDisplayItems );
- Sequence< ::rtl::OUString > aValueItems;
+ Sequence< OUString > aValueItems;
OSL_VERIFY( xControlModel->getPropertyValue( PROPERTY_VALUE_SEQ ) >>= aValueItems );
OSL_ENSURE( aDisplayItems.getLength() == aValueItems.getLength(), "OFilterControl::initialize: inconsistent item lists!" );
for ( sal_Int32 i=0; i < ::std::min( aDisplayItems.getLength(), aValueItems.getLength() ); ++i )
@@ -874,16 +874,16 @@ namespace frm
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException)
+ OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException)
{
return getImplementationName_Static();
}
//---------------------------------------------------------------------
- sal_Bool SAL_CALL OFilterControl::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
+ sal_Bool SAL_CALL OFilterControl::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;
@@ -891,23 +891,23 @@ namespace frm
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_Static();
}
//---------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static()
+ OUString SAL_CALL OFilterControl::getImplementationName_Static()
{
- return ::rtl::OUString( "com.sun.star.comp.forms.OFilterControl" );
+ return OUString( "com.sun.star.comp.forms.OFilterControl" );
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static()
+ Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aNames( 2 );
- aNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.control.FilterControl" );
- aNames[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" );
+ Sequence< OUString > aNames( 2 );
+ aNames[ 0 ] = OUString( "com.sun.star.form.control.FilterControl" );
+ aNames[ 1 ] = OUString( "com.sun.star.awt.UnoControl" );
return aNames;
}
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index cd530478be0d..b8d7fd57eea3 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -67,10 +67,10 @@ namespace frm
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent;
- typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String;
+ typedef ::boost::unordered_map< OUString, OUString, OUStringHash > MapString2String;
MapString2String m_aDisplayItemToValueItem;
- ::rtl::OUString m_aText;
+ OUString m_aText;
::connectivity::OSQLParser m_aParser;
sal_Int16 m_nControlClass; // which kind of control do we use?
sal_Bool m_bFilterList : 1;
@@ -87,7 +87,7 @@ namespace frm
DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject);
::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString GetComponentServiceName();
+ virtual OUString GetComponentServiceName();
virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::lang::XComponent
@@ -96,10 +96,10 @@ namespace frm
// ::com::sun::star::awt::XTextComponent
virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setText( const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setText( const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException );
@@ -126,18 +126,18 @@ namespace frm
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);
// com::sun::star::lang::XServiceInfo - static version
- 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::lang::XMultiServiceFactory >& _rxFactory );
protected:
virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );
- 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 );
sal_Bool ensureInitialized( );
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 29fa80c1c214..f45efc18dae8 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -78,7 +78,7 @@ StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com:
StringSequence aSupported = OControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 1);
- ::rtl::OUString* pArray = aSupported.getArray();
+ OUString* pArray = aSupported.getArray();
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FIXEDTEXT;
return aSupported;
}
@@ -91,7 +91,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException)
+OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility !
}
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index a813298eab99..bfea6178ea07 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -40,7 +40,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/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index ac5b96c92a17..a666f6ab6bf2 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -90,7 +90,7 @@ namespace frm
if ( ( nOldLength != m_aOldValues.getLength() )
|| ( nOldLength != m_aNewValues.getLength() )
)
- throw RuntimeException( ::rtl::OUString(), m_rModel );
+ throw RuntimeException( OUString(), m_rModel );
m_aHandles.realloc( nOldLength + 1 );
m_aHandles[ nOldLength ] = _nHandle;
@@ -132,7 +132,7 @@ namespace frm
//=============================================================================
DBG_NAME(frm_OControl)
//------------------------------------------------------------------------------
-OControl::OControl( const Reference< XMultiServiceFactory >& _rxFactory, const rtl::OUString& _rAggregateService, const sal_Bool _bSetDelegator )
+OControl::OControl( const Reference< XMultiServiceFactory >& _rxFactory, const OUString& _rAggregateService, const sal_Bool _bSetDelegator )
:OComponentHelper(m_aMutex)
,m_aContext( _rxFactory )
{
@@ -241,10 +241,10 @@ void OControl::disposing()
// XServiceInfo
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OControl::supportsService(const rtl::OUString& _rsServiceName) throw ( RuntimeException)
+sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) throw ( RuntimeException)
{
- Sequence<rtl::OUString> aSupported = getSupportedServiceNames();
- const rtl::OUString* pSupported = aSupported.getConstArray();
+ Sequence<OUString> aSupported = getSupportedServiceNames();
+ const OUString* pSupported = aSupported.getConstArray();
for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported)
if (pSupported->equals(_rsServiceName))
return sal_True;
@@ -252,9 +252,9 @@ sal_Bool SAL_CALL OControl::supportsService(const rtl::OUString& _rsServiceName)
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > OControl::getAggregateServiceNames()
+Sequence< OUString > OControl::getAggregateServiceNames()
{
- Sequence< ::rtl::OUString > aAggServices;
+ Sequence< OUString > aAggServices;
Reference< XServiceInfo > xInfo;
if ( query_aggregation( m_xAggregate, xInfo ) )
aAggServices = xInfo->getSupportedServiceNames();
@@ -262,7 +262,7 @@ Sequence< ::rtl::OUString > OControl::getAggregateServiceNames()
}
//------------------------------------------------------------------------------
-Sequence<rtl::OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException)
+Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException)
{
return ::comphelper::concatSequences(
getAggregateServiceNames(),
@@ -271,10 +271,10 @@ Sequence<rtl::OUString> SAL_CALL OControl::getSupportedServiceNames() throw(Runt
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( RuntimeException )
{
// no own supported service names
- return Sequence< ::rtl::OUString >();
+ return Sequence< OUString >();
}
// XEventListener
@@ -391,7 +391,7 @@ sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException)
DBG_NAME(frm_OBoundControl);
//------------------------------------------------------------------
OBoundControl::OBoundControl( const Reference< XMultiServiceFactory >& _rxFactory,
- const ::rtl::OUString& _rAggregateService, const sal_Bool _bSetDelegator )
+ const OUString& _rAggregateService, const sal_Bool _bSetDelegator )
:OControl( _rxFactory, _rAggregateService, _bSetDelegator )
,m_bLocked(sal_False)
,m_aOriginalFont( EmptyFontDescriptor() )
@@ -542,7 +542,7 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE
//------------------------------------------------------------------------------
void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XObjectInputStream >& _rxInStream)
{
- ::rtl::OUString sHelpText;
+ OUString sHelpText;
::comphelper::operator>>( _rxInStream, sHelpText);
try
{
@@ -558,7 +558,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb
//------------------------------------------------------------------------------
void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XObjectOutputStream >& _rxOutStream)
{
- ::rtl::OUString sHelpText;
+ OUString sHelpText;
try
{
if (m_xAggregateSet.is())
@@ -574,8 +574,8 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO
//------------------------------------------------------------------
OControlModel::OControlModel(
const Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
- const ::rtl::OUString& _rUnoControlModelTypeName,
- const ::rtl::OUString& rDefault, const sal_Bool _bSetDelegator)
+ const OUString& _rUnoControlModelTypeName,
+ const OUString& rDefault, const sal_Bool _bSetDelegator)
:OComponentHelper(m_aMutex)
,OPropertySetAggregationHelper(OComponentHelper::rBHelper)
,m_aContext( _rxFactory )
@@ -723,25 +723,25 @@ void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent)
// XNamed
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OControlModel::getName() throw(RuntimeException)
+OUString SAL_CALL OControlModel::getName() throw(RuntimeException)
{
- ::rtl::OUString aReturn;
+ OUString aReturn;
OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= aReturn;
return aReturn;
}
//------------------------------------------------------------------------------
-void SAL_CALL OControlModel::setName(const ::rtl::OUString& _rName) throw(RuntimeException)
+void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeException)
{
setFastPropertyValue(PROPERTY_ID_NAME, makeAny(_rName));
}
// XServiceInfo
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OControlModel::supportsService(const rtl::OUString& _rServiceName) throw ( RuntimeException)
+sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) throw ( RuntimeException)
{
- Sequence<rtl::OUString> aSupported = getSupportedServiceNames();
- const rtl::OUString* pSupported = aSupported.getConstArray();
+ Sequence<OUString> aSupported = getSupportedServiceNames();
+ const OUString* pSupported = aSupported.getConstArray();
for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported)
if (pSupported->equals(_rServiceName))
return sal_True;
@@ -749,9 +749,9 @@ sal_Bool SAL_CALL OControlModel::supportsService(const rtl::OUString& _rServiceN
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > OControlModel::getAggregateServiceNames()
+Sequence< OUString > OControlModel::getAggregateServiceNames()
{
- Sequence< ::rtl::OUString > aAggServices;
+ Sequence< OUString > aAggServices;
Reference< XServiceInfo > xInfo;
if ( query_aggregation( m_xAggregate, xInfo ) )
aAggServices = xInfo->getSupportedServiceNames();
@@ -759,7 +759,7 @@ Sequence< ::rtl::OUString > OControlModel::getAggregateServiceNames()
}
//------------------------------------------------------------------------------
-Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException)
+Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException)
{
return ::comphelper::concatSequences(
getAggregateServiceNames(),
@@ -768,11 +768,11 @@ Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
{
- Sequence< ::rtl::OUString > aServiceNames( 2 );
+ Sequence< OUString > aServiceNames( 2 );
aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
- aServiceNames[ 1 ] = ::rtl::OUString("com.sun.star.form.FormControlModel");
+ aServiceNames[ 1 ] = OUString("com.sun.star.form.FormControlModel");
return aServiceNames;
}
@@ -964,7 +964,7 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
{
case PROPERTY_ID_NAME:
case PROPERTY_ID_TAG:
- aReturn <<= ::rtl::OUString();
+ aReturn <<= OUString();
break;
case PROPERTY_ID_CLASSID:
@@ -1064,12 +1064,12 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
switch (_nHandle)
{
case PROPERTY_ID_NAME:
- DBG_ASSERT(_rValue.getValueType() == getCppuType((const ::rtl::OUString*)NULL),
+ DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL),
"OControlModel::setFastPropertyValue_NoBroadcast : invalid type" );
_rValue >>= m_aName;
break;
case PROPERTY_ID_TAG:
- DBG_ASSERT(_rValue.getValueType() == getCppuType((const ::rtl::OUString*)NULL),
+ DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL),
"OControlModel::setFastPropertyValue_NoBroadcast : invalid type" );
_rValue >>= m_aTag;
break;
@@ -1098,9 +1098,9 @@ void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) con
{
BEGIN_DESCRIBE_BASE_PROPERTIES( 5 )
DECL_PROP2 (CLASSID, sal_Int16, READONLY, TRANSIENT);
- DECL_PROP1 (NAME, ::rtl::OUString, BOUND);
+ DECL_PROP1 (NAME, OUString, BOUND);
DECL_BOOL_PROP2 (NATIVE_LOOK, BOUND, TRANSIENT);
- DECL_PROP1 (TAG, ::rtl::OUString, BOUND);
+ DECL_PROP1 (TAG, OUString, BOUND);
DECL_PROP1 (GENERATEVBAEVENTS, sal_Bool, TRANSIENT);
END_DESCRIBE_PROPERTIES()
}
@@ -1148,13 +1148,13 @@ Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw(
}
//--------------------------------------------------------------------
-void SAL_CALL OControlModel::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
+void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
{
m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue );
}
//--------------------------------------------------------------------
-void SAL_CALL OControlModel::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
+void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
{
m_aPropertyBagHelper.removeProperty( _rName );
}
@@ -1228,7 +1228,7 @@ Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (R
//------------------------------------------------------------------
OBoundControlModel::OBoundControlModel(
const Reference< XMultiServiceFactory>& _rxFactory,
- const ::rtl::OUString& _rUnoControlModelTypeName, const ::rtl::OUString& _rDefault,
+ const OUString& _rUnoControlModelTypeName, const OUString& _rDefault,
const sal_Bool _bCommitable, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation )
:OControlModel( _rxFactory, _rUnoControlModelTypeName, _rDefault, sal_False )
,OPropertyChangeListener( m_aMutex )
@@ -1387,7 +1387,7 @@ void OBoundControlModel::implInitValuePropertyListening( ) const
}
//-----------------------------------------------------------------------------
-void OBoundControlModel::initOwnValueProperty( const ::rtl::OUString& i_rValuePropertyName )
+void OBoundControlModel::initOwnValueProperty( const OUString& i_rValuePropertyName )
{
OSL_PRECOND( m_sValuePropertyName.isEmpty() && -1 == m_nValuePropertyAggregateHandle,
"OBoundControlModel::initOwnValueProperty: value property is already initialized!" );
@@ -1396,7 +1396,7 @@ void OBoundControlModel::initOwnValueProperty( const ::rtl::OUString& i_rValuePr
}
//-----------------------------------------------------------------------------
-void OBoundControlModel::initValueProperty( const ::rtl::OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle )
+void OBoundControlModel::initValueProperty( const OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle )
{
OSL_PRECOND( m_sValuePropertyName.isEmpty() && -1 == m_nValuePropertyAggregateHandle,
"OBoundControlModel::initValueProperty: value property is already initialized!" );
@@ -1540,7 +1540,7 @@ void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) th
}
//------------------------------------------------------------------------------
-void OBoundControlModel::startAggregatePropertyListening( const ::rtl::OUString& _rPropertyName )
+void OBoundControlModel::startAggregatePropertyListening( const OUString& _rPropertyName )
{
OSL_PRECOND( m_pAggPropMultiplexer, "OBoundControlModel::startAggregatePropertyListening: no multiplexer!" );
OSL_ENSURE( !_rPropertyName.isEmpty(), "OBoundControlModel::startAggregatePropertyListening: invalid property name!" );
@@ -1653,10 +1653,10 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
{
- Sequence< ::rtl::OUString > aOwnServiceNames( 1 );
- aOwnServiceNames[ 0 ] = ::rtl::OUString("com.sun.star.form.DataAwareControlModel");
+ Sequence< OUString > aOwnServiceNames( 1 );
+ aOwnServiceNames[ 0 ] = OUString("com.sun.star.form.DataAwareControlModel");
return ::comphelper::concatSequences(
OControlModel::getSupportedServiceNames_Static(),
@@ -1843,7 +1843,7 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
break;
case PROPERTY_ID_CONTROLSOURCE:
- aDefault <<= ::rtl::OUString();
+ aDefault <<= OUString();
break;
case PROPERTY_ID_CONTROLLABEL:
@@ -1949,7 +1949,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
OSL_ENSURE( evt.Source == m_xExternalBinding, "OBoundControlModel::propertyChange: where did this come from?" );
// our binding has properties which can control properties of ourself
- ::rtl::OUString sBindingControlledProperty;
+ OUString sBindingControlledProperty;
bool bForwardToLabelControl = false;
if ( evt.PropertyName.equals( PROPERTY_READONLY ) )
{
@@ -3058,10 +3058,10 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 5, OControlModel )
- DECL_PROP1 ( CONTROLSOURCE, ::rtl::OUString, BOUND );
+ DECL_PROP1 ( CONTROLSOURCE, OUString, BOUND );
DECL_IFACE_PROP3( BOUNDFIELD, XPropertySet, BOUND, READONLY, TRANSIENT );
DECL_IFACE_PROP2( CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID );
- DECL_PROP2 ( CONTROLSOURCEPROPERTY, ::rtl::OUString, READONLY, TRANSIENT );
+ DECL_PROP2 ( CONTROLSOURCEPROPERTY, OUString, READONLY, TRANSIENT );
DECL_BOOL_PROP1 ( INPUT_REQUIRED, BOUND );
END_DESCRIBE_PROPERTIES()
}
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index d217a80f28dc..ca3142566205 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -266,7 +266,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
return;
Any aTmp(xFormSet->getPropertyValue( PROPERTY_TARGET_URL ));
- if (!isA(aTmp, static_cast< ::rtl::OUString* >(NULL)) ||
+ if (!isA(aTmp, static_cast< OUString* >(NULL)) ||
getString(aTmp).isEmpty() )
return;
@@ -322,7 +322,7 @@ StringSequence OFormattedControl::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_FORMATTEDFIELD;
return aSupported;
}
@@ -404,7 +404,7 @@ StringSequence OFormattedModel::getSupportedServiceNames() throw()
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;
@@ -440,9 +440,9 @@ Sequence< Type > OFormattedModel::_getTypes()
// XPersistObject
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString(FRM_COMPONENT_EDIT);
+ return OUString(FRM_COMPONENT_EDIT);
}
// XPropertySet
@@ -509,7 +509,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle)
}
//------------------------------------------------------------------------------
-void OFormattedModel::setPropertyToDefault(const ::rtl::OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException )
+void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException )
{
OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper();
sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
@@ -533,7 +533,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
}
//------------------------------------------------------------------------------
-Any SAL_CALL OFormattedModel::getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException )
+Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException )
{
OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper();
sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
@@ -601,7 +601,7 @@ void OFormattedModel::updateFormatterNullDate()
// calc the current NULL date
Reference< XNumberFormatsSupplier > xSupplier( calcFormatsSupplier() );
if ( xSupplier.is() )
- xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue( OUString( "NullDate" ) ) >>= m_aNullDate;
}
//------------------------------------------------------------------------------
@@ -774,7 +774,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
Reference<XNumberFormatsSupplier> xSupplier = calcFormatsSupplier();
m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) );
m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey );
- xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString("NullDate") ) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue( OUString("NullDate") ) >>= m_aNullDate;
OEditBaseModel::onConnectedDbColumn( _rxForm );
}
@@ -833,10 +833,10 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
Reference<XNumberFormats> xFormats = xSupplier->getNumberFormats();
- ::rtl::OUString sFormatDescription;
+ OUString sFormatDescription;
LanguageType eFormatLanguage = LANGUAGE_DONTKNOW;
- static const ::rtl::OUString s_aLocaleProp ("Locale");
+ static const OUString s_aLocaleProp ("Locale");
Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey);
if (hasProperty(s_aLocaleProp, xFormat))
{
@@ -849,7 +849,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
}
}
- static const ::rtl::OUString s_aFormatStringProp ("FormatString");
+ static const OUString s_aFormatStringProp ("FormatString");
if (hasProperty(s_aFormatStringProp, xFormat))
xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription;
@@ -919,7 +919,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
if (bNonVoidKey)
{
// den String und die Language lesen ....
- ::rtl::OUString sFormatDescription = _rxInStream->readUTF();
+ OUString sFormatDescription = _rxInStream->readUTF();
LanguageType eDescriptionLanguage = (LanguageType)_rxInStream->readLong();
// und daraus von einem Formatter zu einem Key zusammenwuerfeln lassen ...
@@ -1128,7 +1128,7 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
{
case TypeClass_STRING:
{
- ::rtl::OUString sString;
+ OUString sString;
if ( aControlValue >>= sString )
{
aExternalValue <<= sString;
@@ -1212,7 +1212,7 @@ Sequence< Type > OFormattedModel::getSupportedBindingTypes()
aTypes.push_front(::getCppuType( static_cast< UNODateTime* >( NULL ) ) );
break;
case NumberFormat::TEXT:
- aTypes.push_front(::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) );
+ aTypes.push_front(::getCppuType( static_cast< OUString* >( NULL ) ) );
break;
case NumberFormat::LOGICAL:
aTypes.push_front(::getCppuType( static_cast< sal_Bool* >( NULL ) ) );
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 6129e64dc5cf..a21313838d07 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -78,7 +78,7 @@ namespace frm
// XPersistObject
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);
- virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
// XPropertySet
virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
@@ -94,8 +94,8 @@ namespace frm
void setPropertyToDefaultByHandle(sal_Int32 nHandle);
::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const;
- void SAL_CALL setPropertyToDefault(const ::rtl::OUString& aPropertyName) 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::uno::RuntimeException);
+ void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) 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::uno::RuntimeException);
// OControlModel's property handling
virtual void describeFixedProperties(
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index e634bbf8ed7c..2a21dec3c620 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -186,20 +186,20 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
}
//------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException)
+OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException)
{
// return the old compatibility name for an EditModel
return FRM_COMPONENT_EDIT;
}
//------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException)
+OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper");
+ return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper");
}
//------------------------------------------------------------------
-sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
{
DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::supportsService: should never have made it 'til here without an aggregate!");
Reference< XServiceInfo > xSI;
@@ -208,7 +208,7 @@ sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const ::rtl::OUString
}
//------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException)
{
DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::getSupportedServiceNames: should never have made it 'til here without an aggregate!");
Reference< XServiceInfo > xSI;
@@ -237,7 +237,7 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>
// else we have to write an edit part first
OSL_ENSURE(m_pEditPart.is(), "OFormattedFieldWrapper::write : formatted part without edit part ?");
if ( !m_pEditPart.is() )
- throw RuntimeException( ::rtl::OUString(), *this );
+ throw RuntimeException( OUString(), *this );
// for this we transfer the current props of the formatted part to the edit part
Reference<XPropertySet> xFormatProps(m_xFormattedPart, UNO_QUERY);
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 957c6a7e94fa..1dc202c72d93 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -69,12 +69,12 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) 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);
// 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/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index e997ef77b948..7a37b4ebec68 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -44,7 +44,7 @@ InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServ
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException)
+OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException)
{
return FRM_SUN_FORMS_COLLECTION;
}
@@ -106,16 +106,16 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException)
+OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.forms.OFormsCollection");
+ return OUString("com.sun.star.comp.forms.OFormsCollection");
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFormsCollection::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
{
- Sequence<rtl::OUString> aSupported = getSupportedServiceNames();
- const rtl::OUString* pSupported = aSupported.getConstArray();
+ Sequence<OUString> aSupported = getSupportedServiceNames();
+ const OUString* pSupported = aSupported.getConstArray();
for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported)
if (pSupported->equals(_rServiceName))
return sal_True;
@@ -128,7 +128,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti
StringSequence aReturn(2);
aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION;
- aReturn.getArray()[1] = ::rtl::OUString("com.sun.star.form.FormComponents");
+ aReturn.getArray()[1] = OUString("com.sun.star.form.FormComponents");
return aReturn;
}
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index f5ec4c6c2241..c6c585806584 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -65,11 +65,11 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) 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);
// 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 StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
// XCloneable
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index d25212629ec5..be0bdbf9c031 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -78,7 +78,7 @@ InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiSer
DBG_NAME(OGridControlModel);
//------------------------------------------------------------------
OGridControlModel::OGridControlModel(const Reference<XMultiServiceFactory>& _rxFactory)
- :OControlModel(_rxFactory, ::rtl::OUString())
+ :OControlModel(_rxFactory, OUString())
,OInterfaceContainer(_rxFactory, m_aMutex, ::getCppuType(static_cast<Reference<XPropertySet>*>(NULL)))
,OErrorBroadcaster( OComponentHelper::rBHelper )
,FontControlModel( false )
@@ -201,8 +201,8 @@ StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeExcept
StringSequence aSupported = OControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
- ::rtl::OUString*pArray = aSupported.getArray();
- pArray[aSupported.getLength()-2] = ::rtl::OUString("com.sun.star.awt.UnoControlModel");
+ OUString*pArray = aSupported.getArray();
+ pArray[aSupported.getLength()-2] = OUString("com.sun.star.awt.UnoControlModel");
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL;
return aSupported;
}
@@ -363,9 +363,9 @@ void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectio
// XGridColumnFactory
//------------------------------------------------------------------------------
-Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- const Sequence< ::rtl::OUString >& rColumnTypes = frm::getColumnTypes();
+ const Sequence< OUString >& rColumnTypes = frm::getColumnTypes();
return createColumn( ::detail::findPos( ColumnType, rColumnTypes ) );
}
@@ -445,9 +445,9 @@ void OGridControlModel::_reset()
void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_BASE_PROPERTIES( 37 )
- DECL_PROP1(NAME, ::rtl::OUString, BOUND);
+ DECL_PROP1(NAME, OUString, BOUND);
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
- DECL_PROP1(TAG, ::rtl::OUString, BOUND);
+ DECL_PROP1(TAG, OUString, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID);
DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT);
@@ -455,14 +455,14 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps )
DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT);
DECL_PROP1(BORDER, sal_Int16, BOUND);
DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID);
- DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND);
+ DECL_PROP1(DEFAULTCONTROL, OUString, BOUND);
DECL_PROP3(TEXTCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID);
DECL_PROP3(BACKGROUNDCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID);
DECL_PROP2(FONT, FontDescriptor, BOUND, MAYBEDEFAULT);
DECL_PROP3(ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID);
- DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND);
- DECL_PROP1(FONT_NAME, ::rtl::OUString, MAYBEDEFAULT);
- DECL_PROP1(FONT_STYLENAME, ::rtl::OUString, MAYBEDEFAULT);
+ DECL_PROP1(HELPTEXT, OUString, BOUND);
+ DECL_PROP1(FONT_NAME, OUString, MAYBEDEFAULT);
+ DECL_PROP1(FONT_STYLENAME, OUString, MAYBEDEFAULT);
DECL_PROP1(FONT_FAMILY, sal_Int16, MAYBEDEFAULT);
DECL_PROP1(FONT_CHARSET, sal_Int16, MAYBEDEFAULT);
DECL_PROP1(FONT_HEIGHT, float, MAYBEDEFAULT);
@@ -479,7 +479,7 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps )
DECL_PROP4(CURSORCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID , TRANSIENT);
DECL_PROP3(ALWAYSSHOWCURSOR, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT);
DECL_PROP3(DISPLAYSYNCHRON, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT);
- DECL_PROP2(HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT);
+ DECL_PROP2(HELPURL, OUString, BOUND, MAYBEDEFAULT);
DECL_PROP2(WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT);
DECL_PROP3(CONTEXT_WRITING_MODE,sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT);
END_DESCRIBE_PROPERTIES();
@@ -733,7 +733,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
break;
case PROPERTY_ID_DEFAULTCONTROL:
- aReturn <<= ::rtl::OUString( STARDIV_ONE_FORM_CONTROL_GRID );
+ aReturn <<= OUString( STARDIV_ONE_FORM_CONTROL_GRID );
break;
case PROPERTY_ID_PRINTABLE:
@@ -751,7 +751,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
case PROPERTY_ID_HELPURL:
case PROPERTY_ID_HELPTEXT:
- aReturn <<= ::rtl::OUString();
+ aReturn <<= OUString();
break;
case PROPERTY_ID_BORDER:
@@ -868,7 +868,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
// XPersistObject
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility !
}
@@ -1009,7 +1009,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
{
// Lesen des Modelnamen
- ::rtl::OUString sModelName;
+ OUString sModelName;
_rxInStream >> sModelName;
Reference<XPropertySet> xCol(createColumn(getColumnTypeByModelName(sModelName)));
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index f29e6be26d1c..a5b963394571 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -76,14 +76,14 @@ class OGridControlModel :public OControlModel
::com::sun::star::uno::Any m_aBackgroundColor;
::com::sun::star::uno::Any m_aCursorColor; // transient
::com::sun::star::uno::Any m_aBorderColor;
- ::rtl::OUString m_aDefaultControl;
- ::rtl::OUString m_sHelpText;
+ OUString m_aDefaultControl;
+ OUString m_sHelpText;
// [properties]
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelection;
// [properties]
- ::rtl::OUString m_sHelpURL; // URL
+ OUString m_sHelpURL; // URL
sal_Int16 m_nBorder;
sal_Int16 m_nWritingMode;
sal_Int16 m_nContextWritingMode;
@@ -134,11 +134,11 @@ public:
virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
// XGridColumnFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual StringSequence SAL_CALL getColumnTypes() 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 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/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 81a9275bcc7c..0779522702b9 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -72,7 +72,7 @@ StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(Runtime
StringSequence aSupported = OControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 1);
- ::rtl::OUString* pArray = aSupported.getArray();
+ OUString* pArray = aSupported.getArray();
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GROUPBOX;
return aSupported;
}
@@ -95,7 +95,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException)
+OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility !
}
@@ -152,7 +152,7 @@ StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(Runti
StringSequence aSupported = OControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 1);
- ::rtl::OUString* pArray = aSupported.getArray();
+ OUString* pArray = aSupported.getArray();
pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_GROUPBOX;
return aSupported;
}
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index d270e48025e7..e825e02c5f43 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -40,7 +40,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/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index caa015af2d0b..86234c3db591 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -153,7 +153,7 @@ public:
DBG_NAME(OGroup)
//------------------------------------------------------------------
-OGroup::OGroup( const ::rtl::OUString& rGroupName )
+OGroup::OGroup( const OUString& rGroupName )
:m_aGroupName( rGroupName )
,m_nInsertPos(0)
{
@@ -257,7 +257,7 @@ Sequence< Reference<XControlModel> > OGroup::GetControlModels() const
DBG_NAME(OGroupManager);
//------------------------------------------------------------------
OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
- :m_pCompGroup( new OGroup( ::rtl::OUString("AllComponentGroup") ) )
+ :m_pCompGroup( new OGroup( OUString("AllComponentGroup") ) )
,m_xContainer(_rxContainer)
{
DBG_CTOR(OGroupManager,NULL);
@@ -293,7 +293,7 @@ void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException )
}
}
// -----------------------------------------------------------------------------
-void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const Reference<XPropertySet>& _xSet)
+void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Reference<XPropertySet>& _xSet)
{
// Component aus CompGroup entfernen
m_pCompGroup->RemoveComponent( _xSet );
@@ -338,7 +338,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
Reference<XPropertySet> xSet(evt.Source, UNO_QUERY);
// Component aus Gruppe entfernen
- ::rtl::OUString sGroupName;
+ OUString sGroupName;
if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
if (evt.PropertyName == PROPERTY_NAME) {
@@ -410,7 +410,7 @@ sal_Int32 OGroupManager::getGroupCount()
}
//------------------------------------------------------------------
-void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName)
+void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, OUString& _rName)
{
OSL_ENSURE(nGroup >= 0 && (size_t)nGroup < m_aActiveGroupMap.size(),"OGroupManager::getGroup: Invalid group index!");
OGroupArr::iterator aGroupPos = m_aActiveGroupMap[nGroup];
@@ -419,7 +419,7 @@ void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel
}
//------------------------------------------------------------------
-void OGroupManager::getGroupByName(const ::rtl::OUString& _rName, Sequence< Reference<XControlModel> >& _rGroup)
+void OGroupManager::getGroupByName(const OUString& _rName, Sequence< Reference<XControlModel> >& _rGroup)
{
OGroupArr::iterator aFind = m_aGroupArr.find(_rName);
if ( aFind != m_aGroupArr.end() )
@@ -438,7 +438,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
m_pCompGroup->InsertComponent( xSet );
// Component in Gruppe aufnehmen
- ::rtl::OUString sGroupName( GetGroupName( xSet ) );
+ OUString sGroupName( GetGroupName( xSet ) );
OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
@@ -494,16 +494,16 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
return;
// Component aus Gruppe entfernen
- ::rtl::OUString sGroupName( GetGroupName( xSet ) );
+ OUString sGroupName( GetGroupName( xSet ) );
removeFromGroupMap(sGroupName,xSet);
}
-::rtl::OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent )
+OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent )
{
if (!xComponent.is())
- return ::rtl::OUString();
- ::rtl::OUString sGroupName;
+ return OUString();
+ OUString sGroupName;
if (hasProperty( PROPERTY_GROUP_NAME, xComponent )) {
xComponent->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
if (sGroupName.isEmpty())
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 3fda7f12b39b..484412525767 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -96,7 +96,7 @@ namespace frm
//========================================================================
class OGroupComp
{
- ::rtl::OUString m_aName;
+ OUString m_aName;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xControlModel;
sal_Int32 m_nPos;
@@ -116,7 +116,7 @@ public:
sal_Int32 GetPos() const { return m_nPos; }
sal_Int16 GetTabIndex() const { return m_nTabIndex; }
- ::rtl::OUString GetName() const { return m_aName; }
+ OUString GetName() const { return m_aName; }
};
DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr);
@@ -148,13 +148,13 @@ class OGroup
OGroupCompArr m_aCompArray;
OGroupCompAccArr m_aCompAccArray;
- ::rtl::OUString m_aGroupName;
+ OUString m_aGroupName;
sal_uInt16 m_nInsertPos; // Die Einfugeposition der GroupComps wird von der Gruppe bestimmt.
friend class OGroupLess;
public:
- OGroup( const ::rtl::OUString& rGroupName );
+ OGroup( const OUString& rGroupName );
#ifdef DBG_UTIL
OGroup( const OGroup& _rSource ); // just to ensure the DBG_CTOR call
#endif
@@ -162,7 +162,7 @@ public:
sal_Bool operator==( const OGroup& rGroup ) const;
- ::rtl::OUString GetGroupName() const { return m_aGroupName; }
+ OUString GetGroupName() const { return m_aGroupName; }
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > GetControlModels() const;
void InsertComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement );
@@ -189,7 +189,7 @@ class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::X
// Helper functions
void InsertElement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement );
void RemoveElement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement );
- void removeFromGroupMap(const ::rtl::OUString& _sGroupName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSet);
+ void removeFromGroupMap(const OUString& _sGroupName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSet);
public:
OGroupManager(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _rxContainer);
@@ -208,11 +208,11 @@ public:
// Other functions
sal_Int32 getGroupCount();
- void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
- void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
+ void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, OUString& Name);
+ void getGroupByName(const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
- static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
+ static OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
};
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index a2abcc23299c..4271482cc7b1 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -49,7 +49,7 @@ InterfaceRef SAL_CALL OHiddenModel_CreateInstance(const Reference<XMultiServiceF
DBG_NAME( OHiddenModel )
//------------------------------------------------------------------
OHiddenModel::OHiddenModel(const Reference<XMultiServiceFactory>& _rxFactory)
- :OControlModel(_rxFactory, ::rtl::OUString())
+ :OControlModel(_rxFactory, OUString())
{
DBG_CTOR( OHiddenModel, NULL );
m_nClassId = FormComponentType::HIDDENCONTROL;
@@ -120,9 +120,9 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons
{
BEGIN_DESCRIBE_BASE_PROPERTIES(4)
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
- DECL_PROP1(HIDDEN_VALUE, ::rtl::OUString, BOUND);
- DECL_PROP1(NAME, ::rtl::OUString, BOUND);
- DECL_PROP1(TAG, ::rtl::OUString, BOUND);
+ DECL_PROP1(HIDDEN_VALUE, OUString, BOUND);
+ DECL_PROP1(NAME, OUString, BOUND);
+ DECL_PROP1(TAG, OUString, BOUND);
END_DESCRIBE_PROPERTIES();
}
@@ -137,7 +137,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException)
+OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility !
}
@@ -165,9 +165,9 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea
DBG_ASSERT(nVersion != 1, "OHiddenModel::read : this version is obsolete !");
switch (nVersion)
{
- case 1 : { ::rtl::OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break;
+ case 1 : { OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break;
case 2 : _rxInStream >> m_sHiddenValue; break;
- default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = ::rtl::OUString();
+ default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = OUString();
}
OControlModel::read(_rxInStream);
}
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 091c15fb4722..08d77d613c04 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -32,7 +32,7 @@ namespace frm
class OHiddenModel
:public OControlModel
{
- ::rtl::OUString m_sHiddenValue;
+ OUString m_sHiddenValue;
public:
DECLARE_DEFAULT_LEAF_XTOR( OHiddenModel );
@@ -50,7 +50,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/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 025f6938e0b0..7fa744c50ea3 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -84,7 +84,7 @@ StringSequence OImageButtonModel::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_IMAGEBUTTON;
return aSupported;
}
@@ -95,14 +95,14 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
BEGIN_DESCRIBE_PROPERTIES( 5, OClickableImageBaseModel )
DECL_PROP1(BUTTONTYPE, FormButtonType, 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();
}
//------------------------------------------------------------------------------
-::rtl::OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility !
}
@@ -116,7 +116,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream
_rxOutStream->writeShort(0x0003);
_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);
@@ -156,8 +156,8 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t
default :
OSL_FAIL("OImageButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
- m_sTargetURL = ::rtl::OUString();
- m_sTargetFrame = ::rtl::OUString();
+ m_sTargetURL = OUString();
+ m_sTargetFrame = OUString();
break;
}
}
@@ -186,7 +186,7 @@ StringSequence OImageButtonControl::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_IMAGEBUTTON;
return aSupported;
}
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 4d26287aed0e..1496b42ef417 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -42,7 +42,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);
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 801d833c9341..1991e32ef14d 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -207,7 +207,7 @@ StringSequence OImageControlModel::getSupportedServiceNames() throw()
StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 1);
- ::rtl::OUString*pArray = aSupported.getArray();
+ OUString*pArray = aSupported.getArray();
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGECONTROL;
return aSupported;
}
@@ -291,10 +291,10 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
{
// if that's an external graphic, i.e. one which has not been loaded by ourselves in response to a
// new image URL, then also adjust our ImageURL.
- ::rtl::OUString sNewImageURL;
+ OUString sNewImageURL;
if ( m_xGraphicObject.is() )
{
- sNewImageURL = ::rtl::OUString( "vnd.sun.star.GraphicObject:" );
+ sNewImageURL = OUString( "vnd.sun.star.GraphicObject:" );
sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID();
}
m_sImageURL = sNewImageURL;
@@ -340,7 +340,7 @@ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps
{
BEGIN_DESCRIBE_PROPERTIES( 4, OBoundControlModel )
DECL_IFACE_PROP2( GRAPHIC, XGraphic, BOUND, TRANSIENT );
- DECL_PROP1 ( IMAGE_URL, ::rtl::OUString, BOUND );
+ DECL_PROP1 ( IMAGE_URL, OUString, BOUND );
DECL_BOOL_PROP1 ( READONLY, BOUND );
DECL_PROP1 ( TABINDEX, sal_Int16, BOUND );
END_DESCRIBE_PROPERTIES();
@@ -357,7 +357,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
}
//------------------------------------------------------------------------------
-::rtl::OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility !
}
@@ -412,7 +412,7 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
}
//------------------------------------------------------------------------------
-sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator )
+sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator )
{
// create a stream for the image specified by the URL
::std::auto_ptr< SvStream > pImageStream;
@@ -465,7 +465,7 @@ sal_Bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _
case ImageStoreLink:
{
- ::rtl::OUString sCommitURL( m_sImageURL );
+ OUString sCommitURL( m_sImageURL );
if ( !m_sDocumentURL.isEmpty() )
sCommitURL = URIHelper::simpleNormalizedMakeRelative( m_sDocumentURL, sCommitURL );
OSL_ENSURE( m_xColumnUpdate.is(), "OImageControlModel::impl_handleNewImageURL_lck: no bound field, but ImageStoreLink?!" );
@@ -514,7 +514,7 @@ sal_Bool OImageControlModel::commitControlValueToDbColumn( bool _bPostReset )
//------------------------------------------------------------------------------
namespace
{
- bool lcl_isValidDocumentURL( const ::rtl::OUString& _rDocURL )
+ bool lcl_isValidDocumentURL( const OUString& _rDocURL )
{
return ( !_rDocURL.isEmpty() && _rDocURL != "private:object" );
}
@@ -555,7 +555,7 @@ void OImageControlModel::onDisconnectedDbColumn()
{
OBoundControlModel::onDisconnectedDbColumn();
- m_sDocumentURL = ::rtl::OUString();
+ m_sDocumentURL = OUString();
}
//------------------------------------------------------------------------------
@@ -572,7 +572,7 @@ Any OImageControlModel::translateDbColumnToControlValue()
}
case ImageStoreLink:
{
- ::rtl::OUString sImageLink( m_xColumn->getString() );
+ OUString sImageLink( m_xColumn->getString() );
if ( !m_sDocumentURL.isEmpty() )
sImageLink = INetURLObject::GetAbsURL( m_sDocumentURL, sImageLink );
return makeAny( sImageLink );
@@ -612,7 +612,7 @@ void OImageControlModel::doSetControlValue( const Any& _rValue )
case ImageStoreLink:
{
- ::rtl::OUString sImageURL;
+ OUString sImageURL;
_rValue >>= sImageURL;
GetImageProducer()->SetImage( sImageURL );
bStartProduction = true;
@@ -749,7 +749,7 @@ StringSequence OImageControlControl::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_IMAGECONTROL;
return aSupported;
}
@@ -789,18 +789,18 @@ void OImageControlControl::implClearGraphics( sal_Bool _bForce )
{
if ( _bForce )
{
- ::rtl::OUString sOldImageURL;
+ OUString sOldImageURL;
xSet->getPropertyValue( PROPERTY_IMAGE_URL ) >>= sOldImageURL;
if ( sOldImageURL.isEmpty() )
// the ImageURL is already empty, so simply setting a new empty one would not suffice
// (since it would be ignored)
- xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( "private:emptyImage" ) ) );
+ xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString( "private:emptyImage" ) ) );
// (the concrete URL we're passing here doens't matter. It's important that
// the model cannot resolve it to a a valid resource describing an image stream
}
- xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString() ) );
+ xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString() ) );
}
}
@@ -811,7 +811,7 @@ bool OImageControlControl::implInsertGraphics()
if ( !xSet.is() )
return false;
- ::rtl::OUString sTitle = FRM_RES_STRING(RID_STR_IMPORT_GRAPHIC);
+ OUString sTitle = FRM_RES_STRING(RID_STR_IMPORT_GRAPHIC);
// build some arguments for the upcoming dialog
try
{
@@ -858,7 +858,7 @@ bool OImageControlControl::implInsertGraphics()
xSet->setPropertyValue( PROPERTY_GRAPHIC, makeAny( aGraphic.GetXGraphic() ) );
}
else
- xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( aDialog.GetPath() ) ) );
+ xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString( aDialog.GetPath() ) ) );
return true;
}
@@ -879,7 +879,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const
{
Reference< XPropertySet > xModelProps( const_cast< OImageControlControl* >( this )->getModel(), UNO_QUERY_THROW );
Reference< XGraphic > xGraphic;
- OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "Graphic" ) ) >>= xGraphic );
+ OSL_VERIFY( xModelProps->getPropertyValue( OUString( "Graphic" ) ) >>= xGraphic );
bIsEmpty = !xGraphic.is();
}
catch( const Exception& )
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 3b9acd98b0e1..56f8952b2de4 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -52,10 +52,10 @@ class OImageControlModel
ImageProducer* m_pImageProducer;
bool m_bExternalGraphic;
sal_Bool m_bReadOnly;
- ::rtl::OUString m_sImageURL;
+ OUString m_sImageURL;
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >
m_xGraphicObject;
- ::rtl::OUString m_sDocumentURL;
+ OUString m_sDocumentURL;
protected:
// UNO Anbindung
@@ -84,7 +84,7 @@ public:
virtual void SAL_CALL disposing();
// 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);
@@ -138,7 +138,7 @@ protected:
/** updates the binary stream, created from loading the file which the given URL points to, into our
bound field, or the control itself if there is no bound field
*/
- sal_Bool impl_updateStreamForURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator );
+ sal_Bool impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator );
DECL_LINK( OnImageImportDone, ::Graphic* );
};
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index ac526da62618..5b75332b090a 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -84,35 +84,35 @@ namespace frm
namespace
{
//--------------------------------------------------------------------------
- struct RowSetValueToString : public ::std::unary_function< ORowSetValue, ::rtl::OUString >
+ struct RowSetValueToString : public ::std::unary_function< ORowSetValue, OUString >
{
- ::rtl::OUString operator()( const ORowSetValue& _value ) const
+ OUString operator()( const ORowSetValue& _value ) const
{
return _value.getString();
}
};
//--------------------------------------------------------------------------
- struct AppendRowSetValueString : public ::std::unary_function< ::rtl::OUString, void >
+ struct AppendRowSetValueString : public ::std::unary_function< OUString, void >
{
- AppendRowSetValueString( ::rtl::OUString& _string )
+ AppendRowSetValueString( OUString& _string )
:m_string( _string )
{
}
- void operator()( const ::rtl::OUString _append )
+ void operator()( const OUString _append )
{
m_string += _append;
}
private:
- ::rtl::OUString& m_string;
+ OUString& m_string;
};
//--------------------------------------------------------------------------
- Sequence< ::rtl::OUString > lcl_convertToStringSequence( const ValueList& _values )
+ Sequence< OUString > lcl_convertToStringSequence( const ValueList& _values )
{
- Sequence< ::rtl::OUString > aStrings( _values.size() );
+ Sequence< OUString > aStrings( _values.size() );
::std::transform(
_values.begin(),
_values.end(),
@@ -212,7 +212,7 @@ namespace frm
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;
@@ -302,7 +302,7 @@ namespace frm
case PROPERTY_ID_LISTSOURCE:
{
// extract
- Sequence< ::rtl::OUString > aListSource;
+ Sequence< OUString > aListSource;
OSL_VERIFY( _rValue >>= aListSource );
// copy to member
@@ -398,21 +398,21 @@ namespace frm
}
//------------------------------------------------------------------------------
- void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< ::rtl::OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
+ void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
// if both SelectedItems and StringItemList are set, care for this
// #i27024#
const Any* pSelectSequenceValue = NULL;
- const ::rtl::OUString* pStartPos = _rPropertyNames.getConstArray();
- const ::rtl::OUString* pEndPos = _rPropertyNames.getConstArray() + _rPropertyNames.getLength();
- const ::rtl::OUString* pSelectedItemsPos = ::std::find_if(
+ const OUString* pStartPos = _rPropertyNames.getConstArray();
+ const OUString* pEndPos = _rPropertyNames.getConstArray() + _rPropertyNames.getLength();
+ const OUString* pSelectedItemsPos = ::std::find_if(
pStartPos, pEndPos,
- ::std::bind2nd( ::std::equal_to< ::rtl::OUString >(), PROPERTY_SELECT_SEQ )
+ ::std::bind2nd( ::std::equal_to< OUString >(), PROPERTY_SELECT_SEQ )
);
- const ::rtl::OUString* pStringItemListPos = ::std::find_if(
+ const OUString* pStringItemListPos = ::std::find_if(
pStartPos, pEndPos,
- ::std::bind2nd( ::std::equal_to< ::rtl::OUString >(), PROPERTY_STRINGITEMLIST )
+ ::std::bind2nd( ::std::equal_to< OUString >(), PROPERTY_STRINGITEMLIST )
);
if ( ( pSelectedItemsPos != pEndPos ) && ( pStringItemListPos != pEndPos ) )
{
@@ -443,7 +443,7 @@ namespace frm
DECL_PROP1(LISTSOURCE, StringSequence, BOUND);
DECL_PROP3(VALUE_SEQ, StringSequence, BOUND, READONLY, TRANSIENT);
DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>, BOUND);
- DECL_PROP1(STRINGITEMLIST, Sequence< ::rtl::OUString >, BOUND);
+ DECL_PROP1(STRINGITEMLIST, Sequence< OUString >, BOUND);
END_DESCRIBE_PROPERTIES();
}
@@ -473,7 +473,7 @@ namespace frm
}
//------------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException)
+ OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_LISTBOX; // old (non-sun) name for compatibility !
}
@@ -562,7 +562,7 @@ namespace frm
if (nVersion == 0x0001)
{
// Create ListSourceSeq from String
- ::rtl::OUString sListSource;
+ OUString sListSource;
_rxInStream >> sListSource;
sal_Int32 nTokens = 1;
@@ -652,7 +652,7 @@ namespace frm
xFormProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConnection;
// PRE2: list source
- ::rtl::OUString sListSource;
+ OUString sListSource;
// if our list source type is no value list, we need to concatenate
// the single list source elements
::std::for_each(
@@ -696,8 +696,8 @@ namespace frm
// do we have a bound column if yes we have to select it
// and the displayed column is the first column othwhise we act as a combobox
- ::rtl::OUString aFieldName;
- ::rtl::OUString aBoundFieldName;
+ OUString aFieldName;
+ OUString aBoundFieldName;
if ( !!aBoundColumn && ( *aBoundColumn >= 0 ) && xFieldsByIndex.is() )
{
@@ -719,7 +719,7 @@ namespace frm
{
// otherwise look for the alias
Reference< XColumnsSupplier > xSupplyFields;
- xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields;
+ xFormProps->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupplyFields;
// search the field
DBG_ASSERT(xSupplyFields.is(), "OListBoxModel::loadData : invalid query composer !");
@@ -738,20 +738,20 @@ namespace frm
break;
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
- ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
- ::rtl::OUString aStatement("SELECT ");
+ OUString aQuote = xMeta->getIdentifierQuoteString();
+ OUString aStatement("SELECT ");
if (aBoundFieldName.isEmpty()) // act like a combobox
- aStatement += ::rtl::OUString("DISTINCT ");
+ aStatement += OUString("DISTINCT ");
aStatement += quoteName(aQuote,aFieldName);
if (!aBoundFieldName.isEmpty())
{
- aStatement += ::rtl::OUString(", ");
+ aStatement += OUString(", ");
aStatement += quoteName(aQuote, aBoundFieldName);
}
- aStatement += ::rtl::OUString(" FROM ");
+ aStatement += OUString(" FROM ");
- ::rtl::OUString sCatalog, sSchema, sTable;
+ OUString sCatalog, sSchema, sTable;
qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation );
aStatement += composeTableNameForSelect( xConnection, sCatalog, sSchema, sTable );
@@ -841,7 +841,7 @@ namespace frm
try
{
Reference< XPropertySet > xBoundField( xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW );
- OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString("Type") ) >>= m_nBoundColumnType );
+ OSL_VERIFY( xBoundField->getPropertyValue( OUString("Type") ) >>= m_nBoundColumnType );
}
catch( const Exception& )
{
@@ -852,7 +852,7 @@ namespace frm
// If the LB is bound to a field and empty entries are valid, we remember the position
// for an empty entry
RTL_LOGFILE_CONTEXT( aLogContext, "OListBoxModel::loadData: string collection" );
- ::rtl::OUString aStr;
+ OUString aStr;
sal_Int16 entryPos = 0;
ORowSetValue aBoundValue;
Reference< XRow > xCursorRow( xListCursor, UNO_QUERY_THROW );
@@ -911,7 +911,7 @@ namespace frm
if ( impl_hasBoundComponent() )
aValueList.insert( aValueList.begin(), ORowSetValue() );
- aDisplayList.insert( aDisplayList.begin(), ORowSetValue( ::rtl::OUString() ) );
+ aDisplayList.insert( aDisplayList.begin(), ORowSetValue( OUString() ) );
m_nNULLPos = 0;
}
@@ -998,11 +998,11 @@ namespace frm
return m_aConvertedBoundValues;
}
- Sequence< ::rtl::OUString > aStringItems( getStringItemList() );
+ Sequence< OUString > aStringItems( getStringItemList() );
ValueList aValues( aStringItems.getLength() );
ValueList::iterator dst = aValues.begin();
- const ::rtl::OUString *src (aStringItems.getConstArray());
- const ::rtl::OUString * const end = src + aStringItems.getLength();
+ const OUString *src (aStringItems.getConstArray());
+ const OUString * const end = src + aStringItems.getLength();
for (; src < end; ++src, ++dst )
{
*dst = *src;
@@ -1222,14 +1222,14 @@ namespace frm
case eEntryList:
{
// we can retrieve a string list from the binding for multiple selection
- Sequence< ::rtl::OUString > aSelectEntries;
+ Sequence< OUString > aSelectEntries;
OSL_VERIFY( _rExternalValue >>= aSelectEntries );
::std::set< sal_Int16 > aSelectionSet;
// find the selection entries in our item list
- const ::rtl::OUString* pSelectEntries = aSelectEntries.getArray();
- const ::rtl::OUString* pSelectEntriesEnd = pSelectEntries + aSelectEntries.getLength();
+ const OUString* pSelectEntries = aSelectEntries.getArray();
+ const OUString* pSelectEntriesEnd = pSelectEntries + aSelectEntries.getLength();
while ( pSelectEntries != pSelectEntriesEnd )
{
// the indexes where the current string appears in our string items
@@ -1256,7 +1256,7 @@ namespace frm
case eEntry:
{
- ::rtl::OUString sStringToSelect;
+ OUString sStringToSelect;
OSL_VERIFY( _rExternalValue >>= sStringToSelect );
aSelectIndexes = findValue( getStringItemList(), sStringToSelect, sal_False );
@@ -1271,25 +1271,25 @@ namespace frm
namespace
{
//................................................................
- struct ExtractStringFromSequence_Safe : public ::std::unary_function< sal_Int16, ::rtl::OUString >
+ struct ExtractStringFromSequence_Safe : public ::std::unary_function< sal_Int16, OUString >
{
protected:
- const Sequence< ::rtl::OUString >& m_rList;
+ const Sequence< OUString >& m_rList;
public:
- ExtractStringFromSequence_Safe( const Sequence< ::rtl::OUString >& _rList ) : m_rList( _rList ) { }
+ ExtractStringFromSequence_Safe( const Sequence< OUString >& _rList ) : m_rList( _rList ) { }
- ::rtl::OUString operator ()( sal_Int16 _nIndex )
+ OUString operator ()( sal_Int16 _nIndex )
{
OSL_ENSURE( _nIndex < m_rList.getLength(), "ExtractStringFromSequence_Safe: inconsistence!" );
if ( _nIndex < m_rList.getLength() )
return m_rList[ _nIndex ];
- return ::rtl::OUString();
+ return OUString();
}
};
//................................................................
- Any lcl_getSingleSelectedEntry( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< ::rtl::OUString >& _rStringList )
+ Any lcl_getSingleSelectedEntry( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< OUString >& _rStringList )
{
Any aReturn;
@@ -1297,7 +1297,7 @@ namespace frm
// binding does not support string lists
if ( _rSelectSequence.getLength() <= 1 )
{
- ::rtl::OUString sSelectedEntry;
+ OUString sSelectedEntry;
if ( _rSelectSequence.getLength() == 1 )
sSelectedEntry = ExtractStringFromSequence_Safe( _rStringList )( _rSelectSequence[0] );
@@ -1309,9 +1309,9 @@ namespace frm
}
//................................................................
- Any lcl_getMultiSelectedEntries( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< ::rtl::OUString >& _rStringList )
+ Any lcl_getMultiSelectedEntries( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< OUString >& _rStringList )
{
- Sequence< ::rtl::OUString > aSelectedEntriesTexts( _rSelectSequence.getLength() );
+ Sequence< OUString > aSelectedEntriesTexts( _rSelectSequence.getLength() );
::std::transform(
_rSelectSequence.getConstArray(),
_rSelectSequence.getConstArray() + _rSelectSequence.getLength(),
@@ -1406,8 +1406,8 @@ namespace frm
Sequence< Type > aTypes(4);
aTypes[0] = ::getCppuType( static_cast< Sequence< sal_Int32 >* >( NULL ) );
aTypes[1] = ::getCppuType( static_cast< sal_Int32* >( NULL ) );
- aTypes[2] = ::getCppuType( static_cast< Sequence< ::rtl::OUString >* >( NULL ) );
- aTypes[3] = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) );
+ aTypes[2] = ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) );
+ aTypes[3] = ::getCppuType( static_cast< OUString* >( NULL ) );
return aTypes;
}
@@ -1563,7 +1563,7 @@ namespace frm
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_LISTBOX;
return aSupported;
}
@@ -1757,14 +1757,14 @@ namespace frm
}
//--------------------------------------------------------------------
- void SAL_CALL OListBoxControl::addItem( const ::rtl::OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException)
+ void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
m_xAggregateListBox->addItem( aItem, nPos );
}
//--------------------------------------------------------------------
- void SAL_CALL OListBoxControl::addItems( const Sequence< ::rtl::OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException)
+ void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
m_xAggregateListBox->addItems( aItems, nPos );
@@ -1786,19 +1786,19 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException)
+ OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
return m_xAggregateListBox->getItem( nPos );
- return ::rtl::OUString( );
+ return OUString( );
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
return m_xAggregateListBox->getItems();
- return Sequence< ::rtl::OUString >( );
+ return Sequence< OUString >( );
}
//--------------------------------------------------------------------
@@ -1818,19 +1818,19 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException)
+ OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
return m_xAggregateListBox->getSelectedItem();
- return ::rtl::OUString( );
+ return OUString( );
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
return m_xAggregateListBox->getSelectedItems();
- return Sequence< ::rtl::OUString >( );
+ return Sequence< OUString >( );
}
//--------------------------------------------------------------------
@@ -1848,7 +1848,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void SAL_CALL OListBoxControl::selectItem( const ::rtl::OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException)
+ void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException)
{
if ( m_xAggregateListBox.is() )
m_xAggregateListBox->selectItem( aItem, bSelect );
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 1b2ad6510538..590a9cbd8577 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -101,10 +101,10 @@ public:
protected:
// 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 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);
// 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
@@ -243,19 +243,19 @@ public:
virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addItem( const ::rtl::OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL selectItem( const ::rtl::OUString& aItem, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isMutipleMode( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMultipleMode( ::sal_Bool bMulti ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 387413754611..679991159dfb 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -53,7 +53,7 @@ StringSequence ONumericControl::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_NUMERICFIELD;
return aSupported;
}
@@ -124,7 +124,7 @@ StringSequence ONumericModel::getSupportedServiceNames() throw()
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;
@@ -150,7 +150,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility !
}
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index a8ce05fe2e56..542028ca485f 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.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/Pattern.cxx b/forms/source/component/Pattern.cxx
index e0da52961d61..8a6af8afb605 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -65,7 +65,7 @@ StringSequence OPatternControl::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_PATTERNFIELD;
return aSupported;
}
@@ -122,7 +122,7 @@ StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw()
StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2);
- ::rtl::OUString*pArray = aSupported.getArray();
+ OUString*pArray = aSupported.getArray();
pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD;
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_PATTERNFIELD;
return aSupported;
@@ -133,7 +133,7 @@ StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw()
void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
- DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT);
+ DECL_PROP2(DEFAULT_TEXT, OUString, BOUND, MAYBEDEFAULT);
DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
DECL_PROP2(FILTERPROPOSAL, sal_Bool, BOUND, MAYBEDEFAULT);
@@ -141,7 +141,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_PATTERNFIELD; // old (non-sun) name for compatibility !
}
@@ -153,7 +153,7 @@ sal_Bool OPatternModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
if ( aNewValue != m_aLastKnownValue )
{
- ::rtl::OUString sNewValue;
+ OUString sNewValue;
aNewValue >>= sNewValue;
if ( !aNewValue.hasValue()
@@ -207,7 +207,7 @@ Any OPatternModel::translateDbColumnToControlValue()
if ( m_pFormattedValue.get() )
{
- ::rtl::OUString sValue( m_pFormattedValue->getFormattedValue() );
+ OUString sValue( m_pFormattedValue->getFormattedValue() );
if ( sValue.isEmpty()
&& m_pFormattedValue->getColumn().is()
&& m_pFormattedValue->getColumn()->wasNull()
@@ -223,7 +223,7 @@ Any OPatternModel::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)
}
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index ca54b4698797..80aac87dfb9a 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -53,7 +53,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/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 34466d2cf733..439462adf0f0 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -57,7 +57,7 @@ StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(Ru
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_RADIOBUTTON;
return aSupported;
}
@@ -78,7 +78,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>
// (formerly this switch-off was done in the toolkit - but the correct place is here ...)
// Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY );
// if (xVclWindowPeer.is())
-// xVclWindowPeer->setProperty(::rtl::OUString("AutoToggle"), ::cppu::bool2any(sal_False));
+// xVclWindowPeer->setProperty(OUString("AutoToggle"), ::cppu::bool2any(sal_False));
// new order: do _not_ switch off the auto toggle because:
// * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it)
// * without auto toggle, the AccessibleEvents as fired by the radio buttons are
@@ -136,7 +136,7 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt
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;
@@ -153,10 +153,10 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt
}
//------------------------------------------------------------------------------
-void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
+void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& rValue)
{
// my name
- ::rtl::OUString sMyGroup;
+ OUString sMyGroup;
if (hasProperty(PROPERTY_GROUP_NAME, this))
this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
if (sMyGroup.isEmpty())
@@ -168,7 +168,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
{
Reference<XPropertySet> xMyProps;
query_interface(static_cast<XWeak*>(this), xMyProps);
- ::rtl::OUString sCurrentGroup;
+ OUString sCurrentGroup;
sal_Int32 nNumSiblings = xIndexAccess->getCount();
for (sal_Int32 i=0; i<nNumSiblings; ++i)
{
@@ -237,7 +237,7 @@ void ORadioButtonModel::setControlSource()
Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
if (xIndexAccess.is())
{
- ::rtl::OUString sName, sGroupName;
+ OUString sName, sGroupName;
if (hasProperty(PROPERTY_GROUP_NAME, this))
this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName;
@@ -261,7 +261,7 @@ void ORadioButtonModel::setControlSource()
// Only RadioButtons
continue;
- ::rtl::OUString sSiblingName, sSiblingGroupName;
+ OUString sSiblingName, sSiblingGroupName;
if (hasProperty(PROPERTY_GROUP_NAME, xSiblingProperties))
xSiblingProperties->getPropertyValue(PROPERTY_GROUP_NAME) >>= sSiblingGroupName;
xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sSiblingName;
@@ -287,7 +287,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException)
+OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException)
{
return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility !
}
@@ -319,7 +319,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn
// Version
sal_uInt16 nVersion = _rxInStream->readShort();
- ::rtl::OUString sReferenceValue;
+ OUString sReferenceValue;
sal_Int16 nDefaultChecked( 0 );
switch (nVersion)
{
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 8da67de8330d..94e50eb11404 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -43,7 +43,7 @@ public:
throw (::com::sun::star::uno::Exception);
// 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
@@ -66,7 +66,7 @@ protected:
translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const;
protected:
- void SetSiblingPropsTo(const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue);
+ void SetSiblingPropsTo(const OUString& rPropName, const ::com::sun::star::uno::Any& rValue);
DECLARE_XCLONEABLE( );
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 346f09695089..7b7b56c2821c 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -75,7 +75,7 @@ StringSequence SAL_CALL OTimeControl::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_TIMEFIELD;
return aSupported;
}
@@ -97,7 +97,7 @@ StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw()
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;
@@ -157,7 +157,7 @@ OTimeModel::~OTimeModel( )
IMPLEMENT_DEFAULT_CLONING( OTimeModel )
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{
return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility !
}
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index d0ee89a8cbcd..b36c3c612087 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -46,7 +46,7 @@ public:
DECLARE_DEFAULT_LEAF_XTOR( OTimeModel );
// stario::XPersistObject
- virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
// ::com::sun::star::beans::XPropertySet
virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx
index ce410092155f..4a2792bdf121 100644
--- a/forms/source/component/cachedrowset.cxx
+++ b/forms/source/component/cachedrowset.cxx
@@ -59,7 +59,7 @@ namespace frm
struct CachedRowSet_Data
{
::comphelper::ComponentContext aContext;
- ::rtl::OUString sCommand;
+ OUString sCommand;
sal_Bool bEscapeProcessing;
Reference< XConnection > xConnection;
@@ -91,7 +91,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void CachedRowSet::setCommand( const ::rtl::OUString& _rCommand )
+ void CachedRowSet::setCommand( const OUString& _rCommand )
{
if ( m_pData->sCommand == _rCommand )
return;
@@ -101,7 +101,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void CachedRowSet::setCommandFromQuery( const ::rtl::OUString& _rQueryName )
+ void CachedRowSet::setCommandFromQuery( const OUString& _rQueryName )
{
Reference< XQueriesSupplier > xSupplyQueries( m_pData->xConnection, UNO_QUERY_THROW );
Reference< XNameAccess > xQueries ( xSupplyQueries->getQueries(), UNO_QUERY_THROW );
@@ -111,7 +111,7 @@ namespace frm
OSL_VERIFY( xQuery->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) >>= bEscapeProcessing );
setEscapeProcessing( bEscapeProcessing );
- ::rtl::OUString sCommand;
+ OUString sCommand;
OSL_VERIFY( xQuery->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand );
setCommand( sCommand );
}
diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx
index 15443e547cd8..7b7ece865b83 100644
--- a/forms/source/component/cachedrowset.hxx
+++ b/forms/source/component/cachedrowset.hxx
@@ -70,9 +70,9 @@ namespace frm
@throws Exception
*/
- void setCommandFromQuery ( const ::rtl::OUString& _rQueryName );
+ void setCommandFromQuery ( const OUString& _rQueryName );
- void setCommand ( const ::rtl::OUString& _rCommand );
+ void setCommand ( const OUString& _rCommand );
void setEscapeProcessing ( const sal_Bool _bEscapeProcessing );
void setConnection ( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection );
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 97b06d6b9309..93ef01e01053 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -77,7 +77,7 @@ namespace frm
}
//------------------------------------------------------------------------------
- OClickableImageBaseControl::OClickableImageBaseControl(const Reference<XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _aService)
+ OClickableImageBaseControl::OClickableImageBaseControl(const Reference<XMultiServiceFactory>& _rxFactory, const OUString& _aService)
:OControl(_rxFactory, _aService)
,m_pThread(NULL)
,m_aSubmissionVetoListeners( m_aMutex )
@@ -296,7 +296,7 @@ namespace frm
{
m_pFeatureInterception->getTransformer().parseSmartWithAsciiProtocol( aURL, INET_FILE_SCHEME );
- ::rtl::OUString aTargetFrame;
+ OUString aTargetFrame;
xSet->getPropertyValue(PROPERTY_TARGET_FRAME) >>= aTargetFrame;
Reference< XDispatch > xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY)->queryDispatch( aURL, aTargetFrame,
@@ -305,7 +305,7 @@ namespace frm
Sequence<PropertyValue> aArgs(1);
PropertyValue& rProp = aArgs.getArray()[0];
- rProp.Name = ::rtl::OUString("Referer");
+ rProp.Name = OUString("Referer");
rProp.Value <<= xModel->getURL();
if (xDisp.is())
@@ -315,18 +315,18 @@ namespace frm
{
URL aHyperLink = m_pFeatureInterception->getTransformer().getStrictURLFromAscii( ".uno:OpenHyperlink" );
- Reference< XDispatch > xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY)->queryDispatch(aHyperLink, ::rtl::OUString() , 0);
+ Reference< XDispatch > xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY)->queryDispatch(aHyperLink, OUString() , 0);
if ( xDisp.is() )
{
Sequence<PropertyValue> aProps(3);
- aProps[0].Name = ::rtl::OUString("URL");
+ aProps[0].Name = OUString("URL");
aProps[0].Value <<= aURL.Complete;
- aProps[1].Name = ::rtl::OUString("FrameName");
+ aProps[1].Name = OUString("FrameName");
aProps[1].Value = xSet->getPropertyValue(PROPERTY_TARGET_FRAME);
- aProps[2].Name = ::rtl::OUString("Referer");
+ aProps[2].Name = OUString("Referer");
aProps[2].Value <<= xModel->getURL();
xDisp->dispatch( aHyperLink, aProps );
@@ -368,12 +368,12 @@ namespace frm
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported = OControl::getSupportedServiceNames();
+ Sequence< OUString > aSupported = OControl::getSupportedServiceNames();
aSupported.realloc( aSupported.getLength() + 1 );
- ::rtl::OUString* pArray = aSupported.getArray();
+ OUString* pArray = aSupported.getArray();
pArray[ aSupported.getLength() - 1 ] = FRM_SUN_CONTROL_SUBMITBUTTON;
return aSupported;
@@ -429,7 +429,7 @@ namespace frm
catch( const Exception& e )
{
OSL_FAIL( "OClickableImageBaseControl::implSubmit: caught an unknown exception!" );
- throw WrappedTargetException( ::rtl::OUString(), *this, makeAny( e ) );
+ throw WrappedTargetException( OUString(), *this, makeAny( e ) );
}
}
@@ -448,8 +448,8 @@ namespace frm
//------------------------------------------------------------------
DBG_NAME( OClickableImageBaseModel )
//------------------------------------------------------------------
- OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const ::rtl::OUString& _rUnoControlModelTypeName,
- const ::rtl::OUString& rDefault )
+ OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const OUString& _rUnoControlModelTypeName,
+ const OUString& rDefault )
:OControlModel( _rxFactory, _rUnoControlModelTypeName, rDefault )
,OPropertyChangeListener(m_aMutex)
,m_pMedium(NULL)
@@ -562,12 +562,12 @@ namespace frm
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported = OControlModel::getSupportedServiceNames();
+ Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames();
aSupported.realloc( aSupported.getLength() + 1 );
- ::rtl::OUString* pArray = aSupported.getArray();
+ OUString* pArray = aSupported.getArray();
pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_SUBMITBUTTON;
return aSupported;
@@ -678,8 +678,8 @@ namespace frm
{
ImageProducer *pImgProd = GetImageProducer();
// grab the ImageURL
- rtl::OUString sURL;
- getPropertyValue( rtl::OUString("ImageURL") ) >>= sURL;
+ OUString sURL;
+ getPropertyValue( OUString("ImageURL") ) >>= sURL;
if (!m_pMedium)
{
if ( ::svt::GraphicAccess::isSupportedURL( sURL ) )
@@ -708,7 +708,7 @@ namespace frm
}
//------------------------------------------------------------------------------
- void OClickableImageBaseModel::SetURL( const ::rtl::OUString& rURL )
+ void OClickableImageBaseModel::SetURL( const OUString& rURL )
{
if (m_pMedium || rURL.isEmpty())
{
@@ -853,7 +853,7 @@ namespace frm
{
case PROPERTY_ID_BUTTONTYPE : return makeAny( FormButtonType_PUSH );
case PROPERTY_ID_TARGET_URL :
- case PROPERTY_ID_TARGET_FRAME : return makeAny( ::rtl::OUString() );
+ case PROPERTY_ID_TARGET_FRAME : return makeAny( OUString() );
case PROPERTY_ID_DISPATCHURLINTERNAL : return makeAny( sal_False );
default:
return OControlModel::getPropertyDefaultByHandle(nHandle);
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 45e51157a275..4ce20fcd0349 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -59,8 +59,8 @@ namespace frm
{
protected:
::com::sun::star::form::FormButtonType m_eButtonType; // Art des Buttons (push,submit,reset)
- ::rtl::OUString m_sTargetURL; // URL fuer den URL-Button
- ::rtl::OUString m_sTargetFrame; // TargetFrame zum Oeffnen
+ OUString m_sTargetURL; // URL fuer den URL-Button
+ OUString m_sTargetFrame; // TargetFrame zum Oeffnen
// ImageProducer stuff
::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xProducer;
@@ -79,7 +79,7 @@ namespace frm
inline ImageProducer* GetImageProducer() { return m_pProducer; }
void StartProduction();
- void SetURL(const ::rtl::OUString& rURL);
+ void SetURL(const OUString& rURL);
void DataAvailable();
void DownloadDone();
@@ -126,7 +126,7 @@ namespace frm
virtual void SAL_CALL setSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission >& _submission ) 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);
// XEventListener
using OControlModel::disposing;
@@ -159,7 +159,7 @@ namespace frm
{
if ( NULL == _rModel.getImageProducer( OClickableImageBaseModel::GuardAccess() ) )
throw ::com::sun::star::lang::DisposedException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::com::sun::star::form::XImageProducerSupplier* >( &_rModel )
);
}
@@ -187,7 +187,7 @@ namespace frm
protected:
::cppu::OInterfaceContainerHelper m_aApproveActionListeners;
::cppu::OInterfaceContainerHelper m_aActionListeners;
- ::rtl::OUString m_aActionCommand;
+ OUString m_aActionCommand;
// XSubmission
virtual void SAL_CALL submit( ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -196,7 +196,7 @@ namespace frm
virtual void SAL_CALL removeSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::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);
// XEventListener
using OControl::disposing;
@@ -204,7 +204,7 @@ namespace frm
public:
OClickableImageBaseControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
- const ::rtl::OUString& _aService);
+ const OUString& _aService);
virtual ~OClickableImageBaseControl();
protected:
diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx
index cf4a51750b4e..07df31f2e87a 100644
--- a/forms/source/component/entrylisthelper.cxx
+++ b/forms/source/component/entrylisthelper.cxx
@@ -117,12 +117,12 @@ namespace frm
)
{
// the entries *before* the insertion pos
- Sequence< ::rtl::OUString > aKeepEntries(
+ Sequence< OUString > aKeepEntries(
m_aStringItems.getConstArray(),
_rEvent.Position
);
// the entries *behind* the insertion pos
- Sequence< ::rtl::OUString > aMovedEntries(
+ Sequence< OUString > aMovedEntries(
m_aStringItems.getConstArray() + _rEvent.Position,
m_aStringItems.getLength() - _rEvent.Position
);
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 929b5a5cd1e5..72a159f0330a 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -51,7 +51,7 @@ namespace frm
::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >
m_xListSource; /// our external list source
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
m_aStringItems; /// "overridden" StringItemList property value
::cppu::OInterfaceContainerHelper
m_aRefreshListeners;
@@ -63,7 +63,7 @@ namespace frm
virtual ~OEntryListHelper( );
/// returns the current string item list
- inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+ inline const ::com::sun::star::uno::Sequence< OUString >&
getStringItemList() const { return m_aStringItems; }
inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >&
getExternalListEntrySource() const { return m_xListSource; }
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index a94efd6bc350..3fae840e2fa0 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -62,7 +62,7 @@ namespace frm
}
//------------------------------------------------------------------------------
- void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const ::rtl::OUString& _rContextDescription )
+ void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription )
{
Any aError;
if ( !_rContextDescription.isEmpty() )
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index bf9fe4193484..398d86be3593 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -49,7 +49,7 @@ namespace frm
void SAL_CALL disposing();
- void SAL_CALL onError( const ::com::sun::star::sdbc::SQLException& _rException, const ::rtl::OUString& _rContextDescription );
+ void SAL_CALL onError( const ::com::sun::star::sdbc::SQLException& _rException, const OUString& _rContextDescription );
void SAL_CALL onError( const ::com::sun::star::sdb::SQLErrorEvent& _rException );
protected:
diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx
index ac496760809a..08c15dc1be7a 100644
--- a/forms/source/component/findpos.cxx
+++ b/forms/source/component/findpos.cxx
@@ -32,11 +32,11 @@
namespace detail {
sal_Int32 findPos(
- const ::rtl::OUString& aStr,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rList)
+ const OUString& aStr,
+ const ::com::sun::star::uno::Sequence< OUString >& rList)
{
- const ::rtl::OUString* pStrList = rList.getConstArray();
- const ::rtl::OUString* pResult = ::std::lower_bound(
+ const OUString* pStrList = rList.getConstArray();
+ const OUString* pResult = ::std::lower_bound(
pStrList, pStrList + rList.getLength(), aStr );
if ( ( pResult != pStrList + rList.getLength() ) && ( *pResult == aStr ) )
return ( pResult - pStrList );
diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx
index 1f1057b55ec3..a179e0792b17 100644
--- a/forms/source/component/findpos.hxx
+++ b/forms/source/component/findpos.hxx
@@ -29,8 +29,8 @@ namespace rtl { class OUString; }
namespace detail {
sal_Int32 findPos(
- const ::rtl::OUString& aStr,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rList);
+ const OUString& aStr,
+ const ::com::sun::star::uno::Sequence< OUString >& rList);
}
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 963d70800b18..cd351e5b88a2 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -207,8 +207,8 @@ namespace frm
DECL_PROP1 ( FONT_PITCH, sal_Int16, MAYBEDEFAULT );
DECL_PROP1 ( FONT_TYPE, sal_Int16, MAYBEDEFAULT );
DECL_PROP1 ( FONT_WIDTH, sal_Int16, MAYBEDEFAULT );
- DECL_PROP1 ( FONT_NAME, ::rtl::OUString, MAYBEDEFAULT );
- DECL_PROP1 ( FONT_STYLENAME, ::rtl::OUString, MAYBEDEFAULT );
+ DECL_PROP1 ( FONT_NAME, OUString, MAYBEDEFAULT );
+ DECL_PROP1 ( FONT_STYLENAME, OUString, MAYBEDEFAULT );
DECL_PROP1 ( FONT_FAMILY, sal_Int16, MAYBEDEFAULT );
DECL_PROP1 ( FONT_CHARSET, sal_Int16, MAYBEDEFAULT );
DECL_PROP1 ( FONT_HEIGHT, float, MAYBEDEFAULT );
@@ -499,7 +499,7 @@ namespace frm
case PROPERTY_ID_FONT_NAME:
case PROPERTY_ID_FONT_STYLENAME:
- aReturn <<= ::rtl::OUString();
+ aReturn <<= OUString();
case PROPERTY_ID_FONT_FAMILY:
case PROPERTY_ID_FONT_CHARSET:
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index add795d7a94f..f2d7273585a0 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -226,7 +226,7 @@ void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::co
// ------------------------------------------------------------
-void ImageProducer::SetImage( const ::rtl::OUString& rPath )
+void ImageProducer::SetImage( const OUString& rPath )
{
maURL = rPath;
mpGraphic->Clear();
@@ -250,7 +250,7 @@ void ImageProducer::SetImage( const ::rtl::OUString& rPath )
void ImageProducer::SetImage( SvStream& rStm )
{
- maURL = ::rtl::OUString();
+ maURL = OUString();
mpGraphic->Clear();
mbConsInit = sal_False;
@@ -262,7 +262,7 @@ void ImageProducer::SetImage( SvStream& rStm )
void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rInputStmRef )
{
- maURL = ::rtl::OUString();
+ maURL = OUString();
mpGraphic->Clear();
mbConsInit = sal_False;
delete mpStm;
@@ -548,7 +548,7 @@ void ImageProducer::initialize( const ::com::sun::star::uno::Sequence< ::com::su
if ( aArguments.getLength() == 1 )
{
::com::sun::star::uno::Any aArg = aArguments.getConstArray()[0];
- rtl::OUString aURL;
+ OUString aURL;
if ( aArg >>= aURL )
{
SetImage( aURL );
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index b6a33ec883e9..3bcbc3222632 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -52,7 +52,7 @@ private:
typedef boost::ptr_vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > > ConsumerList_t;
- ::rtl::OUString maURL;
+ OUString maURL;
ConsumerList_t maConsList;
Graphic* mpGraphic;
SvStream* mpStm;
@@ -70,7 +70,7 @@ public:
ImageProducer();
~ImageProducer();
- void SetImage( const ::rtl::OUString& rPath );
+ void SetImage( const OUString& rPath );
void SetImage( SvStream& rStm );
void NewDataAvailable();
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index f2f133688fa7..3d15e1326e3f 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -58,7 +58,7 @@ namespace frm
DBG_NAME( ONavigationBarModel )
//------------------------------------------------------------------
ONavigationBarModel::ONavigationBarModel( const Reference< XMultiServiceFactory >& _rxFactory )
- :OControlModel( _rxFactory, ::rtl::OUString() )
+ :OControlModel( _rxFactory, OUString() )
,FontControlModel( true )
{
DBG_CTOR( ONavigationBarModel, NULL );
@@ -159,31 +159,31 @@ namespace frm
IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel )
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException)
+ OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException)
{
return getImplementationName_Static();
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException)
+ Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static()
+ OUString SAL_CALL ONavigationBarModel::getImplementationName_Static()
{
- return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarModel" );
+ return OUString( "com.sun.star.comp.form.ONavigationBarModel" );
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames_Static()
+ Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aSupported = OControlModel::getSupportedServiceNames_Static();
+ Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames_Static();
aSupported.realloc( aSupported.getLength() + 2 );
- ::rtl::OUString* pArray = aSupported.getArray();
- pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlModel" );
+ OUString* pArray = aSupported.getArray();
+ pArray[ aSupported.getLength() - 2 ] = OUString( "com.sun.star.awt.UnoControlModel" );
pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR;
return aSupported;
}
@@ -201,7 +201,7 @@ namespace frm
}
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException )
+ OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException )
{
return FRM_SUN_COMPONENT_NAVTOOLBAR;
}
@@ -447,12 +447,12 @@ namespace frm
break;
case PROPERTY_ID_DEFAULTCONTROL:
- aDefault <<= ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" );
+ aDefault <<= OUString( "com.sun.star.form.control.NavigationToolBar" );
break;
case PROPERTY_ID_HELPTEXT:
case PROPERTY_ID_HELPURL:
- aDefault <<= ::rtl::OUString();
+ aDefault <<= OUString();
break;
case PROPERTY_ID_BORDER:
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 46ddba0b586d..7a7278f89b18 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -52,9 +52,9 @@ namespace frm
// <properties>
::com::sun::star::uno::Any m_aTabStop;
::com::sun::star::uno::Any m_aBackgroundColor;
- ::rtl::OUString m_sDefaultControl;
- ::rtl::OUString m_sHelpText;
- ::rtl::OUString m_sHelpURL;
+ OUString m_sDefaultControl;
+ OUString m_sHelpText;
+ OUString m_sHelpURL;
sal_Int16 m_nIconSize;
sal_Int16 m_nBorder;
sal_Int32 m_nDelay;
@@ -72,8 +72,8 @@ namespace frm
DECLARE_DEFAULT_LEAF_XTOR( ONavigationBarModel );
// XServiceInfo - static version
- 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::lang::XMultiServiceFactory >& _rxFactory );
protected:
@@ -82,8 +82,8 @@ namespace frm
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) 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);
// XTypeProvider
DECLARE_XTYPEPROVIDER()
@@ -92,7 +92,7 @@ namespace frm
virtual void SAL_CALL disposing();
// 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/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 0806249447dd..fb4c0d99cc8d 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -108,7 +108,7 @@ namespace frm
}
//--------------------------------------------------------------------
- sal_Int32 PropertyBagHelper::impl_findFreeHandle( const ::rtl::OUString& _rPropertyName )
+ sal_Int32 PropertyBagHelper::impl_findFreeHandle( const OUString& _rPropertyName )
{
::comphelper::OPropertyArrayAggregationHelper& rPropInfo( impl_ts_getArrayHelper() );
@@ -181,7 +181,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void PropertyBagHelper::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
+ void PropertyBagHelper::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
{
::osl::MutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
@@ -208,7 +208,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void PropertyBagHelper::removeProperty( const ::rtl::OUString& _rName )
+ void PropertyBagHelper::removeProperty( const OUString& _rName )
{
::osl::MutexGuard aGuard( m_rContext.getMutex() );
impl_nts_checkDisposed_throw();
@@ -228,15 +228,15 @@ namespace frm
namespace
{
//----------------------------------------------------------------
- struct SelectNameOfProperty : public ::std::unary_function< Property, ::rtl::OUString >
+ struct SelectNameOfProperty : public ::std::unary_function< Property, OUString >
{
- const ::rtl::OUString& operator()( const Property& _rProp ) const { return _rProp.Name; }
+ const OUString& operator()( const Property& _rProp ) const { return _rProp.Name; }
};
//----------------------------------------------------------------
- struct SelectNameOfPropertyValue : public ::std::unary_function< PropertyValue, ::rtl::OUString >
+ struct SelectNameOfPropertyValue : public ::std::unary_function< PropertyValue, OUString >
{
- const ::rtl::OUString& operator()( const PropertyValue& _rProp ) const { return _rProp.Name; }
+ const OUString& operator()( const PropertyValue& _rProp ) const { return _rProp.Name; }
};
//----------------------------------------------------------------
@@ -265,7 +265,7 @@ namespace frm
Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(), UNO_QUERY_THROW );
Sequence< Property > aProperties( xPSI->getProperties() );
- Sequence< ::rtl::OUString > aPropertyNames( aProperties.getLength() );
+ Sequence< OUString > aPropertyNames( aProperties.getLength() );
::std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(),
aPropertyNames.getArray(), SelectNameOfProperty() );
@@ -285,8 +285,8 @@ namespace frm
Sequence< PropertyValue > aPropertyValues( aValues.getLength() );
PropertyValue* pPropertyValue = aPropertyValues.getArray();
- const ::rtl::OUString* pName = aPropertyNames.getConstArray();
- const ::rtl::OUString* pNameEnd = aPropertyNames.getConstArray() + aPropertyNames.getLength();
+ const OUString* pName = aPropertyNames.getConstArray();
+ const OUString* pNameEnd = aPropertyNames.getConstArray() + aPropertyNames.getLength();
const Any* pValue = aValues.getConstArray();
for ( ; pName != pNameEnd; ++pName, ++pValue, ++pPropertyValue )
{
@@ -325,7 +325,7 @@ namespace frm
// Now finally split into a Name and a Value sequence, and forward to
// XMultiPropertySet::setPropertyValues
- Sequence< ::rtl::OUString > aNames( nPropertyValues );
+ Sequence< OUString > aNames( nPropertyValues );
::std::transform( aSortedProps.getConstArray(), aSortedProps.getConstArray() + nPropertyValues,
aNames.getArray(), SelectNameOfPropertyValue() );
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index 4676cc28df77..f8825a556c2d 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -37,7 +37,7 @@ namespace frm
//=
//====================================================================
//--------------------------------------------------------------------
- OReferenceValueComponent::OReferenceValueComponent( const Reference< XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _rUnoControlModelTypeName, const ::rtl::OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue )
+ OReferenceValueComponent::OReferenceValueComponent( const Reference< XMultiServiceFactory>& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue )
:OBoundControlModel( _rxFactory, _rUnoControlModelTypeName, _rDefault, sal_False, sal_True, sal_True )
,m_eDefaultChecked( STATE_NOCHECK )
,m_bSupportSecondRefValue( _bSupportNoCheckRefValue )
@@ -62,7 +62,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void OReferenceValueComponent::setReferenceValue( const ::rtl::OUString& _rRefValue )
+ void OReferenceValueComponent::setReferenceValue( const OUString& _rRefValue )
{
m_sReferenceValue = _rRefValue;
calculateExternalValueType();
@@ -151,11 +151,11 @@ namespace frm
void OReferenceValueComponent::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( m_bSupportSecondRefValue ? 3 : 2, OBoundControlModel )
- DECL_PROP1( REFVALUE, ::rtl::OUString, BOUND );
+ DECL_PROP1( REFVALUE, OUString, BOUND );
DECL_PROP1( DEFAULT_STATE, sal_Int16, BOUND );
if ( m_bSupportSecondRefValue )
{
- DECL_PROP1( UNCHECKED_REFVALUE, ::rtl::OUString, BOUND );
+ DECL_PROP1( UNCHECKED_REFVALUE, OUString, BOUND );
}
END_DESCRIBE_PROPERTIES();
}
@@ -167,7 +167,7 @@ namespace frm
aTypes.push_back( ::getCppuType( static_cast< sal_Bool* >( NULL ) ) );
if ( !m_sReferenceValue.isEmpty() )
- aTypes.push_front( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) );
+ aTypes.push_front( ::getCppuType( static_cast< OUString* >( NULL ) ) );
// push_front, because this is the preferred type
Sequence< Type > aTypesRet( aTypes.size() );
@@ -181,7 +181,7 @@ namespace frm
sal_Int16 nState = STATE_DONTKNOW;
sal_Bool bExternalState = sal_False;
- ::rtl::OUString sExternalValue;
+ OUString sExternalValue;
if ( _rExternalValue >>= bExternalState )
{
nState = ::sal::static_int_cast< sal_Int16 >( bExternalState ? STATE_CHECK : STATE_NOCHECK );
@@ -246,7 +246,7 @@ namespace frm
}
else if ( bStringExchange )
{
- aExternalValue <<= (m_bSupportSecondRefValue ? m_sNoCheckReferenceValue : ::rtl::OUString());
+ aExternalValue <<= (m_bSupportSecondRefValue ? m_sNoCheckReferenceValue : OUString());
}
break;
}
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index c0a10ea857d8..80c389004278 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -37,18 +37,18 @@ namespace frm
{
private:
// <properties>
- ::rtl::OUString m_sReferenceValue; // the reference value to use for data exchange
- ::rtl::OUString m_sNoCheckReferenceValue; // the reference value to be exchanged when the control is not checked
+ OUString m_sReferenceValue; // the reference value to use for data exchange
+ OUString m_sNoCheckReferenceValue; // the reference value to be exchanged when the control is not checked
ToggleState m_eDefaultChecked; // the default check state
// </properties>
sal_Bool m_bSupportSecondRefValue; // do we support the SecondaryRefValue property?
protected:
- const ::rtl::OUString& getReferenceValue() const { return m_sReferenceValue; }
- void setReferenceValue( const ::rtl::OUString& _rRefValue );
+ const OUString& getReferenceValue() const { return m_sReferenceValue; }
+ void setReferenceValue( const OUString& _rRefValue );
- const ::rtl::OUString& getNoCheckReferenceValue() const { return m_sNoCheckReferenceValue; }
+ const OUString& getNoCheckReferenceValue() const { return m_sNoCheckReferenceValue; }
ToggleState getDefaultChecked() const { return m_eDefaultChecked; }
void setDefaultChecked( ToggleState _eChecked ) { m_eDefaultChecked = _eChecked; }
@@ -56,8 +56,8 @@ namespace frm
protected:
OReferenceValueComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
- const ::rtl::OUString& _rUnoControlModelTypeName,
- const ::rtl::OUString& _rDefault,
+ const OUString& _rUnoControlModelTypeName,
+ const OUString& _rDefault,
sal_Bool _bSupportNoCheckRefValue = sal_False
);
DECLARE_DEFAULT_CLONE_CTOR( OReferenceValueComponent )
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index dd8a6673af9d..26035bddedfe 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -48,7 +48,7 @@ namespace frm
//--------------------------------------------------------------------
Any translateExternalDoubleToControlIntValue(
const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties,
- const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName )
+ const OUString& _rMinValueName, const OUString& _rMaxValueName )
{
OSL_ENSURE( _rxProperties.is(), "translateExternalDoubleToControlIntValue: no aggregate!?" );
@@ -59,7 +59,7 @@ namespace frm
if ( ::rtl::math::isInf( nExternalValue ) )
{
// set the minimum or maximum of the scroll values
- ::rtl::OUString sLimitPropertyName = ::rtl::math::isSignBitSet( nExternalValue )
+ OUString sLimitPropertyName = ::rtl::math::isSignBitSet( nExternalValue )
? _rMinValueName : _rMaxValueName;
if ( _rxProperties.is() )
_rxProperties->getPropertyValue( sLimitPropertyName ) >>= nControlValue;
@@ -146,7 +146,7 @@ namespace frm
BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel )
DECL_PROP1( DEFAULT_SCROLL_VALUE, sal_Int32, BOUND );
DECL_PROP1( TABINDEX, sal_Int16, BOUND );
- DECL_PROP2( CONTROLSOURCEPROPERTY,::rtl::OUString, READONLY, TRANSIENT );
+ DECL_PROP2( CONTROLSOURCEPROPERTY,OUString, READONLY, TRANSIENT );
END_DESCRIBE_PROPERTIES();
}
@@ -238,7 +238,7 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException )
+ OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException )
{
return FRM_SUN_COMPONENT_SCROLLBAR;
}
@@ -287,8 +287,8 @@ namespace frm
Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
{
return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
- ::rtl::OUString( "ScrollValueMin" ),
- ::rtl::OUString( "ScrollValueMax" ) );
+ OUString( "ScrollValueMin" ),
+ OUString( "ScrollValueMax" ) );
}
//--------------------------------------------------------------------
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 77fe5439fa61..ced15e1d90ce 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -47,7 +47,7 @@ namespace frm
// implemented elsewhere
Any translateExternalDoubleToControlIntValue(
const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties,
- const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName );
+ const OUString& _rMinValueName, const OUString& _rMaxValueName );
Any translateControlIntToExternalDoubleValue( const Any& _rControlIntValue );
//====================================================================
@@ -102,7 +102,7 @@ namespace frm
BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel )
DECL_PROP1( DEFAULT_SPIN_VALUE, sal_Int32, BOUND );
DECL_PROP1( TABINDEX, sal_Int16, BOUND );
- DECL_PROP2( CONTROLSOURCEPROPERTY,::rtl::OUString, READONLY, TRANSIENT );
+ DECL_PROP2( CONTROLSOURCEPROPERTY,OUString, READONLY, TRANSIENT );
END_DESCRIBE_PROPERTIES();
}
@@ -194,7 +194,7 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException )
+ OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException )
{
return FRM_SUN_COMPONENT_SPINBUTTON;
}
@@ -243,8 +243,8 @@ namespace frm
Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
{
return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
- ::rtl::OUString( "SpinValueMin" ),
- ::rtl::OUString( "SpinValueMax" ) );
+ OUString( "SpinValueMin" ),
+ OUString( "SpinValueMax" ) );
}
//--------------------------------------------------------------------
diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx
index 16eccff51f18..b1edc2a216c6 100644
--- a/forms/source/helper/commanddescriptionprovider.cxx
+++ b/forms/source/helper/commanddescriptionprovider.cxx
@@ -68,7 +68,7 @@ namespace frm
}
// ICommandDescriptionProvider
- virtual ::rtl::OUString getCommandDescription( const ::rtl::OUString& _rCommandURL ) const;
+ virtual OUString getCommandDescription( const OUString& _rCommandURL ) const;
private:
void impl_init_nothrow( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument );
@@ -88,7 +88,7 @@ namespace frm
try
{
Reference< XModuleManager2 > xModuleManager( ModuleManager::create(_rxContext) );
- ::rtl::OUString sModuleID = xModuleManager->identify( _rxDocument );
+ OUString sModuleID = xModuleManager->identify( _rxDocument );
Reference< XNameAccess > xUICommandDescriptions( UICommandDescription::create(_rxContext) );
m_xCommandAccess.set( xUICommandDescriptions->getByName( sModuleID ), UNO_QUERY_THROW );
@@ -100,22 +100,22 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString DefaultCommandDescriptionProvider::getCommandDescription( const ::rtl::OUString& _rCommandURL ) const
+ OUString DefaultCommandDescriptionProvider::getCommandDescription( const OUString& _rCommandURL ) const
{
if ( !m_xCommandAccess.is() )
- return ::rtl::OUString();
+ return OUString();
try
{
::comphelper::NamedValueCollection aCommandProperties( m_xCommandAccess->getByName( _rCommandURL ) );
- return aCommandProperties.getOrDefault( "Name", ::rtl::OUString() );
+ return aCommandProperties.getOrDefault( "Name", OUString() );
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
- return ::rtl::OUString();
+ return OUString();
}
//--------------------------------------------------------------------
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index 88b118ee42e5..b9c0575659b7 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -104,7 +104,7 @@ namespace frm
try
{
Reference< XModuleManager2 > xModuleManager( ModuleManager::create(_rContext.getUNOContext()) );
- ::rtl::OUString sModuleID = xModuleManager->identify( _rxDocument );
+ OUString sModuleID = xModuleManager->identify( _rxDocument );
Reference< XModuleUIConfigurationManagerSupplier > xSuppUIConfig(
ModuleUIConfigurationManagerSupplier::create(_rContext.getUNOContext()) );
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index a5d02d5ca60a..e385d51f38d1 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -130,7 +130,7 @@ namespace frm
}
}
//--------------------------------------------------------------------
- Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const ::rtl::OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((RuntimeException))
+ Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((RuntimeException))
{
Reference< XDispatch > xDispatcher;
if ( m_xFirstDispatchInterceptor.is() )
@@ -141,7 +141,7 @@ namespace frm
//--------------------------------------------------------------------
Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL ) SAL_THROW((RuntimeException))
{
- return queryDispatch( _rURL, ::rtl::OUString(), 0 );
+ return queryDispatch( _rURL, OUString(), 0 );
}
//--------------------------------------------------------------------
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 4ced762e7127..460b10ab1dd0 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -298,7 +298,7 @@ namespace frm
if ( aInfo->second.xDispatcher.is() )
{
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = ::rtl::OUString::createFromAscii( _pParamAsciiName );
+ aArgs[0].Name = OUString::createFromAscii( _pParamAsciiName );
aArgs[0].Value = _rParamValue;
aInfo->second.xDispatcher->dispatch( aInfo->second.aURL, aArgs );
@@ -343,9 +343,9 @@ namespace frm
}
//------------------------------------------------------------------
- ::rtl::OUString OFormNavigationHelper::getStringState( sal_Int16 _nFeatureId ) const
+ OUString OFormNavigationHelper::getStringState( sal_Int16 _nFeatureId ) const
{
- ::rtl::OUString sState;
+ OUString sState;
FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId );
if ( m_aSupportedFeatures.end() != aInfo )
@@ -457,7 +457,7 @@ namespace frm
}
//------------------------------------------------------------------
- sal_Int16 OFormNavigationMapper::getFeatureId( const ::rtl::OUString& _rCompleteURL )
+ sal_Int16 OFormNavigationMapper::getFeatureId( const OUString& _rCompleteURL )
{
const FeatureURL* pFeatures = lcl_getFeatureTable();
while ( pFeatures->pAsciiURL )
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index 94a485f6ec2c..f5f584df1e7d 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -60,7 +60,7 @@ namespace frm
}
//--------------------------------------------------------------------
- URL UrlTransformer::getStrictURL( const ::rtl::OUString& _rURL ) const
+ URL UrlTransformer::getStrictURL( const OUString& _rURL ) const
{
URL aReturn;
aReturn.Complete = _rURL;
@@ -72,14 +72,14 @@ namespace frm
//--------------------------------------------------------------------
URL UrlTransformer::getStrictURLFromAscii( const sal_Char* _pAsciiURL ) const
{
- return getStrictURL( ::rtl::OUString::createFromAscii( _pAsciiURL ) );
+ return getStrictURL( OUString::createFromAscii( _pAsciiURL ) );
}
//--------------------------------------------------------------------
void UrlTransformer::parseSmartWithAsciiProtocol( ::com::sun::star::util::URL& _rURL, const sal_Char* _pAsciiURL ) const
{
if ( implEnsureTransformer() )
- m_xTransformer->parseSmart( _rURL, ::rtl::OUString::createFromAscii( _pAsciiURL ) );
+ m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) );
}
//........................................................................
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 416453305574..611ba1730197 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -86,14 +86,14 @@ namespace frm
// macros for quickly declaring/implementing XServiceInfo
#define DECLARE_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); \
// old macro for quickly implementing XServiceInfo::getImplementationName
#define IMPLEMENTATION_NAME(ImplName) \
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \
- { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(#ImplName); }
+ virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \
+ { return OUString("com.sun.star.comp.forms.") + OUString(#ImplName); }
class OControlModel;
@@ -203,7 +203,7 @@ public:
*/
OControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory,
- const ::rtl::OUString& _rAggregateService,
+ const OUString& _rAggregateService,
const sal_Bool _bSetDelegator = sal_True
);
@@ -247,9 +247,9 @@ protected:
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException);
// 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);
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
// XServiceInfo - static version
static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
@@ -270,7 +270,7 @@ protected:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
// overwrite this and call the base class if you have additional types
- ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames();
+ ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames();
private:
void impl_resetStateGuard_nothrow();
@@ -288,7 +288,7 @@ class OBoundControl :public OControl
protected:
sal_Bool m_bLocked : 1;
- ::rtl::OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer
+ OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer
::com::sun::star::awt::FontDescriptor
m_aOriginalFont; // as long as the text/value is invalid, we also change the font
sal_Int32 m_nOriginalTextLineColor; // (we add red underlining)
@@ -296,7 +296,7 @@ protected:
public:
OBoundControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
- const ::rtl::OUString& _rAggregateService,
+ const OUString& _rAggregateService,
const sal_Bool _bSetDelegator = sal_True
);
@@ -360,8 +360,8 @@ protected:
getContext() const { return m_aContext; }
// <properties>
- ::rtl::OUString m_aName; // name of the control
- ::rtl::OUString m_aTag; // tag for additional data
+ OUString m_aName; // name of the control
+ OUString m_aTag; // tag for additional data
sal_Int16 m_nTabIndex; // index within the taborder
sal_Int16 m_nClassId; // type of the control
sal_Bool m_bNativeLook; // should the control use the native platform look?
@@ -372,8 +372,8 @@ protected:
protected:
OControlModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with
- const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate
- const ::rtl::OUString& rDefault = ::rtl::OUString(), // service name of the default control
+ const OUString& _rUnoControlModelTypeName, // service name of te model to aggregate
+ const OUString& rDefault = OUString(), // service name of the default control
const sal_Bool _bSetDelegator = sal_True // set to sal_False if you want to call setDelegator later (after returning from this ctor)
);
OControlModel(
@@ -402,7 +402,7 @@ protected:
void doSetDelegator();
void doResetDelegator();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames();
+ ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames();
public:
DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper);
@@ -416,19 +416,19 @@ public:
virtual void SAL_CALL disposing();
// 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 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);
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0;
// XSericeInfo - static version(s)
static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
// XPersistObject
- virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0;
+ virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0;
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
@@ -459,8 +459,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException) = 0;
// 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);
@@ -542,8 +542,8 @@ public:
#define DECLARE_DEFAULT_XTOR( classname ) \
classname( \
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \
- const ::rtl::OUString& _rUnoControlModelTypeName, \
- const ::rtl::OUString& _rDefault \
+ const OUString& _rUnoControlModelTypeName, \
+ const OUString& _rDefault \
); \
DECLARE_DEFAULT_CLONE_CTOR( classname ) \
DECLARE_DEFAULT_DTOR( classname ) \
@@ -552,8 +552,8 @@ public:
#define DECLARE_DEFAULT_BOUND_XTOR( classname ) \
classname( \
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \
- const ::rtl::OUString& _rUnoControlModelTypeName, \
- const ::rtl::OUString& _rDefault, \
+ const OUString& _rUnoControlModelTypeName, \
+ const OUString& _rDefault, \
const sal_Bool _bSupportExternalBinding, \
const sal_Bool _bSupportsValidation \
); \
@@ -631,7 +631,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >
m_xAmbientForm;
- ::rtl::OUString m_sValuePropertyName;
+ OUString m_sValuePropertyName;
sal_Int32 m_nValuePropertyAggregateHandle;
sal_Int32 m_nFieldType;
::com::sun::star::uno::Type m_aValuePropertyType;
@@ -648,7 +648,7 @@ private:
::com::sun::star::uno::Type m_aExternalValueType;
// <properties>
- ::rtl::OUString m_aControlSource; // Datenquelle, Name des Feldes
+ OUString m_aControlSource; // Datenquelle, Name des Feldes
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
m_xLabelControl; // reference to a sibling control (model) which is our label
sal_Bool m_bInputRequired;
@@ -672,7 +672,7 @@ private:
ValueChangeInstigator m_eControlValueChangeInstigator;
protected:
- ::rtl::OUString m_aLabelServiceName;
+ OUString m_aLabelServiceName;
// when setting the label for our control (property FM_PROP_CONTROLLABEL, member m_xLabelControl),
// we accept only objects supporting an XControlModel interface, an XServiceInfo interface and
// support for a service (XServiceInfo::supportsService) determined by this string.
@@ -687,9 +687,9 @@ protected:
m_xColumn;
protected:
- inline const ::rtl::OUString& getValuePropertyName( ) const { return m_sValuePropertyName; }
+ inline const OUString& getValuePropertyName( ) const { return m_sValuePropertyName; }
inline sal_Int32 getValuePropertyAggHandle( ) const { return m_nValuePropertyAggregateHandle; }
- inline const ::rtl::OUString& getControlSource( ) const { return m_aControlSource; }
+ inline const OUString& getControlSource( ) const { return m_aControlSource; }
inline sal_Bool isRequired() const { return m_bRequired; }
inline sal_Bool isLoaded() const { return m_bLoaded; }
@@ -698,8 +698,8 @@ protected:
OBoundControlModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory,
// factory to create the aggregate with
- const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate
- const ::rtl::OUString& _rDefault, // service name of the default control
+ const OUString& _rUnoControlModelTypeName, // service name of te model to aggregate
+ const OUString& _rDefault, // service name of the default control
const sal_Bool _bCommitable, // is the control (model) commitable ?
const sal_Bool _bSupportExternalBinding, // set to sal_True if you want to support XBindableValue
const sal_Bool _bSupportsValidation // set to sal_True if you want to support XValidatable
@@ -746,7 +746,7 @@ protected:
@see describeFixedProperties
*/
void initValueProperty(
- const ::rtl::OUString& _rValuePropertyName,
+ const OUString& _rValuePropertyName,
sal_Int32 _nValuePropertyExternalHandle
);
@@ -759,7 +759,7 @@ protected:
value and external validation. (This is not a conceptual limit, but simply missing implementation.)</p>
*/
void initOwnValueProperty(
- const ::rtl::OUString& i_rValuePropertyName
+ const OUString& i_rValuePropertyName
);
/** suspends listening at the value property
@@ -804,7 +804,7 @@ protected:
@see initValueProperty
@see _propertyChanged
*/
- void startAggregatePropertyListening( const ::rtl::OUString& _rPropertyName );
+ void startAggregatePropertyListening( const OUString& _rPropertyName );
/** returns the default which should be used when resetting the control
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index d0a72db8c391..ea5963512ce4 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -74,7 +74,7 @@ namespace frm
};
typedef ::std::vector<InterfaceRef> OInterfaceArray;
-typedef ::boost::unordered_multimap< ::rtl::OUString, InterfaceRef, ::rtl::OUStringHash, ::comphelper::UStringEqual> OInterfaceMap;
+typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash, ::comphelper::UStringEqual> OInterfaceMap;
//==================================================================
// OInterfaceContainer
@@ -123,7 +123,7 @@ protected:
public:
// ::com::sun::star::io::XPersistObject
- virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException) = 0;
+ virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException) = 0;
virtual 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);
virtual 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);
@@ -141,16 +141,16 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() 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::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual StringSequence 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 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& Name, const ::com::sun::star::uno::Any& _rElement) 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& Name, const ::com::sun::star::uno::Any& _rElement) 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& Name, const ::com::sun::star::uno::Any& _rElement) 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& Name, const ::com::sun::star::uno::Any& _rElement) 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::XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException);
@@ -170,7 +170,7 @@ public:
// ::com::sun::star::script::XEventAttacherManager
virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const ::com::sun::star::script::ScriptEventDescriptor& aScriptEvent ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& aScriptEvents ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx
index fa8d014f965a..05c16ac6c222 100644
--- a/forms/source/inc/commanddescriptionprovider.hxx
+++ b/forms/source/inc/commanddescriptionprovider.hxx
@@ -36,7 +36,7 @@ namespace frm
class SAL_NO_VTABLE ICommandDescriptionProvider
{
public:
- virtual ::rtl::OUString getCommandDescription( const ::rtl::OUString& _rCommandURL ) const = 0;
+ virtual OUString getCommandDescription( const OUString& _rCommandURL ) const = 0;
virtual ~ICommandDescriptionProvider() { }
};
diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index 8e66ff508b44..6c282576331b 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -35,7 +35,7 @@ namespace frm
//=====================================================================
//= ICommandImageProvider
//=====================================================================
- typedef ::rtl::OUString CommandURL;
+ typedef OUString CommandURL;
typedef ::com::sun::star::uno::Sequence< CommandURL > CommandURLs;
typedef ::std::vector< Image > CommandImages;
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index 5ad5c0901257..0981c6a2ace3 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -70,7 +70,7 @@ namespace frm
/** queries the interceptor chain for the given dispatch
*/
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
- queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+ queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((::com::sun::star::uno::RuntimeException));
/** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags
*/
diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx
index 5004aa511b9b..b24604e4564f 100644
--- a/forms/source/inc/featuredispatcher.hxx
+++ b/forms/source/inc/featuredispatcher.hxx
@@ -81,7 +81,7 @@ namespace frm
This method allows retrieving status information about features which have an additional
string information associated with it.
*/
- virtual ::rtl::OUString getStringState( sal_Int16 _nFeatureId ) const = 0;
+ virtual OUString getStringState( sal_Int16 _nFeatureId ) const = 0;
/** returns the integer state of a feature
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index fb8005ba6b2b..23fffb715d98 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -101,7 +101,7 @@ namespace frm
virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const ::com::sun::star::uno::Any& _rParamValue ) const;
virtual bool isEnabled( sal_Int16 _nFeatureId ) const;
virtual bool getBooleanState( sal_Int16 _nFeatureId ) const;
- virtual ::rtl::OUString getStringState( sal_Int16 _nFeatureId ) const;
+ virtual OUString getStringState( sal_Int16 _nFeatureId ) const;
virtual sal_Int32 getIntegerState( sal_Int16 _nFeatureId ) const;
// own overridables
@@ -216,7 +216,7 @@ namespace frm
the id of the feature URL, or -1 if the URl is not known
(which is a valid usage)
*/
- sal_Int16 getFeatureId( const ::rtl::OUString& _rCompleteURL );
+ sal_Int16 getFeatureId( const OUString& _rCompleteURL );
private:
OFormNavigationMapper( ); // never implemented
diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx
index 2eaada90d15c..e59f973645d5 100644
--- a/forms/source/inc/forms_module.hxx
+++ b/forms/source/inc/forms_module.hxx
@@ -42,9 +42,9 @@ namespace FORMS_MODULE_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
);
@@ -59,9 +59,9 @@ namespace FORMS_MODULE_NAMESPACE
protected:
// 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;
@@ -81,8 +81,8 @@ namespace FORMS_MODULE_NAMESPACE
@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);
@@ -91,7 +91,7 @@ namespace FORMS_MODULE_NAMESPACE
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.
<p>Usually used from within component_getFactory.<p/>
@@ -103,7 +103,7 @@ namespace FORMS_MODULE_NAMESPACE
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
);
@@ -124,8 +124,8 @@ namespace FORMS_MODULE_NAMESPACE
/** automatically registeres a multi instance component
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/>
+ <li><code>static OUString getImplementationName_Static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
@@ -167,8 +167,8 @@ namespace FORMS_MODULE_NAMESPACE
/** automatically registeres a single instance component
<p>Assumed that the template argument has the three methods
<ul>
- <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/>
- <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/>
+ <li><code>static OUString getImplementationName_Static()</code><li/>
+ <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
<li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
</li>
@@ -204,11 +204,11 @@ namespace FORMS_MODULE_NAMESPACE
//= OMultiInstanceAutoRegistration or OOneInstanceAutoRegistration
//==========================================================================
#define DECLARE_SERVICE_REGISTRATION( classname ) \
- 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 ::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::lang::XMultiServiceFactory >& _rxFactory ); \
\
friend class OOneInstanceAutoRegistration< classname >; \
@@ -216,10 +216,10 @@ namespace FORMS_MODULE_NAMESPACE
#define IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \
\
- ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw ( RuntimeException ) \
+ OUString SAL_CALL classname::getImplementationName( ) throw ( RuntimeException ) \
{ return getImplementationName_Static(); } \
\
- Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException) \
+ Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException) \
{ \
return ::comphelper::concatSequences( \
getAggregateServiceNames(), \
@@ -227,8 +227,8 @@ namespace FORMS_MODULE_NAMESPACE
); \
} \
\
- ::rtl::OUString SAL_CALL classname::getImplementationName_Static() \
- { return ::rtl::OUString( "com.sun.star.comp.forms."#classname ); } \
+ OUString SAL_CALL classname::getImplementationName_Static() \
+ { return OUString( "com.sun.star.comp.forms."#classname ); } \
\
Reference< XInterface > SAL_CALL classname::Create( const Reference< XMultiServiceFactory >& _rxFactory ) \
{ return static_cast< XServiceInfo* >( new classname( _rxFactory ) ); } \
@@ -237,9 +237,9 @@ namespace FORMS_MODULE_NAMESPACE
#define IMPLEMENT_SERVICE_REGISTRATION_1( classname, baseclass, service1 ) \
IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \
\
- Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
+ Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
{ \
- Sequence< ::rtl::OUString > aOwnNames( 1 ); \
+ Sequence< OUString > aOwnNames( 1 ); \
aOwnNames[ 0 ] = service1; \
\
return ::comphelper::concatSequences( \
@@ -251,9 +251,9 @@ namespace FORMS_MODULE_NAMESPACE
#define IMPLEMENT_SERVICE_REGISTRATION_2( classname, baseclass, service1, service2 ) \
IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \
\
- Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
+ Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
{ \
- Sequence< ::rtl::OUString > aOwnNames( 2 ); \
+ Sequence< OUString > aOwnNames( 2 ); \
aOwnNames[ 0 ] = service1; \
aOwnNames[ 1 ] = service2; \
\
@@ -266,9 +266,9 @@ namespace FORMS_MODULE_NAMESPACE
#define IMPLEMENT_SERVICE_REGISTRATION_7( classname, baseclass, service1, service2, service3, service4 , service5, service6, service7 ) \
IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \
\
- Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
+ Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
{ \
- Sequence< ::rtl::OUString > aOwnNames( 7 ); \
+ Sequence< OUString > aOwnNames( 7 ); \
aOwnNames[ 0 ] = service1; \
aOwnNames[ 1 ] = service2; \
aOwnNames[ 2 ] = service3; \
@@ -286,9 +286,9 @@ namespace FORMS_MODULE_NAMESPACE
#define IMPLEMENT_SERVICE_REGISTRATION_8( classname, baseclass, service1, service2, service3, service4 , service5, service6, service7, service8 ) \
IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \
\
- Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
+ Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \
{ \
- Sequence< ::rtl::OUString > aOwnNames( 8 ); \
+ Sequence< OUString > aOwnNames( 8 ); \
aOwnNames[ 0 ] = service1; \
aOwnNames[ 1 ] = service2; \
aOwnNames[ 2 ] = service3; \
diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx
index 60435ad01300..b49f2bb22126 100644
--- a/forms/source/inc/forms_module_impl.hxx
+++ b/forms/source/inc/forms_module_impl.hxx
@@ -46,15 +46,15 @@ namespace FORMS_MODULE_NAMESPACE
//- registration helper
//--------------------------------------------------------------------------
- Sequence< ::rtl::OUString >* OFormsModule::s_pImplementationNames = NULL;
- Sequence< Sequence< ::rtl::OUString > >* OFormsModule::s_pSupportedServices = NULL;
+ Sequence< OUString >* OFormsModule::s_pImplementationNames = NULL;
+ Sequence< Sequence< OUString > >* OFormsModule::s_pSupportedServices = NULL;
Sequence< sal_Int64 >* OFormsModule::s_pCreationFunctionPointers = NULL;
Sequence< sal_Int64 >* OFormsModule::s_pFactoryFunctionPointers = NULL;
//--------------------------------------------------------------------------
void OFormsModule::registerComponent(
- const ::rtl::OUString& _rImplementationName,
- const Sequence< ::rtl::OUString >& _rServiceNames,
+ const OUString& _rImplementationName,
+ const Sequence< OUString >& _rServiceNames,
ComponentInstantiation _pCreateFunction,
FactoryInstantiation _pFactoryFunction)
{
@@ -62,8 +62,8 @@ namespace FORMS_MODULE_NAMESPACE
{
OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
"OFormsModule::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 >;
}
@@ -88,7 +88,7 @@ namespace FORMS_MODULE_NAMESPACE
}
//--------------------------------------------------------------------------
- void OFormsModule::revokeComponent(const ::rtl::OUString& _rImplementationName)
+ void OFormsModule::revokeComponent(const OUString& _rImplementationName)
{
if (!s_pImplementationNames)
{
@@ -103,7 +103,7 @@ namespace FORMS_MODULE_NAMESPACE
"OFormsModule::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; i<nLen; ++i, ++pImplNames)
{
if (pImplNames->equals(_rImplementationName))
@@ -127,7 +127,7 @@ namespace FORMS_MODULE_NAMESPACE
//--------------------------------------------------------------------------
Reference< XInterface > OFormsModule::getComponentFactory(
- const ::rtl::OUString& _rImplementationName,
+ const OUString& _rImplementationName,
const Reference< XMultiServiceFactory >& _rxServiceManager)
{
OSL_ENSURE(_rxServiceManager.is(), "OFormsModule::getComponentFactory : invalid argument (service manager) !");
@@ -150,8 +150,8 @@ namespace FORMS_MODULE_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/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index aa30f1cf7611..e8f5cf9c3c94 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -58,7 +58,7 @@ namespace frm
public:
/** loads the string with the specified resource id from the FormLayer resource file
*/
- static ::rtl::OUString loadString(sal_uInt16 _nResId);
+ static OUString loadString(sal_uInt16 _nResId);
};
//.........................................................................
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index ad3cbc1b03f5..cd5ef0a92ae3 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -50,13 +50,13 @@ class PropertyInfoService
//..................................................................
struct PropertyAssignment
{
- ::rtl::OUString sName;
+ OUString sName;
sal_Int32 nHandle;
PropertyAssignment() { nHandle = -1; }
PropertyAssignment(const PropertyAssignment& _rSource)
:sName(_rSource.sName), nHandle(_rSource.nHandle) { }
- PropertyAssignment(const ::rtl::OUString& _rName, sal_Int32 _nHandle)
+ PropertyAssignment(const OUString& _rName, sal_Int32 _nHandle)
:sName(_rName), nHandle(_nHandle) { }
};
@@ -85,8 +85,8 @@ public:
PropertyInfoService() { }
public:
- static sal_Int32 getPropertyId(const ::rtl::OUString& _rName);
- static ::rtl::OUString getPropertyName(sal_Int32 _nHandle);
+ static sal_Int32 getPropertyId(const OUString& _rName);
+ static OUString getPropertyName(sal_Int32 _nHandle);
private:
static void initialize();
@@ -99,7 +99,7 @@ class ConcreteInfoService : public ::comphelper::IPropertyInfoService
public:
virtual ~ConcreteInfoService() {}
- virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName);
+ virtual sal_Int32 getPreferedPropertyId(const OUString& _rName);
};
//------------------------------------------------------------------------------
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index 5360330b2c7f..07d1e65f8aad 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -74,8 +74,8 @@ namespace frm
inline ::comphelper::OPropertyArrayAggregationHelper& getInfoHelper() const;
// XPropertyContainer equivalent
- void addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const ::com::sun::star::uno::Any& _rInitialValue );
- void removeProperty( const ::rtl::OUString& _rName );
+ void addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const ::com::sun::star::uno::Any& _rInitialValue );
+ void removeProperty( const OUString& _rName );
// XPropertyAccess equivalent
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues();
@@ -86,7 +86,7 @@ namespace frm
inline bool convertDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::com::sun::star::uno::Any& _out_rConvertedValue, ::com::sun::star::uno::Any& _out_rCurrentValue ) const;
inline void setDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue );
inline void getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const;
- inline bool hasDynamicPropertyByName( const ::rtl::OUString& _rName ) const;
+ inline bool hasDynamicPropertyByName( const OUString& _rName ) const;
inline bool hasDynamicPropertyByHandle( sal_Int32 _nHandle ) const;
private:
@@ -106,7 +106,7 @@ namespace frm
the name of the property to find a handle for. If possible, the handle as determined by
our ConcreteInfoService instance will be used
*/
- sal_Int32 impl_findFreeHandle( const ::rtl::OUString& _rPropertyName );
+ sal_Int32 impl_findFreeHandle( const OUString& _rPropertyName );
};
//--------------------------------------------------------------------
@@ -140,7 +140,7 @@ namespace frm
}
//--------------------------------------------------------------------
- inline bool PropertyBagHelper::hasDynamicPropertyByName( const ::rtl::OUString& _rName ) const
+ inline bool PropertyBagHelper::hasDynamicPropertyByName( const OUString& _rName ) const
{
return m_aDynamicProperties.hasPropertyByName( _rName );
}
diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx
index 3ee1af6e8c63..09f8dc8eccbb 100644
--- a/forms/source/inc/urltransformer.hxx
+++ b/forms/source/inc/urltransformer.hxx
@@ -47,7 +47,7 @@ namespace frm
/** returns an URL object for the given URL string
*/
::com::sun::star::util::URL
- getStrictURL( const ::rtl::OUString& _rURL ) const;
+ getStrictURL( const OUString& _rURL ) const;
/** returns an URL object for the given URL ASCII string
*/
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 7a3bf4178de8..43253b8d1e38 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -123,7 +123,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn
break;
Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW );
- Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY );
+ Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY );
if ( !xNameQuery.is() )
break;
@@ -140,15 +140,15 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn
// Try getting the code name from the container first (faster),
// then from the element if that fails (slower).
Reference<XInterface> xThis = static_cast<XContainer*>(this);
- rtl::OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis);
+ OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis);
if (sCodeName.isEmpty())
sCodeName = xNameQuery->getCodeNameForObject(xElement);
Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW );
- ::rtl::OUString sServiceName;
- xProps->getPropertyValue( rtl::OUString("DefaultControl") ) >>= sServiceName;
+ OUString sServiceName;
+ xProps->getPropertyValue( OUString("DefaultControl") ) >>= sServiceName;
- Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW );
+ Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW );
Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName );
// register the vba script events
m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents );
@@ -223,7 +223,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
catch( const Exception& )
{
throw WrappedTargetException(
- ::rtl::OUString( "Could not clone the given interface hierarchy." ),
+ OUString( "Could not clone the given interface hierarchy." ),
static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ),
::cppu::getCaughtException()
);
@@ -370,7 +370,7 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr
if ( 0 <= nPrefixLength )
{ // the macro name does not already contain a :
#ifdef DBG_UTIL
- const ::rtl::OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength );
+ const OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength );
DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" )
|| 0 == sPrefix.compareToAscii( "application" ),
"TransformEventTo52Format: invalid (unknown) prefix!" );
@@ -392,7 +392,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr
if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 )
{ // the macro name does not already contain a :
// -> default the type to "document"
- ::rtl::OUString sNewScriptCode( "document:" );
+ OUString sNewScriptCode( "document:" );
sNewScriptCode += _rDescriptor.ScriptCode;
_rDescriptor.ScriptCode = sNewScriptCode;
}
@@ -688,12 +688,12 @@ throw (::com::sun::star::uno::RuntimeException) {
{
::osl::MutexGuard aGuard( m_rMutex );
OInterfaceMap::iterator i = ::std::find(m_aMap.begin(), m_aMap.end(),
- ::std::pair<const ::rtl::OUString, InterfaceRef >(::comphelper::getString(evt.OldValue),evt.Source));
+ ::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.OldValue),evt.Source));
if (i != m_aMap.end())
{
InterfaceRef xCorrectType((*i).second);
m_aMap.erase(i);
- m_aMap.insert(::std::pair<const ::rtl::OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType));
+ m_aMap.insert(::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType));
}
}
}
@@ -721,7 +721,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw(
// XNameAccess
//------------------------------------------------------------------------------
-Any SAL_CALL OInterfaceContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
::std::pair <OInterfaceMap::iterator,
OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName);
@@ -736,7 +736,7 @@ Any SAL_CALL OInterfaceContainer::getByName( const ::rtl::OUString& _rName ) thr
StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException)
{
StringSequence aNameList(m_aItems.size());
- ::rtl::OUString* pStringArray = aNameList.getArray();
+ OUString* pStringArray = aNameList.getArray();
for (OInterfaceMap::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i, ++pStringArray)
{
@@ -746,7 +746,7 @@ StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeExce
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OInterfaceContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
+sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException)
{
::std::pair <OInterfaceMap::iterator,
OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName);
@@ -835,7 +835,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
// exist
// set the name, and add as change listener for the name
- ::rtl::OUString sName;
+ OUString sName;
_rxElement->getPropertyValue(PROPERTY_NAME) >>= sName;
_rxElement->addPropertyChangeListener(PROPERTY_NAME, this);
@@ -848,7 +848,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
else
m_aItems.insert( m_aItems.begin() + _nIndex, pElementMetaData->xInterface );
- m_aMap.insert( ::std::pair< const ::rtl::OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) );
+ m_aMap.insert( ::std::pair< const OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) );
// announce ourself as parent to the new element
pElementMetaData->xChild->setParent(static_cast<XContainer*>(this));
@@ -870,7 +870,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
bool bHandleVbaEvents = false;
try
{
- _rxElement->getPropertyValue(rtl::OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents;
+ _rxElement->getPropertyValue(OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents;
}
catch( const Exception& )
{
@@ -1006,14 +1006,14 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
m_aMap.erase(j);
// examine the new element
- ::rtl::OUString sName;
+ OUString sName;
DBG_ASSERT( aElementMetaData.get()->xPropertySet.is(), "OInterfaceContainer::implReplaceByIndex: what did approveNewElement do?" );
aElementMetaData.get()->xPropertySet->getPropertyValue(PROPERTY_NAME) >>= sName;
aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this);
// insert the new one
- m_aMap.insert( ::std::pair<const ::rtl::OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) );
+ m_aMap.insert( ::std::pair<const OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) );
m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface;
aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this));
@@ -1110,7 +1110,7 @@ ElementDescription* OInterfaceContainer::createElementMetaData( )
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
+void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
{
Reference< XPropertySet > xElementProps;
@@ -1143,7 +1143,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::replaceByName(const ::rtl::OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
+void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
{
::osl::ClearableMutexGuard aGuard( m_rMutex );
::std::pair <OInterfaceMap::iterator,
@@ -1171,7 +1171,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const ::rtl::OUString& Name, co
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::removeByName(const ::rtl::OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException )
+void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException )
{
::osl::MutexGuard aGuard( m_rMutex );
::std::pair <OInterfaceMap::iterator,
@@ -1210,7 +1210,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const
}
//------------------------------------------------------------------------
-void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
+void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
{
if ( m_xEventAttacher.is() )
m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam );
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index b31c97eb91ec..7054db2403bb 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -54,9 +54,9 @@ namespace frm
//---------------------------------------------------------------------
static const Locale& getLocale(LocaleType _eType)
{
- static const Locale s_aEnglishUS( ::rtl::OUString("en"), ::rtl::OUString("us"), ::rtl::OUString() );
- static const Locale s_aGerman( ::rtl::OUString("de"), ::rtl::OUString("DE"), ::rtl::OUString() );
- static const ::rtl::OUString s_sEmptyString;
+ static const Locale s_aEnglishUS( OUString("en"), OUString("us"), OUString() );
+ static const Locale s_aGerman( OUString("de"), OUString("DE"), OUString() );
+ static const OUString s_sEmptyString;
static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString );
switch (_eType)
@@ -171,7 +171,7 @@ namespace frm
{
// get the key for the description
pLoopFormats->nKey = xStandardFormats->queryKey(
- ::rtl::OUString::createFromAscii(pLoopFormats->pDescription),
+ OUString::createFromAscii(pLoopFormats->pDescription),
getLocale(pLoopFormats->eLocale),
sal_False
);
@@ -179,7 +179,7 @@ namespace frm
if (-1 == pLoopFormats->nKey)
{
pLoopFormats->nKey = xStandardFormats->addNew(
- ::rtl::OUString::createFromAscii(pLoopFormats->pDescription),
+ OUString::createFromAscii(pLoopFormats->pDescription),
getLocale(pLoopFormats->eLocale)
);
#ifdef DBG_UTIL
@@ -332,7 +332,7 @@ namespace frm
if (!bFoundIt)
{ // somebody gave us an format which we can't translate
- ::rtl::OUString sMessage ("This control supports only a very limited number of formats.");
+ OUString sMessage ("This control supports only a very limited number of formats.");
throw IllegalArgumentException(sMessage, NULL, 2);
}
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 105593b90faa..066b58d6f709 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -36,7 +36,7 @@ namespace frm
//==================================================================
PropertyInfoService::PropertyMap PropertyInfoService::s_AllKnownProperties;
//------------------------------------------------------------------
-sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
+sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
{
initialize();
@@ -58,7 +58,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName)
}
//------------------------------------------------------------------
-sal_Int32 ConcreteInfoService::getPreferedPropertyId(const ::rtl::OUString& _rName)
+sal_Int32 ConcreteInfoService::getPreferedPropertyId(const OUString& _rName)
{
return PropertyInfoService::getPropertyId(_rName);
}
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 2c2ce38172d7..db4342bc11fe 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -92,16 +92,16 @@ DECLARE_SERVICE_INFO(ImageProducer)
//---------------------------------------------------------------------------------------
-static Sequence< ::rtl::OUString > s_aClassImplementationNames;
-static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames;
+static Sequence< OUString > s_aClassImplementationNames;
+static Sequence<Sequence< OUString > > s_aClassServiceNames;
static Sequence<sal_Int64> s_aFactories;
// need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
// it can't be used with sequences
//---------------------------------------------------------------------------------------
void registerClassInfo(
- ::rtl::OUString _rClassImplName, // the ImplName of the class
- const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class
+ OUString _rClassImplName, // the ImplName of the class
+ const Sequence< OUString >& _rServiceNames, // the services supported by this class
::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class
)
{
@@ -123,7 +123,7 @@ void registerClassInfo(
//.......................................................................................
#define REGISTER_CLASS_CORE(classImplName) \
registerClassInfo( \
- ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(#classImplName), \
+ OUString("com.sun.star.form.") + OUString(#classImplName), \
aServices, \
frm::classImplName##_CreateInstance)
@@ -163,7 +163,7 @@ void ensureClassInfos()
if (s_aClassImplementationNames.getLength())
// nothing to do
return;
- Sequence< ::rtl::OUString > aServices;
+ Sequence< OUString > aServices;
// ========================================================================
// = ControlModels
@@ -218,7 +218,7 @@ void ensureClassInfos()
aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
- registerClassInfo(::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
+ registerClassInfo(OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
aServices,
frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted);
@@ -265,7 +265,7 @@ void ensureClassInfos()
// = XForms core
#define REGISTER_XFORMS_CLASS(name) \
aServices.realloc(1); \
- aServices.getArray()[0] = rtl::OUString( "com.sun.star.xforms." #name ); \
+ aServices.getArray()[0] = OUString( "com.sun.star.xforms." #name ); \
REGISTER_CLASS_CORE(name)
REGISTER_XFORMS_CLASS(Model);
@@ -329,8 +329,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI
"forms::component_getFactory : invalid class infos !");
// loop through the sequences and register the service providers
- const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray();
- const Sequence< ::rtl::OUString >* pServices = s_aClassServiceNames.getConstArray();
+ const OUString* pClasses = s_aClassImplementationNames.getConstArray();
+ const Sequence< OUString >* pServices = s_aClassServiceNames.getConstArray();
const sal_Int64* pFunctionsAsInts = s_aFactories.getConstArray();
for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts)
@@ -366,7 +366,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI
// let the module look for the component
Reference< XInterface > xRet;
xRet = ::frm::OFormsModule::getComponentFactory(
- ::rtl::OUString::createFromAscii( _pImplName ),
+ OUString::createFromAscii( _pImplName ),
static_cast< XMultiServiceFactory* >( _pServiceManager ) );
if ( xRet.is() )
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index 9acd6b1c3fc8..3e643500b029 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -58,9 +58,9 @@ namespace frm
}
//------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId)
+ OUString ResourceManager::loadString(sal_uInt16 _nResId)
{
- ::rtl::OUString sReturn;
+ OUString sReturn;
ensureImplExists();
if (m_pImpl)
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index 225672e68c67..5a2acfe146c0 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -97,9 +97,9 @@ namespace frm
#if OSL_DEBUG_LEVEL > 0
if ( _rArguments.getLength() )
{
- ::rtl::OString sMessage( "OAttributeDispatcher::dispatch: found arguments, but can't handle arguments at all" );
+ OString sMessage( "OAttributeDispatcher::dispatch: found arguments, but can't handle arguments at all" );
sMessage += "\n (URL: ";
- sMessage += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
+ sMessage += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ")";
OSL_FAIL( sMessage.getStr() );
}
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 72e078973f6d..7f299b855ca1 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -44,13 +44,13 @@ namespace frm
switch ( _eFunc )
{
case OClipboardDispatcher::eCut:
- aURL.Complete = ::rtl::OUString( ".uno:Cut" );
+ aURL.Complete = OUString( ".uno:Cut" );
break;
case OClipboardDispatcher::eCopy:
- aURL.Complete = ::rtl::OUString( ".uno:Copy" );
+ aURL.Complete = OUString( ".uno:Copy" );
break;
case OClipboardDispatcher::ePaste:
- aURL.Complete = ::rtl::OUString( ".uno:Paste" );
+ aURL.Complete = OUString( ".uno:Paste" );
break;
}
return aURL;
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 12b9b1ed98b6..942253209681 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -110,7 +110,7 @@ namespace frm
namespace
{
//..............................................................
- static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const ::rtl::OUString& _rPropertyName,
+ static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag )
{
sal_Bool bFlagValue = sal_False;
@@ -134,7 +134,7 @@ namespace frm
}
//..............................................................
- static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const ::rtl::OUString& _rPropertyName,
+ static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false )
{
implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert );
@@ -252,29 +252,29 @@ namespace frm
}
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException )
+ OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException )
{
return getImplementationName_Static();
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException )
+ Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException )
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static()
+ OUString SAL_CALL ORichTextControl::getImplementationName_Static()
{
- return ::rtl::OUString( "com.sun.star.comp.form.ORichTextControl" );
+ return OUString( "com.sun.star.comp.form.ORichTextControl" );
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static()
+ Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices( 3 );
- aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" );
- aServices[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlEdit" );
+ Sequence< OUString > aServices( 3 );
+ aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" );
+ aServices[ 1 ] = OUString( "com.sun.star.awt.UnoControlEdit" );
aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL;
return aServices;
}
@@ -286,7 +286,7 @@ namespace frm
}
//--------------------------------------------------------------------
- Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException)
+ Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException)
{
FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags );
}
@@ -298,7 +298,7 @@ namespace frm
}
//--------------------------------------------------------------------
- sal_Bool ORichTextControl::requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const
+ sal_Bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const
{
return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName.equals( PROPERTY_RICH_TEXT );
}
@@ -398,7 +398,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void SAL_CALL ORichTextPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException)
+ void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException)
{
if ( !GetWindow() )
{
@@ -604,8 +604,8 @@ namespace frm
if ( bNeedParametrizedDispatcher )
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " );
- sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
+ OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " );
+ sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
pAttributeDispatcher = new OParametrizedAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl );
@@ -613,8 +613,8 @@ namespace frm
else
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " );
- sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
+ OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " );
+ sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
pAttributeDispatcher = new OAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl );
@@ -623,8 +623,8 @@ namespace frm
#if OSL_DEBUG_LEVEL > 0
else
{
- ::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " );
- sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
+ OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " );
+ sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
OSL_TRACE( "%s", sTrace.getStr() );
}
#endif
@@ -645,7 +645,7 @@ namespace frm
//--------------------------------------------------------------------
namespace
{
- SfxSlotId lcl_getSlotFromUnoName( SfxSlotPool& _rSlotPool, const ::rtl::OUString& _rUnoSlotName )
+ SfxSlotId lcl_getSlotFromUnoName( SfxSlotPool& _rSlotPool, const OUString& _rUnoSlotName )
{
const SfxSlot* pSlot = _rSlotPool.GetUnoSlot( _rUnoSlotName );
if ( pSlot )
@@ -669,7 +669,7 @@ namespace frm
}
//--------------------------------------------------------------------
- Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException)
+ Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException)
{
Reference< XDispatch > xReturn;
if ( !GetWindow() )
@@ -679,10 +679,10 @@ namespace frm
}
// is it an UNO slot?
- ::rtl::OUString sUnoProtocolPrefix( ".uno:" );
+ OUString sUnoProtocolPrefix( ".uno:" );
if ( _rURL.Complete.startsWith( sUnoProtocolPrefix ) )
{
- ::rtl::OUString sUnoSlotName = _rURL.Complete.copy( sUnoProtocolPrefix.getLength() );
+ OUString sUnoSlotName = _rURL.Complete.copy( sUnoProtocolPrefix.getLength() );
SfxSlotId nSlotId = lcl_getSlotFromUnoName( SfxSlotPool::GetSlotPool( NULL ), sUnoSlotName );
if ( nSlotId > 0 )
{
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 365a85f7a27c..5dd61be825d0 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -56,8 +56,8 @@ namespace frm
public:
// XServiceInfo - static version
- 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::lang::XMultiServiceFactory >& _rxFactory );
protected:
@@ -69,18 +69,18 @@ namespace frm
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 >& _rParent ) 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);
// XTypeProvider
DECLARE_XTYPEPROVIDER()
// XDispatchProvider
- 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, sal_Int32 _rSearchFlags ) 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& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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);
// UnoControl
- virtual sal_Bool requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const;
+ virtual sal_Bool requiresNewPeer( const OUString& _rPropertyName ) const;
};
//==================================================================
@@ -119,7 +119,7 @@ namespace frm
void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
// XVclWindowPeer
- virtual void SAL_CALL setProperty( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException);
// XTypeProvider
DECLARE_XTYPEPROVIDER( )
@@ -128,7 +128,7 @@ namespace frm
virtual void SAL_CALL dispose( ) 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& _rURL, const ::rtl::OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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);
// ITextSelectionListener
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 5799ca8a90af..292309e971db 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -64,7 +64,7 @@ namespace frm
DBG_NAME( ORichTextModel )
//--------------------------------------------------------------------
ORichTextModel::ORichTextModel( const Reference< XMultiServiceFactory >& _rxFactory )
- :OControlModel ( _rxFactory, ::rtl::OUString() )
+ :OControlModel ( _rxFactory, OUString() )
,FontControlModel ( true )
,m_pEngine ( RichTextEngine::Create() )
,m_bSettingEngineText( false )
@@ -244,13 +244,13 @@ namespace frm
//--------------------------------------------------------------------
IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel,
FRM_SUN_COMPONENT_RICHTEXTCONTROL,
- ::rtl::OUString( "com.sun.star.text.TextRange" ),
- ::rtl::OUString( "com.sun.star.style.CharacterProperties" ),
- ::rtl::OUString( "com.sun.star.style.ParagraphProperties" ),
- ::rtl::OUString( "com.sun.star.style.CharacterPropertiesAsian" ),
- ::rtl::OUString( "com.sun.star.style.CharacterPropertiesComplex" ),
- ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesAsian" ),
- ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesComplex" )
+ OUString( "com.sun.star.text.TextRange" ),
+ OUString( "com.sun.star.style.CharacterProperties" ),
+ OUString( "com.sun.star.style.ParagraphProperties" ),
+ OUString( "com.sun.star.style.CharacterPropertiesAsian" ),
+ OUString( "com.sun.star.style.CharacterPropertiesComplex" ),
+ OUString( "com.sun.star.style.ParagraphPropertiesAsian" ),
+ OUString( "com.sun.star.style.ParagraphPropertiesComplex" )
)
//------------------------------------------------------------------------------
@@ -266,7 +266,7 @@ namespace frm
//------------------------------------------------------------------------------
namespace
{
- void lcl_removeProperty( Sequence< Property >& _rSeq, const ::rtl::OUString& _rPropertyName )
+ void lcl_removeProperty( Sequence< Property >& _rSeq, const OUString& _rPropertyName )
{
Property* pLoop = _rSeq.getArray();
Property* pEnd = _rSeq.getArray() + _rSeq.getLength();
@@ -409,7 +409,7 @@ namespace frm
// forward to our aggregate, so the EditEngine knows about it
if ( m_xAggregateSet.is() )
m_xAggregateSet->setPropertyValue(
- ::rtl::OUString( "WritingMode" ), _rValue );
+ OUString( "WritingMode" ), _rValue );
}
break;
@@ -466,13 +466,13 @@ namespace frm
break;
case PROPERTY_ID_DEFAULTCONTROL:
- aDefault <<= (::rtl::OUString)FRM_SUN_CONTROL_RICHTEXTCONTROL;
+ aDefault <<= (OUString)FRM_SUN_CONTROL_RICHTEXTCONTROL;
break;
case PROPERTY_ID_HELPTEXT:
case PROPERTY_ID_HELPURL:
case PROPERTY_ID_TEXT:
- aDefault <<= ::rtl::OUString();
+ aDefault <<= OUString();
break;
case PROPERTY_ID_BORDER:
@@ -490,7 +490,7 @@ namespace frm
}
//--------------------------------------------------------------------
- void ORichTextModel::impl_smlock_setEngineText( const ::rtl::OUString& _rText )
+ void ORichTextModel::impl_smlock_setEngineText( const OUString& _rText )
{
if ( m_pEngine.get() )
{
@@ -502,7 +502,7 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException)
+ OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException)
{
return FRM_SUN_COMPONENT_RICHTEXTCONTROL;
}
@@ -606,7 +606,7 @@ namespace frm
//--------------------------------------------------------------------
void ORichTextModel::potentialTextChange( )
{
- ::rtl::OUString sCurrentEngineText;
+ OUString sCurrentEngineText;
if ( m_pEngine.get() )
sCurrentEngineText = m_pEngine->GetText();
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 7d2fff59586f..75cab24a6466 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -62,10 +62,10 @@ namespace frm
::com::sun::star::uno::Any m_aBackgroundColor;
::com::sun::star::uno::Any m_aBorderColor;
::com::sun::star::uno::Any m_aVerticalAlignment;
- ::rtl::OUString m_sDefaultControl;
- ::rtl::OUString m_sHelpText;
- ::rtl::OUString m_sHelpURL;
- ::rtl::OUString m_sLastKnownEngineText;
+ OUString m_sDefaultControl;
+ OUString m_sHelpText;
+ OUString m_sHelpURL;
+ OUString m_sLastKnownEngineText;
sal_Int16 m_nLineEndFormat;
sal_Int16 m_nTextWritingMode;
sal_Int16 m_nContextWritingMode;
@@ -164,7 +164,7 @@ namespace frm
@precond
our mutex is not locked
*/
- void impl_smlock_setEngineText( const ::rtl::OUString& _rText );
+ void impl_smlock_setEngineText( const OUString& _rText );
DECL_LINK( OnEngineContentModified, void* );
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 7add303603fc..2f4349b247c6 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -243,8 +243,8 @@ namespace frm
for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i )
{
aFP.AddFilter(
- rtl::OUString::createFromAscii( aExportFormats[i].pDescription ),
- rtl::OUString::createFromAscii( aExportFormats[i].pExtension ) );
+ OUString::createFromAscii( aExportFormats[i].pDescription ),
+ OUString::createFromAscii( aExportFormats[i].pExtension ) );
}
ErrCode nResult = aFP.Execute();
if ( nResult == 0 )
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index a95a6b6e2f6d..914ae6af5180 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -140,16 +140,16 @@ namespace frm
}
//--------------------------------------------------------------------
- ::rtl::OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException)
+ OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException)
{
- return ::rtl::OUString( "com.sun.star.comp.forms.FormOperations" );
+ return OUString( "com.sun.star.comp.forms.FormOperations" );
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString( "com.sun.star.form.runtime.FormOperations" );
+ Sequence< OUString > aNames(1);
+ aNames[0] = OUString( "com.sun.star.form.runtime.FormOperations" );
return aNames;
}
@@ -174,30 +174,30 @@ namespace frm
else if ( _arguments[0] >>= xForm )
createWithForm( xForm );
else
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
return;
}
- throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
+ throw IllegalArgumentException( OUString(), *this, 0 );
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException)
+ OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------
- ::sal_Bool SAL_CALL FormOperations::supportsService( const ::rtl::OUString& _ServiceName ) throw (RuntimeException)
+ ::sal_Bool SAL_CALL FormOperations::supportsService( const OUString& _ServiceName ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aSupportedServiceNames( getSupportedServiceNames() );
- const ::rtl::OUString* pBegin = aSupportedServiceNames.getConstArray();
- const ::rtl::OUString* pEnd = aSupportedServiceNames.getConstArray() + aSupportedServiceNames.getLength();
+ Sequence< OUString > aSupportedServiceNames( getSupportedServiceNames() );
+ const OUString* pBegin = aSupportedServiceNames.getConstArray();
+ const OUString* pEnd = aSupportedServiceNames.getConstArray() + aSupportedServiceNames.getLength();
return ::std::find( pBegin, pEnd, _ServiceName ) != pEnd;
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException)
{
return getSupportedServiceNames_Static();
}
@@ -296,7 +296,7 @@ namespace frm
aState.Enabled = ::dbtools::getConnection( xCursorRowSet ).is();
// and an active command
- ::rtl::OUString sActiveCommand;
+ OUString sActiveCommand;
m_xCursorProperties->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= sActiveCommand;
aState.Enabled &= !sActiveCommand.isEmpty();
}
@@ -343,7 +343,7 @@ namespace frm
case FormFeature::ToggleApplyFilter:
{
- ::rtl::OUString sFilter;
+ OUString sFilter;
m_xCursorProperties->getPropertyValue( PROPERTY_FILTER ) >>= sFilter;
if ( !sFilter.isEmpty() )
{
@@ -398,9 +398,9 @@ namespace frm
if ( bIsNew )
++nCount;
- ::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) );
+ OUString sValue = OUString::valueOf( sal_Int32( nCount ) );
if ( !bFinalCount )
- sValue += ::rtl::OUString(" *");
+ sValue += OUString(" *");
aState.State <<= sValue;
aState.Enabled = sal_True;
@@ -647,13 +647,13 @@ namespace frm
OSL_ENSURE( xProperties.is(), "FormOperations::execute: no multi property access!" );
if ( xProperties.is() )
{
- Sequence< ::rtl::OUString > aNames( 2 );
+ Sequence< OUString > aNames( 2 );
aNames[0] = PROPERTY_FILTER;
aNames[1] = PROPERTY_SORT;
Sequence< Any> aValues( 2 );
- aValues[0] <<= ::rtl::OUString();
- aValues[1] <<= ::rtl::OUString();
+ aValues[0] <<= OUString();
+ aValues[1] <<= OUString();
WaitObject aWO( NULL );
xProperties->setPropertyValues( aNames, aValues );
@@ -713,7 +713,7 @@ namespace frm
catch( const SQLException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
}
impl_invalidateAllSupportedFeatures_nothrow( aGuard );
@@ -767,7 +767,7 @@ namespace frm
catch( const SQLException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() );
}
}
break;
@@ -871,7 +871,7 @@ namespace frm
catch( const RuntimeException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() );
}
return bIs;
}
@@ -887,7 +887,7 @@ namespace frm
catch( const RuntimeException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() );
}
return bIs;
}
@@ -948,7 +948,7 @@ namespace frm
{
try
{
- ::rtl::OUString sNewValue;
+ OUString sNewValue;
_rEvent.NewValue >>= sNewValue;
if ( _rEvent.PropertyName == PROPERTY_ACTIVECOMMAND )
{
@@ -1022,7 +1022,7 @@ namespace frm
void FormOperations::impl_checkDisposed_throw() const
{
if ( impl_isDisposed_nothrow() )
- throw DisposedException( ::rtl::OUString(), *const_cast< FormOperations* >( this ) );
+ throw DisposedException( OUString(), *const_cast< FormOperations* >( this ) );
}
//--------------------------------------------------------------------
@@ -1031,7 +1031,7 @@ namespace frm
OSL_PRECOND( m_xController.is(), "FormOperations::impl_initFromController_throw: invalid controller!" );
m_xCursor = m_xCursor.query( m_xController->getModel() );
if ( !m_xCursor.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
+ throw IllegalArgumentException( OUString(), *this, 0 );
impl_initFromForm_throw();
@@ -1049,7 +1049,7 @@ namespace frm
m_xLoadableForm = m_xLoadableForm.query ( m_xCursor );
if ( !m_xCursor.is() || !m_xCursorProperties.is() || !m_xLoadableForm.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
+ throw IllegalArgumentException( OUString(), *this, 0 );
m_xCursor->addRowSetListener( this );
m_xCursorProperties->addPropertyChangeListener( PROPERTY_ISMODIFIED,this );
@@ -1061,7 +1061,7 @@ namespace frm
{
m_xController = _rxController;
if ( !m_xController.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
+ throw IllegalArgumentException( OUString(), *this, 0 );
impl_initFromController_throw();
@@ -1073,7 +1073,7 @@ namespace frm
{
m_xCursor = m_xCursor.query( _rxForm );
if ( !m_xCursor.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
+ throw IllegalArgumentException( OUString(), *this, 0 );
impl_initFromForm_throw();
@@ -1135,7 +1135,7 @@ namespace frm
Reference< XMultiServiceFactory > xFactory( ::dbtools::getConnection( m_xCursor ), 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 );
OSL_ENSURE( m_xParser.is(), "FormOperations::impl_ensureInitializedParser_nothrow: factory did not create a parser for us!" );
}
}
@@ -1144,9 +1144,9 @@ namespace frm
{
if ( m_xLoadableForm.is() && m_xLoadableForm->isLoaded() )
{
- ::rtl::OUString sStatement;
- ::rtl::OUString sFilter;
- ::rtl::OUString sSort;
+ OUString sStatement;
+ OUString sFilter;
+ OUString sSort;
m_xCursorProperties->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= sStatement;
m_xCursorProperties->getPropertyValue( PROPERTY_FILTER ) >>= sFilter;
@@ -1233,7 +1233,7 @@ namespace frm
namespace
{
template < typename TYPE >
- TYPE lcl_safeGetPropertyValue_throw( const Reference< XPropertySet >& _rxProperties, const ::rtl::OUString& _rPropertyName, TYPE _Default )
+ TYPE lcl_safeGetPropertyValue_throw( const Reference< XPropertySet >& _rxProperties, const OUString& _rPropertyName, TYPE _Default )
{
TYPE value( _Default );
OSL_PRECOND( _rxProperties.is(), "FormOperations::<foo>: no cursor (already disposed?)!" );
@@ -1480,11 +1480,11 @@ namespace frm
if ( !xBoundField.is() )
return;
- ::rtl::OUString sOriginalSort;
+ OUString sOriginalSort;
m_xCursorProperties->getPropertyValue( PROPERTY_SORT ) >>= sOriginalSort;
// automatic sort by field is expected to always resets the previous sort order
- m_xParser->setOrder( ::rtl::OUString() );
+ m_xParser->setOrder( OUString() );
impl_appendOrderByColumn_throw aAction(this, xBoundField, _bUp);
impl_doActionInSQLContext_throw(aAction, RID_STR_COULD_NOT_SET_ORDER );
@@ -1520,7 +1520,7 @@ namespace frm
catch( const SQLException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
}
}
@@ -1543,14 +1543,14 @@ namespace frm
if ( !xBoundField.is() )
return;
- ::rtl::OUString sOriginalFilter;
+ OUString sOriginalFilter;
m_xCursorProperties->getPropertyValue( PROPERTY_FILTER ) >>= sOriginalFilter;
sal_Bool bApplied = sal_True;
m_xCursorProperties->getPropertyValue( PROPERTY_APPLYFILTER ) >>= bApplied;
// if we have a filter, but it's not applied, then we have to overwrite it, else append one
if ( !bApplied )
- m_xParser->setFilter( ::rtl::OUString() );
+ m_xParser->setFilter( OUString() );
impl_appendFilterByColumn_throw aAction(this, xBoundField);
impl_doActionInSQLContext_throw( aAction, RID_STR_COULD_NOT_SET_FILTER );
@@ -1589,7 +1589,7 @@ namespace frm
catch( const SQLException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
}
}
@@ -1633,7 +1633,7 @@ namespace frm
catch( const SQLException& ) { throw; }
catch( const Exception& )
{
- throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
+ throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
}
}
@@ -1653,14 +1653,14 @@ namespace frm
throw;
SQLExceptionInfo aInfo( ::cppu::getCaughtException() );
- ::rtl::OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) );
+ OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) );
aInfo.prepend( sAdditionalError );
aInfo.doThrow();
}
catch( const RuntimeException& ) { throw; }
catch( const Exception& )
{
- ::rtl::OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) );
+ OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) );
throw WrappedTargetException( sAdditionalError, *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
}
}
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 96853489bdb8..a518c3d31191 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -82,8 +82,8 @@ namespace frm
FormOperations( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _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::lang::XMultiServiceFactory >&);
@@ -113,9 +113,9 @@ namespace frm
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);
// XFormOperations
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getCursor() throw (::com::sun::star::uno::RuntimeException);
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 16a26e7492dc..d0ef82b6aa58 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -180,29 +180,29 @@ namespace frm
}
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException )
+ OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException )
{
return getImplementationName_Static();
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException )
+ Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException )
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------
- ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static()
+ OUString SAL_CALL ONavigationBarControl::getImplementationName_Static()
{
- return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarControl" );
+ return OUString( "com.sun.star.comp.form.ONavigationBarControl" );
}
//------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static()
+ Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices( 2 );
- aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" );
- aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" );
+ Sequence< OUString > aServices( 2 );
+ aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" );
+ aServices[ 1 ] = OUString( "com.sun.star.form.control.NavigationToolBar" );
return aServices;
}
@@ -297,7 +297,7 @@ namespace frm
}
//------------------------------------------------------------------
- void SAL_CALL ONavigationBarPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException )
+ void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -377,7 +377,7 @@ namespace frm
}
//------------------------------------------------------------------
- Any SAL_CALL ONavigationBarPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException )
+ Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -450,7 +450,7 @@ namespace frm
}
else if ( _nFeatureId == FormFeature::MoveAbsolute )
{
- pNavBar->setFeatureText( _nFeatureId, rtl::OUString::valueOf(getIntegerState(_nFeatureId)) );
+ pNavBar->setFeatureText( _nFeatureId, OUString::valueOf(getIntegerState(_nFeatureId)) );
}
}
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 78af8e4d7019..5639018b696e 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -57,8 +57,8 @@ namespace frm
public:
// XServiceInfo - static version
- 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::lang::XMultiServiceFactory >& _rxFactory );
protected:
@@ -70,8 +70,8 @@ namespace frm
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 >& _rParent ) 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);
// XTypeProvider
DECLARE_XTYPEPROVIDER()
@@ -126,8 +126,8 @@ namespace frm
void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException );
// XVclWindowPeer
- void SAL_CALL setProperty( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException );
- ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& _rPropertyName ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException );
+ ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) 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/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 2d102247b080..4820154e5968 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -57,13 +57,13 @@ namespace frm
static String getLabelString( sal_uInt16 _nResId )
{
- String sLabel = rtl::OUString( " " );
+ String sLabel = OUString( " " );
sLabel += String( FRM_RES_STRING( _nResId ) );
- sLabel += rtl::OUString( " " );
+ sLabel += OUString( " " );
return sLabel;
}
- ::rtl::OUString lcl_getCommandURL( const sal_Int16 _nFormFeature )
+ OUString lcl_getCommandURL( const sal_Int16 _nFormFeature )
{
const sal_Char* pAsciiCommandName = NULL;
switch ( _nFormFeature )
@@ -89,10 +89,10 @@ namespace frm
case FormFeature::RemoveFilterAndSort : pAsciiCommandName = "RemoveFilterSort"; break;
}
if ( pAsciiCommandName != NULL )
- return ::rtl::OUString( ".uno:" ) + ::rtl::OUString::createFromAscii( pAsciiCommandName );
+ return OUString( ".uno:" ) + OUString::createFromAscii( pAsciiCommandName );
OSL_FAIL( "lcl_getCommandURL: unknown FormFeature!" );
- return ::rtl::OUString();
+ return OUString();
}
}
@@ -230,7 +230,7 @@ namespace frm
}
//---------------------------------------------------------------------
- void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const ::rtl::OUString& _rText )
+ void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const OUString& _rText )
{
DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
"NavigationToolBar::checkFeature: invalid id!" );
@@ -299,7 +299,7 @@ namespace frm
if ( !isArtificialItem( pSupportedFeatures->nId ) )
{
- ::rtl::OUString sCommandURL( lcl_getCommandURL( pSupportedFeatures->nId ) );
+ OUString sCommandURL( lcl_getCommandURL( pSupportedFeatures->nId ) );
m_pToolbar->SetItemCommand( pSupportedFeatures->nId, sCommandURL );
if ( m_pDescriptionProvider )
m_pToolbar->SetQuickHelpText( pSupportedFeatures->nId, m_pDescriptionProvider->getCommandDescription( sCommandURL ) );
@@ -634,11 +634,11 @@ namespace frm
break;
case FormFeature::MoveAbsolute:
- sItemText = rtl::OUString( "12345678" );
+ sItemText = OUString( "12345678" );
break;
case FormFeature::TotalRecords:
- sItemText = rtl::OUString( "123456" );
+ sItemText = OUString( "123456" );
break;
}
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index ee6a77b97351..e9f91f05e977 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -94,7 +94,7 @@ namespace frm
void checkFeature( sal_Int16 _nFeatureId, bool _bEnabled );
/// sets the text of a given feature
- void setFeatureText( sal_Int16 _nFeatureId, const ::rtl::OUString& _rText );
+ void setFeatureText( sal_Int16 _nFeatureId, const OUString& _rText );
/** retrieves the current image size
*/
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index 7bcb059976ef..bd683100b086 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -40,7 +40,7 @@ template<class T>
class NameContainer : public NameContainer_t
{
protected:
- typedef std::map<rtl::OUString,T> map_t;
+ typedef std::map<OUString,T> map_t;
map_t maItems;
@@ -49,38 +49,38 @@ protected:
return ! maItems.empty();
}
- typename map_t::const_iterator findItem( const rtl::OUString& rName )
+ typename map_t::const_iterator findItem( const OUString& rName )
{
return maItems.find( rName );
}
- bool hasItem( const rtl::OUString& rName )
+ bool hasItem( const OUString& rName )
{
return findItem( rName ) != maItems.end();
}
- T getItem( const rtl::OUString& rName )
+ T getItem( const OUString& rName )
{
OSL_ENSURE( hasItem( rName ), "can't get non-existant item" );
return maItems[ rName ];
}
- void replace( const rtl::OUString& rName,
+ void replace( const OUString& rName,
const T& aElement )
{
OSL_ENSURE( hasItem( rName ), "unknown item" );
maItems[ rName ] = aElement;
}
- void insert( const rtl::OUString& rName,
+ void insert( const OUString& rName,
const T& aElement )
{
OSL_ENSURE( ! hasItem( rName ), "item already in set" );
maItems[ rName ] = aElement;
}
- void remove( const rtl::OUString& rName )
+ void remove( const OUString& rName )
{
OSL_ENSURE( hasItem( rName ), "item not in set" );
maItems.erase( rName );
@@ -114,7 +114,7 @@ public:
//
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 )
@@ -126,12 +126,12 @@ public:
return com::sun::star::uno::makeAny( aIter->second );
}
- 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 )
{
- com::sun::star::uno::Sequence<rtl::OUString> aSequence( maItems.size() );
+ com::sun::star::uno::Sequence<OUString> aSequence( maItems.size() );
typename map_t::const_iterator aIter = maItems.begin();
- rtl::OUString* pStrings = aSequence.getArray();
+ OUString* pStrings = aSequence.getArray();
while( aIter != maItems.end() )
{
*pStrings = aIter->first;
@@ -144,7 +144,7 @@ public:
}
virtual sal_Bool SAL_CALL hasByName(
- const rtl::OUString& rName )
+ const OUString& rName )
throw( com::sun::star::uno::RuntimeException )
{
return hasItem( rName );
@@ -156,7 +156,7 @@ public:
//
virtual void SAL_CALL replaceByName(
- const rtl::OUString& rName,
+ const OUString& rName,
const com::sun::star::uno::Any& aElement )
throw( com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::NoSuchElementException,
@@ -179,7 +179,7 @@ public:
//
virtual void SAL_CALL insertByName(
- const rtl::OUString& rName,
+ const OUString& rName,
const com::sun::star::uno::Any& aElement )
throw( com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::ElementExistException,
@@ -197,7 +197,7 @@ public:
}
virtual void SAL_CALL removeByName(
- const rtl::OUString& rName )
+ const OUString& rName )
throw( com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index b9db8ac9a8d7..99222b267f7e 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -58,8 +58,6 @@
using namespace com::sun::star::xml::xpath;
using namespace com::sun::star::xml::dom::events;
-using rtl::OUString;
-using rtl::OUStringBuffer;
using std::vector;
using xforms::Binding;
using xforms::MIP;
@@ -843,7 +841,7 @@ bool Binding::isValid_DataType()
: true;
}
-rtl::OUString Binding::explainInvalid_DataType()
+OUString Binding::explainInvalid_DataType()
{
Reference<XDataType> xDataType = getDataType();
return xDataType.is()
@@ -1065,7 +1063,7 @@ Binding::Any_t Binding::getValue( const Type_t& rType )
// return string value (if present; else return empty Any)
Binding::Any_t result = Any();
if(maBindingExpression.hasValue()) {
- rtl::OUString pathExpr(maBindingExpression.getString());
+ OUString pathExpr(maBindingExpression.getString());
Convert &rConvert = Convert::get();
result = rConvert.toAny(pathExpr,rType);
}
@@ -1213,7 +1211,7 @@ sal_Bool Binding::isValid( const Any_t& )
return isValid();
}
-rtl::OUString Binding::explainInvalid(
+OUString Binding::explainInvalid(
const Any_t& /*Value*/ )
throw( RuntimeException )
{
@@ -1379,13 +1377,13 @@ void Binding::removeModifyListener(
-rtl::OUString Binding::getName()
+OUString Binding::getName()
throw( RuntimeException )
{
return getBindingID();
}
-void SAL_CALL Binding::setName( const rtl::OUString& rName )
+void SAL_CALL Binding::setName( const OUString& rName )
throw( RuntimeException )
{
// use the XPropertySet methods, so the change in the name is notified to the
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 52e5cca4f2aa..7328bf3e8bad 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -102,7 +102,7 @@ public:
typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNodeList> XNodeList_t;
typedef com::sun::star::uno::Reference<com::sun::star::util::XCloneable> XCloneable_t;
typedef com::sun::star::uno::Sequence<sal_Int8> IntSequence_t;
- typedef com::sun::star::uno::Sequence<rtl::OUString> StringSequence_t;
+ typedef com::sun::star::uno::Sequence<OUString> StringSequence_t;
typedef std::vector<MIP> MIPs_t;
typedef std::vector<XNode_t> XNodes_t;
@@ -114,7 +114,7 @@ private:
Model_t mxModel;
/// binding-ID. A document-wide unique ID for this binding element.
- rtl::OUString msBindingID;
+ OUString msBindingID;
/// an XPath-expression to be instantiated on the data instance
PathExpression maBindingExpression;
@@ -132,7 +132,7 @@ private:
BoolExpression maConstraint;
/// user-readable explanation of the constraint
- rtl::OUString msExplainConstraint;
+ OUString msExplainConstraint;
/// an XPath-expression to calculate values
ComputedExpression maCalculate;
@@ -141,7 +141,7 @@ private:
XNameContainer_t mxNamespaces;
/// a type name
- rtl::OUString msTypeName;
+ OUString msTypeName;
/// modify listeners
ModifyListeners_t maModifyListeners;
@@ -183,33 +183,33 @@ public:
void _setModel( const Model_t& ); /// set XForms model (only called by Model)
- rtl::OUString getModelID() const; /// get ID of XForms model
+ OUString getModelID() const; /// get ID of XForms model
- rtl::OUString getBindingID() const; /// get ID for this binding
- void setBindingID( const rtl::OUString& ); /// set ID for this binding
+ OUString getBindingID() const; /// get ID for this binding
+ void setBindingID( const OUString& ); /// set ID for this binding
- rtl::OUString getBindingExpression() const; /// get binding expression
- void setBindingExpression( const rtl::OUString& ); /// set binding exp.
+ OUString getBindingExpression() const; /// get binding expression
+ void setBindingExpression( const OUString& ); /// set binding exp.
// MIPs (model item properties)
- rtl::OUString getReadonlyExpression() const; /// get read-only MIP
- void setReadonlyExpression( const rtl::OUString& ); /// set read-only MIP
+ OUString getReadonlyExpression() const; /// get read-only MIP
+ void setReadonlyExpression( const OUString& ); /// set read-only MIP
- rtl::OUString getRelevantExpression() const; /// get relevant MIP
- void setRelevantExpression( const rtl::OUString& ); /// set relevant MIP
+ OUString getRelevantExpression() const; /// get relevant MIP
+ void setRelevantExpression( const OUString& ); /// set relevant MIP
- rtl::OUString getRequiredExpression() const; /// get required MIP
- void setRequiredExpression( const rtl::OUString& ); /// set required MIP
+ OUString getRequiredExpression() const; /// get required MIP
+ void setRequiredExpression( const OUString& ); /// set required MIP
- rtl::OUString getConstraintExpression() const; /// get constraint MIP
- void setConstraintExpression( const rtl::OUString& );/// set constraint MIP
+ OUString getConstraintExpression() const; /// get constraint MIP
+ void setConstraintExpression( const OUString& );/// set constraint MIP
- rtl::OUString getCalculateExpression() const; /// get calculate MIP
- void setCalculateExpression( const rtl::OUString& ); /// set calculate MIP
+ OUString getCalculateExpression() const; /// get calculate MIP
+ void setCalculateExpression( const OUString& ); /// set calculate MIP
- rtl::OUString getType() const; /// get type name MIP (static)
- void setType( const rtl::OUString& ); /// set type name MIP (static)
+ OUString getType() const; /// get type name MIP (static)
+ void setType( const OUString& ); /// set type name MIP (static)
// a binding expression can only be interpreted with respect to
// suitable namespace declarations. We collect those in the model and in a binding.
@@ -271,7 +271,7 @@ public:
bool isUseful();
/// explain why binding is invalid
- rtl::OUString explainInvalid();
+ OUString explainInvalid();
// the ID for XUnoTunnel calls
@@ -355,7 +355,7 @@ private:
bool isValid_DataType();
/// explain validity of binding with respect to the given data type
- rtl::OUString explainInvalid_DataType();
+ OUString explainInvalid_DataType();
/// 'clear' this binding - remove all listeners, etc.
void clear();
@@ -411,7 +411,7 @@ public:
virtual sal_Int32 SAL_CALL getListEntryCount()
throw( RuntimeException_t );
- virtual rtl::OUString SAL_CALL getListEntry( sal_Int32 nPosition )
+ virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition )
throw( IndexOutOfBoundsException_t,
RuntimeException_t );
@@ -436,7 +436,7 @@ public:
const Any_t& )
throw( RuntimeException_t );
- virtual rtl::OUString SAL_CALL explainInvalid(
+ virtual OUString SAL_CALL explainInvalid(
const Any_t& )
throw( RuntimeException_t );
@@ -476,10 +476,10 @@ public:
public:
- virtual rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw( RuntimeException_t );
- virtual void SAL_CALL setName( const rtl::OUString& )
+ virtual void SAL_CALL setName( const OUString& )
throw( RuntimeException_t );
diff --git a/forms/source/xforms/boolexpression.cxx b/forms/source/xforms/boolexpression.cxx
index 33110e26f440..01fd522d7170 100644
--- a/forms/source/xforms/boolexpression.cxx
+++ b/forms/source/xforms/boolexpression.cxx
@@ -38,7 +38,7 @@ BoolExpression::~BoolExpression()
{
}
-void BoolExpression::setExpression( const rtl::OUString& rExpression )
+void BoolExpression::setExpression( const OUString& rExpression )
{
ComputedExpression::setExpression( rExpression );
mbIsSimple = _checkExpression( " *(true)|(false) *\\( *\\) *" );
diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx
index f9bff076a5ae..ab03dfac4639 100644
--- a/forms/source/xforms/boolexpression.hxx
+++ b/forms/source/xforms/boolexpression.hxx
@@ -38,7 +38,7 @@ public:
/// set the expression string
/// (overridden for new definition of a simple expression)
- void setExpression( const rtl::OUString& rExpression );
+ void setExpression( const OUString& rExpression );
};
} // namespace xforms
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index 004521e72b93..184d91c61d96 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -38,7 +38,6 @@
#include <unotools/textsearch.hxx>
#include <comphelper/processfactory.hxx>
-using rtl::OUString;
using com::sun::star::beans::NamedValue;
using namespace com::sun::star::uno;
using com::sun::star::lang::XInitialization;
@@ -175,7 +174,7 @@ Reference<XXPathObject> ComputedExpression::getXPath() const
return mxResult;
}
-OUString ComputedExpression::getString( const rtl::OUString& rDefault ) const
+OUString ComputedExpression::getString( const OUString& rDefault ) const
{
return mxResult.is() ? mxResult->getString() : rDefault;
}
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 8f4783069955..876ef3c25fb5 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -49,7 +49,7 @@ namespace xforms
class ComputedExpression
{
/// the expression string
- rtl::OUString msExpression;
+ OUString msExpression;
/// is msExpression empty?
bool mbIsEmpty;
@@ -66,14 +66,14 @@ protected:
bool _checkExpression( const sal_Char* pExpression ) const;
/// allow manipulation of the expression before it is evaluated
- const rtl::OUString _getExpressionForEvaluation() const;
+ const OUString _getExpressionForEvaluation() const;
/// obtain a (suitable) XPathAPI implementation
com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathAPI> _getXPathAPI(const xforms::EvaluationContext& aContext);
/// evaluate the expression relative to the content node.
bool _evaluate( const xforms::EvaluationContext& rContext,
- const rtl::OUString& sExpression );
+ const OUString& sExpression );
public:
@@ -82,10 +82,10 @@ public:
/// get the expression string
- rtl::OUString getExpression() const;
+ OUString getExpression() const;
/// set a new expression string
- void setExpression( const rtl::OUString& rExpression );
+ void setExpression( const OUString& rExpression );
/// get the namespaces that are used to interpret the expression string
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> getNamespaces() const;
@@ -119,7 +119,7 @@ public:
// must call evaluate to ensure current results.)
com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathObject> getXPath() const;
bool getBool( bool bDefault = false ) const;
- rtl::OUString getString( const rtl::OUString& rDefault = rtl::OUString() ) const;
+ OUString getString( const OUString& rDefault = OUString() ) const;
};
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 2cf40983b873..b440f4b3705f 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -35,8 +35,6 @@
#include <com/sun/star/util/Time.hpp>
using xforms::Convert;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using com::sun::star::uno::Any;
using com::sun::star::uno::makeAny;
using com::sun::star::util::Time;
@@ -61,13 +59,13 @@ namespace
struct StringToken
{
private:
- ::rtl::OUString m_sString;
+ OUString m_sString;
sal_Int32 m_nTokenStart;
sal_Int32 m_nTokenEnd;
public:
StringToken() : m_sString(), m_nTokenStart( 0 ), m_nTokenEnd( 0 ) { }
- StringToken( const ::rtl::OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd );
+ StringToken( const OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd );
StringToken( const StringToken& );
StringToken& operator=( const StringToken& );
@@ -80,7 +78,7 @@ namespace
};
// ------------------------------------------------------------------------
- StringToken::StringToken( const ::rtl::OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd )
+ StringToken::StringToken( const OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd )
:m_sString( _rString )
,m_nTokenStart( _nTokenStart )
,m_nTokenEnd( _nTokenEnd )
@@ -134,7 +132,7 @@ namespace
class StringTokenizer
{
private:
- ::rtl::OUString m_sString;
+ OUString m_sString;
const sal_Unicode m_nTokenSeparator;
sal_Int32 m_nTokenStart;
@@ -146,7 +144,7 @@ namespace
This may make sense if you want to apply <type>StringToken</type>
methods to a whole string.
*/
- StringTokenizer( const ::rtl::OUString& _rString, sal_Unicode _nTokenSeparator = ';' );
+ StringTokenizer( const OUString& _rString, sal_Unicode _nTokenSeparator = ';' );
/// resets the tokenizer to the beginning of the string
void reset();
@@ -160,7 +158,7 @@ namespace
};
// ------------------------------------------------------------------------
- StringTokenizer::StringTokenizer( const ::rtl::OUString& _rString, sal_Unicode _nTokenSeparator )
+ StringTokenizer::StringTokenizer( const OUString& _rString, sal_Unicode _nTokenSeparator )
:m_sString( _rString )
,m_nTokenSeparator( _nTokenSeparator )
{
@@ -241,7 +239,7 @@ namespace
}
// ------------------------------------------------------------------------
- void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, ::rtl::OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits )
+ void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits )
{
if ( ( _nMinDigits >= 4 ) && ( _nValue < 1000 ) )
_rBuffer.append( (sal_Unicode)'0' );
@@ -256,7 +254,7 @@ namespace
OUString lcl_toXSD_UNODate_typed( const UNODate& rDate )
{
- ::rtl::OUStringBuffer sInfo;
+ OUStringBuffer sInfo;
lcl_appendInt32ToBuffer( rDate.Year, sInfo, 4 );
sInfo.appendAscii( "-" );
lcl_appendInt32ToBuffer( rDate.Month, sInfo, 2 );
@@ -333,7 +331,7 @@ namespace
OUString lcl_toXSD_UNOTime_typed( const UNOTime& rTime )
{
- ::rtl::OUStringBuffer sInfo;
+ OUStringBuffer sInfo;
lcl_appendInt32ToBuffer( rTime.Hours, sInfo, 2 );
sInfo.appendAscii( ":" );
lcl_appendInt32ToBuffer( rTime.Minutes, sInfo, 2 );
@@ -363,7 +361,7 @@ namespace
UNOTime aTime( 0, 0, 0, 0 );
- ::rtl::OUString sString( rString );
+ OUString sString( rString );
// see if there's a decimal separator for the seconds,
// and if so, handle it separately
sal_Int32 nDecimalSepPos = rString.indexOf( '.' );
@@ -373,7 +371,7 @@ namespace
if ( nDecimalSepPos != -1 )
{
// handle fractional seconds
- ::rtl::OUString sFractional = sString.copy( nDecimalSepPos + 1 );
+ OUString sFractional = sString.copy( nDecimalSepPos + 1 );
if ( sFractional.getLength() > 2 )
// our precision is HundrethSeconds - it's all a css.util.Time can hold
sFractional = sFractional.copy( 0, 2 );
@@ -458,12 +456,12 @@ namespace
OSL_VERIFY( rAny >>= aDateTime );
UNODate aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
- ::rtl::OUString sDate = lcl_toXSD_UNODate_typed( aDate );
+ OUString sDate = lcl_toXSD_UNODate_typed( aDate );
UNOTime aTime( aDateTime.HundredthSeconds, aDateTime.Seconds, aDateTime.Minutes, aDateTime.Hours );
- ::rtl::OUString sTime = lcl_toXSD_UNOTime_typed( aTime );
+ OUString sTime = lcl_toXSD_UNOTime_typed( aTime );
- ::rtl::OUStringBuffer sInfo;
+ OUStringBuffer sInfo;
sInfo.append( sDate );
sInfo.append( (sal_Unicode) 'T' );
sInfo.append( sTime );
@@ -534,13 +532,13 @@ Convert::Types_t Convert::getTypes()
return aTypes;
}
-rtl::OUString Convert::toXSD( const Any_t& rAny )
+OUString Convert::toXSD( const Any_t& rAny )
{
Map_t::iterator aIter = maMap.find( rAny.getValueType() );
return aIter != maMap.end() ? aIter->second.first( rAny ) : OUString();
}
-Convert::Any_t Convert::toAny( const rtl::OUString& rValue,
+Convert::Any_t Convert::toAny( const OUString& rValue,
const Type_t& rType )
{
Map_t::iterator aIter = maMap.find( rType );
@@ -548,9 +546,9 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue,
}
//------------------------------------------------------------------------
-::rtl::OUString Convert::convertWhitespace( const ::rtl::OUString& _rString, sal_Int16 _nWhitespaceTreatment )
+OUString Convert::convertWhitespace( const OUString& _rString, sal_Int16 _nWhitespaceTreatment )
{
- ::rtl::OUString sConverted;
+ OUString sConverted;
switch( _nWhitespaceTreatment )
{
default:
@@ -570,7 +568,7 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue,
}
//------------------------------------------------------------------------
-::rtl::OUString Convert::replaceWhitespace( const ::rtl::OUString& _rString )
+OUString Convert::replaceWhitespace( const OUString& _rString )
{
OUStringBuffer aBuffer( _rString );
sal_Int32 nLength = aBuffer.getLength();
@@ -587,7 +585,7 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue,
}
//------------------------------------------------------------------------
-::rtl::OUString Convert::collapseWhitespace( const ::rtl::OUString& _rString )
+OUString Convert::collapseWhitespace( const OUString& _rString )
{
sal_Int32 nLength = _rString.getLength();
OUStringBuffer aBuffer( nLength );
diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx
index 83244988f871..098066327ebf 100644
--- a/forms/source/xforms/convert.hxx
+++ b/forms/source/xforms/convert.hxx
@@ -47,8 +47,8 @@ class Convert
typedef com::sun::star::uno::Any Any_t;
// hold conversion objects
- typedef rtl::OUString (*fn_toXSD)( const Any_t& );
- typedef Any_t (*fn_toAny)( const rtl::OUString& );
+ typedef OUString (*fn_toXSD)( const Any_t& );
+ typedef Any_t (*fn_toAny)( const OUString& );
typedef std::pair<fn_toXSD,fn_toAny> Convert_t;
typedef std::map<Type_t,Convert_t,TypeLess> Map_t;
Map_t maMap;
@@ -68,10 +68,10 @@ public:
Types_t getTypes();
/// convert any to XML representation
- rtl::OUString toXSD( const Any_t& rAny );
+ OUString toXSD( const Any_t& rAny );
/// convert XML representation to Any of given type
- Any_t toAny( const rtl::OUString&, const Type_t& );
+ Any_t toAny( const OUString&, const Type_t& );
/** translates the whitespaces in a given string, according
to a given <type scope="com::sun::star::xsd">WhiteSpaceTreatment</type>.
@@ -84,19 +84,19 @@ public:
@return
the converted string
*/
- static ::rtl::OUString convertWhitespace(
- const ::rtl::OUString& _rString,
+ static OUString convertWhitespace(
+ const OUString& _rString,
sal_Int16 _nWhitespaceTreatment
);
/** replace all occurrences 0x08, 0x0A, 0x0D with 0x20
*/
- static ::rtl::OUString replaceWhitespace( const ::rtl::OUString& _rString );
+ static OUString replaceWhitespace( const OUString& _rString );
/** replace all sequences of 0x08, 0x0A, 0x0D, 0x20 with a single 0x20.
also strip leading/trailing whitespace.
*/
- static ::rtl::OUString collapseWhitespace( const ::rtl::OUString& _rString );
+ static OUString collapseWhitespace( const OUString& _rString );
};
} // namespace xforms
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index c209a7f92c6a..1d2c029808bb 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -61,7 +61,7 @@ namespace xforms
DBG_CTOR( ODataTypeRepository, NULL );
// insert some basic types
- ::rtl::OUString sName( FRM_RES_STRING( RID_STR_DATATYPE_STRING ) );
+ OUString sName( FRM_RES_STRING( RID_STR_DATATYPE_STRING ) );
m_aRepository[ sName ] = new OStringType( sName, ::com::sun::star::xsd::DataTypeClass::STRING );
sName = FRM_RES_STRING( RID_STR_DATATYPE_URL );
@@ -105,11 +105,11 @@ namespace xforms
}
//--------------------------------------------------------------------
- ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const ::rtl::OUString& _rName, bool _bAllowMiss ) SAL_THROW( ( NoSuchElementException ) )
+ ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const OUString& _rName, bool _bAllowMiss ) SAL_THROW( ( NoSuchElementException ) )
{
Repository::iterator aTypePos = m_aRepository.find( _rName );
if ( aTypePos == m_aRepository.end() && !_bAllowMiss )
- throw NoSuchElementException( ::rtl::OUString(), *this );
+ throw NoSuchElementException( OUString(), *this );
return aTypePos;
}
@@ -129,19 +129,19 @@ namespace xforms
}
if ( !xReturn.is() )
- throw NoSuchElementException( ::rtl::OUString(), *this );
+ throw NoSuchElementException( OUString(), *this );
return xReturn;
}
//--------------------------------------------------------------------
- Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const ::rtl::OUString& sourceName, const ::rtl::OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException)
+ Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
Repository::iterator aTypePos = implLocate( newName, true );
if ( aTypePos != m_aRepository.end() )
- throw ElementExistException( ::rtl::OUString(), *this );
+ throw ElementExistException( OUString(), *this );
aTypePos = implLocate( sourceName );
OXSDDataType* pClone = aTypePos->second->clone( newName );
@@ -151,20 +151,20 @@ namespace xforms
}
//--------------------------------------------------------------------
- void SAL_CALL ODataTypeRepository::revokeDataType( const ::rtl::OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException)
+ void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
Repository::iterator aTypePos = implLocate( typeName );
if ( aTypePos->second->getIsBasic() )
- throw VetoException( ::rtl::OUString( "This is a built-in type and cannot be removed." ), *this );
+ throw VetoException( OUString( "This is a built-in type and cannot be removed." ), *this );
// TODO: localize this error message
m_aRepository.erase( aTypePos );
}
//--------------------------------------------------------------------
- Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const ::rtl::OUString& typeName ) throw (NoSuchElementException, RuntimeException)
+ Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
return implLocate( typeName, false )->second.get();
@@ -178,17 +178,17 @@ namespace xforms
}
//--------------------------------------------------------------------
- Any SAL_CALL ODataTypeRepository::getByName( const ::rtl::OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
+ Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
{
return makeAny( getDataType( aName ) );
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- Sequence< ::rtl::OUString > aNames( m_aRepository.size() );
+ Sequence< OUString > aNames( m_aRepository.size() );
::std::transform(
m_aRepository.begin(),
m_aRepository.end(),
@@ -199,7 +199,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- sal_Bool SAL_CALL ODataTypeRepository::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException)
+ sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
return m_aRepository.find( aName ) != m_aRepository.end();
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index 7859a014ee07..dd144539ce6a 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -41,7 +41,7 @@ namespace xforms
{
private:
typedef ::rtl::Reference< OXSDDataType > DataType;
- typedef ::std::map< ::rtl::OUString, DataType > Repository;
+ typedef ::std::map< OUString, DataType > Repository;
::osl::Mutex m_aMutex;
Repository m_aRepository;
@@ -54,17 +54,17 @@ namespace xforms
// XDataTypeRepository
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const ::rtl::OUString& sourceName, const ::rtl::OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokeDataType( const ::rtl::OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const ::rtl::OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
// XEnumerationAccess (base of XDataTypeRepository)
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException);
// XNameAccess (base of XDataTypeRepository)
- 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 XEnumerationAccess and XNameAccess)
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException);
@@ -77,7 +77,7 @@ namespace xforms
private:
/** locates the type with the given name in our repository, or throws an exception if there is no such type
*/
- Repository::iterator implLocate( const ::rtl::OUString& _rName, bool _bAllowMiss = false ) SAL_THROW( ( ::com::sun::star::container::NoSuchElementException ) );
+ Repository::iterator implLocate( const OUString& _rName, bool _bAllowMiss = false ) SAL_THROW( ( ::com::sun::star::container::NoSuchElementException ) );
};
//........................................................................
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 3b9f0414bc7e..e1fcdebecf24 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -60,7 +60,7 @@ namespace xforms
//= OXSDDataType
//====================================================================
//--------------------------------------------------------------------
- OXSDDataType::OXSDDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+ OXSDDataType::OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass )
:OXSDDataType_PBase( m_aBHelper )
,m_bIsBasic( sal_True )
,m_nTypeClass( _nTypeClass )
@@ -96,7 +96,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- OXSDDataType* OXSDDataType::clone( const ::rtl::OUString& _rNewName ) const
+ OXSDDataType* OXSDDataType::clone( const OUString& _rNewName ) const
{
OXSDDataType* pClone = createClone( _rNewName );
pClone->initializeClone( *this );
@@ -114,26 +114,26 @@ namespace xforms
OSL_POSTCOND( member == value, "OXSDDataType::setFoo: inconsistency!" );
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException)
+ OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException)
{
return m_sName;
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::setName( const ::rtl::OUString& aName ) throw (RuntimeException, VetoException)
+ void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException)
{
// TODO: check the name for conflicts in the repository
SET_PROPERTY( NAME, aName, m_sName );
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException)
+ OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException)
{
return m_sPattern;
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::setPattern( const ::rtl::OUString& _pattern ) throw (RuntimeException)
+ void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException)
{
SET_PROPERTY( XSD_PATTERN, _pattern, m_sPattern );
}
@@ -164,40 +164,40 @@ namespace xforms
}
//--------------------------------------------------------------------
- sal_Bool OXSDDataType::validate( const ::rtl::OUString& sValue ) throw( RuntimeException )
+ sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException )
{
return ( _validate( sValue ) == 0 );
}
//--------------------------------------------------------------------
- ::rtl::OUString OXSDDataType::explainInvalid( const ::rtl::OUString& sValue ) throw( RuntimeException )
+ OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException )
{
// get reason
sal_uInt16 nReason = _validate( sValue );
// get resource and return localized string
return ( nReason == 0 )
- ? ::rtl::OUString()
+ ? OUString()
: getResource( nReason, sValue,
_explainInvalid( nReason ) );
}
//--------------------------------------------------------------------
- ::rtl::OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason )
+ OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason )
{
if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == nReason )
{
OSL_ENSURE( !m_sPattern.isEmpty(), "OXSDDataType::_explainInvalid: how can this error occur without a regular expression?" );
return m_sPattern;
}
- return ::rtl::OUString();
+ return OUString();
}
//--------------------------------------------------------------------
namespace
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern )
+ static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern )
{
UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW
@@ -207,7 +207,7 @@ namespace xforms
}
SAL_WNODEPRECATED_DECLARATIONS_POP
- static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText )
+ static bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText )
{
UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW
@@ -225,7 +225,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- sal_uInt16 OXSDDataType::_validate( const ::rtl::OUString& _rValue )
+ sal_uInt16 OXSDDataType::_validate( const OUString& _rValue )
{
// care for the regular expression
if ( !m_sPattern.isEmpty() )
@@ -253,7 +253,7 @@ namespace xforms
return sal_False;
// sanity checks
- ::rtl::OUString sErrorMessage;
+ OUString sErrorMessage;
if ( !checkPropertySanity( _nHandle, _rConvertedValue, sErrorMessage ) )
{
IllegalArgumentException aException;
@@ -274,11 +274,11 @@ namespace xforms
}
//--------------------------------------------------------------------
- bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::rtl::OUString& _rErrorMessage )
+ bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage )
{
if ( _nHandle == PROPERTY_ID_XSD_PATTERN )
{
- ::rtl::OUString sPattern;
+ OUString sPattern;
OSL_VERIFY( _rNewValue >>= sPattern );
UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() ); // UChar != sal_Unicode in MinGW
@@ -286,7 +286,7 @@ namespace xforms
RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus );
if ( U_FAILURE( nMatchStatus ) )
{
- _rErrorMessage = ::rtl::OUString( "This is no valid pattern." );
+ _rErrorMessage = OUString( "This is no valid pattern." );
return false;
}
}
@@ -294,37 +294,37 @@ namespace xforms
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
+ void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
OXSDDataType_PBase::setPropertyValue( aPropertyName, aValue );
}
//--------------------------------------------------------------------
- Any SAL_CALL OXSDDataType::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+ Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
return OXSDDataType_PBase::getPropertyValue( PropertyName );
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+ void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OXSDDataType_PBase::addPropertyChangeListener( aPropertyName, xListener );
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+ void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OXSDDataType_PBase::removePropertyChangeListener( aPropertyName, aListener );
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+ void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OXSDDataType_PBase::addVetoableChangeListener( PropertyName, aListener );
}
//--------------------------------------------------------------------
- void SAL_CALL OXSDDataType::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+ void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener );
}
@@ -332,7 +332,7 @@ namespace xforms
//====================================================================
//= OValueLimitedType_Base
//====================================================================
- OValueLimitedType_Base::OValueLimitedType_Base( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+ OValueLimitedType_Base::OValueLimitedType_Base( const OUString& _rName, sal_Int16 _nTypeClass )
:OXSDDataType( _rName, _nTypeClass )
,m_fCachedMaxInclusive( 0 )
,m_fCachedMaxExclusive( 0 )
@@ -415,7 +415,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- bool OValueLimitedType_Base::_getValue( const ::rtl::OUString& rValue, double& fValue )
+ bool OValueLimitedType_Base::_getValue( const OUString& rValue, double& fValue )
{
// convert to double
rtl_math_ConversionStatus eStatus;
@@ -435,7 +435,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- sal_uInt16 OValueLimitedType_Base::_validate( const ::rtl::OUString& rValue )
+ sal_uInt16 OValueLimitedType_Base::_validate( const OUString& rValue )
{
sal_uInt16 nReason = OXSDDataType::_validate( rValue );
if( nReason == 0 )
@@ -460,9 +460,9 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason )
+ OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason )
{
- ::rtl::OUStringBuffer sInfo;
+ OUStringBuffer sInfo;
switch( nReason )
{
case 0:
@@ -501,7 +501,7 @@ namespace xforms
//= OStringType
//====================================================================
//--------------------------------------------------------------------
- OStringType::OStringType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+ OStringType::OStringType( const OUString& _rName, sal_Int16 _nTypeClass )
:OStringType_Base( _rName, _nTypeClass )
{
}
@@ -528,13 +528,13 @@ namespace xforms
}
//--------------------------------------------------------------------
- bool OStringType::checkPropertySanity( sal_Int32 _nHandle, const Any& _rNewValue, ::rtl::OUString& _rErrorMessage )
+ bool OStringType::checkPropertySanity( sal_Int32 _nHandle, const Any& _rNewValue, OUString& _rErrorMessage )
{
// let the base class do the conversion
if ( !OStringType_Base::checkPropertySanity( _nHandle, _rNewValue, _rErrorMessage ) )
return false;
- _rErrorMessage = ::rtl::OUString();
+ _rErrorMessage = OUString();
switch ( _nHandle )
{
case PROPERTY_ID_XSD_LENGTH:
@@ -544,7 +544,7 @@ namespace xforms
sal_Int32 nValue( 0 );
OSL_VERIFY( _rNewValue >>= nValue );
if ( nValue <= 0 )
- _rErrorMessage = ::rtl::OUString( "Length limits must denote positive integer values." );
+ _rErrorMessage = OUString( "Length limits must denote positive integer values." );
// TODO/eforms: localize the error message
}
break;
@@ -554,7 +554,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- sal_uInt16 OStringType::_validate( const ::rtl::OUString& rValue )
+ sal_uInt16 OStringType::_validate( const OUString& rValue )
{
// check regexp, whitespace etc. in parent class
sal_uInt16 nReason = OStringType_Base::_validate( rValue );
@@ -581,10 +581,10 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString OStringType::_explainInvalid( sal_uInt16 nReason )
+ OUString OStringType::_explainInvalid( sal_uInt16 nReason )
{
sal_Int32 nValue = 0;
- ::rtl::OUStringBuffer sInfo;
+ OUStringBuffer sInfo;
switch( nReason )
{
case 0:
@@ -617,7 +617,7 @@ namespace xforms
//= OBooleanType
//====================================================================
//--------------------------------------------------------------------
- OBooleanType::OBooleanType( const ::rtl::OUString& _rName )
+ OBooleanType::OBooleanType( const OUString& _rName )
:OBooleanType_Base( _rName, DataTypeClass::BOOLEAN )
{
}
@@ -631,7 +631,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- sal_uInt16 OBooleanType::_validate( const ::rtl::OUString& sValue )
+ sal_uInt16 OBooleanType::_validate( const OUString& sValue )
{
sal_uInt16 nInvalidityReason = OBooleanType_Base::_validate( sValue );
if ( nInvalidityReason )
@@ -642,16 +642,16 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString OBooleanType::_explainInvalid( sal_uInt16 nReason )
+ OUString OBooleanType::_explainInvalid( sal_uInt16 nReason )
{
- return ( nReason == 0 ) ? ::rtl::OUString() : getName();
+ return ( nReason == 0 ) ? OUString() : getName();
}
//====================================================================
//= ODecimalType
//====================================================================
//--------------------------------------------------------------------
- ODecimalType::ODecimalType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+ ODecimalType::ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass )
:ODecimalType_Base( _rName, _nTypeClass )
{
}
@@ -679,7 +679,7 @@ namespace xforms
// validate decimals and return code for which facets failed
// to be used by: ODecimalType::validate and ODecimalType::explainInvalid
- sal_uInt16 ODecimalType::_validate( const ::rtl::OUString& rValue )
+ sal_uInt16 ODecimalType::_validate( const OUString& rValue )
{
sal_Int16 nReason = ODecimalType_Base::_validate( rValue );
@@ -713,10 +713,10 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString ODecimalType::_explainInvalid( sal_uInt16 nReason )
+ OUString ODecimalType::_explainInvalid( sal_uInt16 nReason )
{
sal_Int32 nValue = 0;
- ::rtl::OUStringBuffer sInfo;
+ OUStringBuffer sInfo;
switch( nReason )
{
case RID_STR_XFORMS_VALUE_TOTAL_DIGITS:
@@ -737,11 +737,11 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const
+ OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const
{
double fValue( 0 );
normalizeValue( _rValue, fValue );
- return ::rtl::OUString::valueOf( fValue );
+ return OUString::valueOf( fValue );
}
//--------------------------------------------------------------------
@@ -754,7 +754,7 @@ namespace xforms
//=
//====================================================================
#define DEFAULT_IMPLEMNENT_SUBTYPE( classname, typeclass ) \
- classname::classname( const ::rtl::OUString& _rName ) \
+ classname::classname( const OUString& _rName ) \
:classname##_Base( _rName, DataTypeClass::typeclass ) \
{ \
} \
@@ -773,13 +773,13 @@ namespace xforms
DEFAULT_IMPLEMNENT_SUBTYPE( ODateType, DATE )
//--------------------------------------------------------------------
- sal_uInt16 ODateType::_validate( const ::rtl::OUString& _rValue )
+ sal_uInt16 ODateType::_validate( const OUString& _rValue )
{
return ODateType_Base::_validate( _rValue );
}
//--------------------------------------------------------------------
- bool ODateType::_getValue( const ::rtl::OUString& value, double& fValue )
+ bool ODateType::_getValue( const OUString& value, double& fValue )
{
Any aTypeValue = Convert::get().toAny( value, getCppuType() );
@@ -793,7 +793,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString ODateType::typedValueAsHumanReadableString( const Any& _rValue ) const
+ OUString ODateType::typedValueAsHumanReadableString( const Any& _rValue ) const
{
OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "ODateType::typedValueAsHumanReadableString: unexpected type" );
return Convert::get().toXSD( _rValue );
@@ -815,13 +815,13 @@ namespace xforms
DEFAULT_IMPLEMNENT_SUBTYPE( OTimeType, TIME )
//--------------------------------------------------------------------
- sal_uInt16 OTimeType::_validate( const ::rtl::OUString& _rValue )
+ sal_uInt16 OTimeType::_validate( const OUString& _rValue )
{
return OTimeType_Base::_validate( _rValue );
}
//--------------------------------------------------------------------
- bool OTimeType::_getValue( const ::rtl::OUString& value, double& fValue )
+ bool OTimeType::_getValue( const OUString& value, double& fValue )
{
Any aTypedValue = Convert::get().toAny( value, getCppuType() );
@@ -835,7 +835,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString OTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const
+ OUString OTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const
{
OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "OTimeType::typedValueAsHumanReadableString: unexpected type" );
return Convert::get().toXSD( _rValue );
@@ -857,7 +857,7 @@ namespace xforms
DEFAULT_IMPLEMNENT_SUBTYPE( ODateTimeType, DATETIME )
//--------------------------------------------------------------------
- sal_uInt16 ODateTimeType::_validate( const ::rtl::OUString& _rValue )
+ sal_uInt16 ODateTimeType::_validate( const OUString& _rValue )
{
return ODateTimeType_Base::_validate( _rValue );
}
@@ -882,7 +882,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- bool ODateTimeType::_getValue( const ::rtl::OUString& value, double& fValue )
+ bool ODateTimeType::_getValue( const OUString& value, double& fValue )
{
Any aTypedValue = Convert::get().toAny( value, getCppuType() );
@@ -895,10 +895,10 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString ODateTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const
+ OUString ODateTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const
{
OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "OTimeType::typedValueAsHumanReadableString: unexpected type" );
- ::rtl::OUString sString = Convert::get().toXSD( _rValue );
+ OUString sString = Convert::get().toXSD( _rValue );
// ISO 8601 notation has a "T" to separate between date and time. Our only concession
// to the "human readable" in the method name is to replace this T with a whitespace.
@@ -918,7 +918,7 @@ namespace xforms
//= OShortIntegerType
//====================================================================
//--------------------------------------------------------------------
- OShortIntegerType::OShortIntegerType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+ OShortIntegerType::OShortIntegerType( const OUString& _rName, sal_Int16 _nTypeClass )
:OShortIntegerType_Base( _rName, _nTypeClass )
{
}
@@ -932,7 +932,7 @@ namespace xforms
}
//--------------------------------------------------------------------
- bool OShortIntegerType::_getValue( const ::rtl::OUString& value, double& fValue )
+ bool OShortIntegerType::_getValue( const OUString& value, double& fValue )
{
fValue = (double)(sal_Int16)value.toInt32();
// TODO/eforms
@@ -948,11 +948,11 @@ namespace xforms
}
//--------------------------------------------------------------------
- ::rtl::OUString OShortIntegerType::typedValueAsHumanReadableString( const Any& _rValue ) const
+ OUString OShortIntegerType::typedValueAsHumanReadableString( const Any& _rValue ) const
{
sal_Int16 nValue( 0 );
OSL_VERIFY( _rValue >>= nValue );
- return ::rtl::OUString::valueOf( (sal_Int32)nValue );
+ return OUString::valueOf( (sal_Int32)nValue );
}
//--------------------------------------------------------------------
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 045eb8afa0aa..910a64fbf2ff 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -56,8 +56,8 @@ namespace xforms
// <properties>
sal_Bool m_bIsBasic;
sal_Int16 m_nTypeClass;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_sPattern;
+ OUString m_sName;
+ OUString m_sPattern;
sal_uInt16 m_nWST;
// </properties>
@@ -69,7 +69,7 @@ namespace xforms
sal_Bool isBasic() const { return m_bIsBasic; }
sal_Int16 getTypeClass() const { return m_nTypeClass; }
- const ::rtl::OUString&
+ const OUString&
getName() const { return m_sName; }
private:
@@ -79,35 +79,35 @@ namespace xforms
protected:
// create basic data type
- OXSDDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass );
+ OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass );
~OXSDDataType();
public:
DECLARE_XINTERFACE()
DECLARE_XTYPEPROVIDER()
- 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, ::com::sun::star::util::VetoException);
- virtual ::rtl::OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPattern( const ::rtl::OUString& _pattern ) 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::util::VetoException);
+ virtual OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException);
virtual sal_Bool SAL_CALL getIsBasic() throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getTypeClass() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL validate( const ::rtl::OUString& value ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL explainInvalid( const ::rtl::OUString& value ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (::com::sun::star::uno::RuntimeException);
// XPropertySet - is a base of XDataType and needs to be disambiguated
- 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);
public:
- OXSDDataType* clone( const ::rtl::OUString& _rNewName ) const;
+ OXSDDataType* clone( const OUString& _rNewName ) const;
protected:
// XPropertySet and friends
@@ -120,15 +120,15 @@ namespace xforms
// --- own overridables ---
// helper for implementing cloning of data types
- virtual OXSDDataType* createClone( const ::rtl::OUString& _rName ) const = 0;
+ virtual OXSDDataType* createClone( const OUString& _rName ) const = 0;
virtual void initializeClone( const OXSDDataType& _rCloneSource );
// helper method for validate and explainInvalid
- virtual sal_uInt16 _validate( const ::rtl::OUString& value );
- virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason );
+ virtual sal_uInt16 _validate( const OUString& value );
+ virtual OUString _explainInvalid( sal_uInt16 nReason );
// helper method for checking properties values which are to be set
- virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::rtl::OUString& _rErrorMessage );
+ virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage );
// register properties implemented by this instance - call the base class when overriding
virtual void registerProperties();
@@ -138,12 +138,12 @@ namespace xforms
//= helper for deriving from OXSDDataType
//====================================================================
#define DECLARE_DEFAULT_CLONING( classname ) \
- virtual OXSDDataType* createClone( const ::rtl::OUString& _rName ) const; \
+ virtual OXSDDataType* createClone( const OUString& _rName ) const; \
virtual void initializeClone( const OXSDDataType& _rCloneSource ); \
void initializeTypedClone( const classname& _rCloneSource );
#define IMPLEMENT_DEFAULT_CLONING( classname, baseclass ) \
- OXSDDataType* classname::createClone( const ::rtl::OUString& _rName ) const \
+ OXSDDataType* classname::createClone( const OUString& _rName ) const \
{ \
return new classname( _rName ); \
} \
@@ -154,7 +154,7 @@ namespace xforms
} \
#define IMPLEMENT_DEFAULT_TYPED_CLONING( classname, baseclass ) \
- OXSDDataType* classname::createClone( const ::rtl::OUString& _rName ) const \
+ OXSDDataType* classname::createClone( const OUString& _rName ) const \
{ \
return new classname( _rName, getTypeClass() ); \
} \
@@ -185,7 +185,7 @@ namespace xforms
double m_fCachedMinExclusive;
protected:
- OValueLimitedType_Base( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass );
+ OValueLimitedType_Base( const OUString& _rName, sal_Int16 _nTypeClass );
virtual void initializeClone( const OXSDDataType& _rCloneSource );
void initializeTypedClone( const OValueLimitedType_Base& _rCloneSource );
@@ -198,16 +198,16 @@ namespace xforms
throw (::com::sun::star::uno::Exception);
// OXSDDataType overridables
- virtual bool _getValue( const ::rtl::OUString& value, double& fValue );
- virtual sal_uInt16 _validate( const ::rtl::OUString& value );
- virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason );
+ virtual bool _getValue( const OUString& value, double& fValue );
+ virtual sal_uInt16 _validate( const OUString& value );
+ virtual OUString _explainInvalid( sal_uInt16 nReason );
// own overridables
/** translate a given value into a human-readable string
The value is guaranteed to be not <NULL/>, and is of type <member>ValueType</member>
*/
- virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const = 0;
+ virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const = 0;
/** translates a <member>ValueType</member> value into a double value
@@ -236,7 +236,7 @@ namespace xforms
getCppuType() const { return ::getCppuType( static_cast< ValueType* >( NULL ) ); }
protected:
- OValueLimitedType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass );
+ OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass );
// OXSDDataType overridables
virtual void registerProperties();
@@ -255,7 +255,7 @@ namespace xforms
bool m_bPropertiesRegistered;
protected:
- ODerivedDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass );
+ ODerivedDataType( const OUString& _rName, sal_Int16 _nTypeClass );
protected:
// OPropertyArrayUsageHelper
@@ -274,14 +274,14 @@ namespace xforms
class OBooleanType : public OBooleanType_Base
{
public:
- OBooleanType( const ::rtl::OUString& _rName );
+ OBooleanType( const OUString& _rName );
protected:
DECLARE_DEFAULT_CLONING( OBooleanType )
// OXSDDataType overridables
- virtual sal_uInt16 _validate( const ::rtl::OUString& value );
- virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason );
+ virtual sal_uInt16 _validate( const OUString& value );
+ virtual OUString _explainInvalid( sal_uInt16 nReason );
};
//====================================================================
@@ -299,15 +299,15 @@ namespace xforms
// </properties>
public:
- OStringType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::STRING */ );
+ OStringType( const OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::STRING */ );
protected:
DECLARE_DEFAULT_CLONING( OStringType )
// OXSDDataType overridables
- virtual sal_uInt16 _validate( const ::rtl::OUString& value );
- virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason );
- virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::rtl::OUString& _rErrorMessage );
+ virtual sal_uInt16 _validate( const OUString& value );
+ virtual OUString _explainInvalid( sal_uInt16 nReason );
+ virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage );
virtual void registerProperties();
};
@@ -323,18 +323,18 @@ namespace xforms
::com::sun::star::uno::Any m_aFractionDigits;
public:
- ODecimalType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::DECIMAL */ );
+ ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::DECIMAL */ );
protected:
DECLARE_DEFAULT_CLONING( ODecimalType )
// OXSDDataType overridables
- virtual sal_uInt16 _validate( const ::rtl::OUString& value );
- virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason );
+ virtual sal_uInt16 _validate( const OUString& value );
+ virtual OUString _explainInvalid( sal_uInt16 nReason );
virtual void registerProperties();
// OValueLimitedType overridables
- virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const;
+ virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const;
virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const;
private:
@@ -350,17 +350,17 @@ namespace xforms
class classname : public classname##_Base \
{ \
public: \
- classname( const ::rtl::OUString& _rName ); \
+ classname( const OUString& _rName ); \
\
protected: \
DECLARE_DEFAULT_CLONING( classname ) \
\
/* OXSDDataType overridables */ \
- virtual sal_uInt16 _validate( const ::rtl::OUString& value ); \
- virtual bool _getValue( const ::rtl::OUString& value, double& fValue ); \
+ virtual sal_uInt16 _validate( const OUString& value ); \
+ virtual bool _getValue( const OUString& value, double& fValue ); \
\
/* OValueLimitedType overridables */ \
- virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; \
+ virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; \
virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const; \
\
private: \
@@ -390,16 +390,16 @@ namespace xforms
class OShortIntegerType : public OShortIntegerType_Base
{
public:
- OShortIntegerType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass );
+ OShortIntegerType( const OUString& _rName, sal_Int16 _nTypeClass );
protected:
DECLARE_DEFAULT_CLONING( OShortIntegerType )
// OXSDDataType overridables
- virtual bool _getValue( const ::rtl::OUString& value, double& fValue );
+ virtual bool _getValue( const OUString& value, double& fValue );
// OValueLimitedType overridables
- virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const;
+ virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const;
virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const;
private:
diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx
index 7ccd0dc2a54b..c197196a33ba 100644
--- a/forms/source/xforms/datatypes_impl.hxx
+++ b/forms/source/xforms/datatypes_impl.hxx
@@ -23,7 +23,7 @@
//--------------------------------------------------------------------
template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
-ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const OUString& _rName, sal_Int16 _nTypeClass )
:SUPERCLASS( _rName, _nTypeClass )
,m_bPropertiesRegistered( false )
{
@@ -61,7 +61,7 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
//--------------------------------------------------------------------
template< typename VALUE_TYPE >
-OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass )
+OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass )
:OValueLimitedType_Base( _rName, _nTypeClass )
{
}
diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx
index 960a2296ad56..e8ccd35a282d 100644
--- a/forms/source/xforms/mip.cxx
+++ b/forms/source/xforms/mip.cxx
@@ -94,11 +94,11 @@ void MIP::resetRelevant() { mbHasRelevant = false; mbRelevant = true; }
bool MIP::hasConstraint() const { return mbHasConstraint; }
bool MIP::isConstraint() const { return mbConstraint; }
-void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = rtl::OUString(); }
-void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = rtl::OUString(); }
+void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = OUString(); }
+void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); }
-void MIP::setConstraintExplanation( const rtl::OUString& s ) { msConstraintExplanation = s; }
-rtl::OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; }
+void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanation = s; }
+OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; }
bool MIP::hasCalculate() const { return mbHasCalculate; }
@@ -106,9 +106,9 @@ void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; }
void MIP::resetCalculate() { mbHasCalculate = false; }
bool MIP::hasTypeName() const { return mbHasTypeName; }
- rtl::OUString MIP::getTypeName() const { return msTypeName; }
-void MIP::setTypeName( const rtl::OUString& s ) { msTypeName = s; mbHasTypeName = true; }
-void MIP::resetTypeName() { msTypeName = rtl::OUString(); mbHasTypeName = false; }
+ OUString MIP::getTypeName() const { return msTypeName; }
+void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; }
+void MIP::resetTypeName() { msTypeName = OUString(); mbHasTypeName = false; }
diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx
index e7c2d4b5f989..f46a7318ae11 100644
--- a/forms/source/xforms/mip.hxx
+++ b/forms/source/xforms/mip.hxx
@@ -46,9 +46,9 @@ class MIP
bool mbHasCalculate;
bool mbHasTypeName;
- rtl::OUString msTypeName;
+ OUString msTypeName;
- rtl::OUString msConstraintExplanation;
+ OUString msConstraintExplanation;
public:
MIP();
@@ -64,8 +64,8 @@ public:
// - type (static; default: xsd:string)
// (currently default implemented as empty string)
bool hasTypeName() const;
- rtl::OUString getTypeName() const;
- void setTypeName( const rtl::OUString& );
+ OUString getTypeName() const;
+ void setTypeName( const OUString& );
void resetTypeName();
// - readonly (computed XPath; default: false; true if calculate exists)
@@ -93,8 +93,8 @@ public:
void resetConstraint();
// explain _why_ a constraint failed
- void setConstraintExplanation( const rtl::OUString& );
- rtl::OUString getConstraintExplanation() const;
+ void setConstraintExplanation( const OUString& );
+ OUString getConstraintExplanation() const;
// - calculate (computed XPath; default: has none (false))
// (for calculate, we only store whether a calculate MIP is present;
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index b36aac2d2e10..60863373746e 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -58,8 +58,6 @@ using com::sun::star::lang::XMultiServiceFactory;
using com::sun::star::lang::XUnoTunnel;
using com::sun::star::beans::XPropertySet;
using com::sun::star::beans::PropertyValue;
-using rtl::OUString;
-using rtl::OUStringBuffer;
using com::sun::star::beans::PropertyVetoException;
using com::sun::star::beans::UnknownPropertyException;
using com::sun::star::util::VetoException;
@@ -188,12 +186,12 @@ void Model::setForeignSchema( const XDocument_t& rDocument )
mxForeignSchema = rDocument;
}
-rtl::OUString Model::getSchemaRef() const
+OUString Model::getSchemaRef() const
{
return msSchemaRef;
}
-void Model::setSchemaRef( const rtl::OUString& rSchemaRef )
+void Model::setSchemaRef( const OUString& rSchemaRef )
{
msSchemaRef = rSchemaRef;
}
@@ -322,7 +320,7 @@ void Model::deferNotifications( bool bDefer )
bool Model::setSimpleContent( const XNode_t& xConstNode,
- const rtl::OUString& sValue )
+ const OUString& sValue )
{
OSL_ENSURE( xConstNode.is(), "need node to set data" );
@@ -454,14 +452,14 @@ bool Model::isValid() const
// implement xforms::XModel
//
-rtl::OUString Model::getID()
+OUString Model::getID()
throw( RuntimeException )
{
DBG_INVARIANT();
return msID;
}
-void Model::setID( const rtl::OUString& sID )
+void Model::setID( const OUString& sID )
throw( RuntimeException )
{
DBG_INVARIANT();
@@ -510,7 +508,7 @@ void Model::refresh()
void SAL_CALL Model::submitWithInteraction(
- const rtl::OUString& sID,
+ const OUString& sID,
const XInteractionHandler_t& _rxHandler )
throw( VetoException,
WrappedTargetException,
@@ -531,7 +529,7 @@ void SAL_CALL Model::submitWithInteraction(
}
}
-void Model::submit( const rtl::OUString& sID )
+void Model::submit( const OUString& sID )
throw( VetoException, WrappedTargetException, RuntimeException )
{
submitWithInteraction( sID, NULL );
@@ -556,7 +554,7 @@ Model::XSet_t Model::getInstances()
return mxInstances;
}
-Model::XDocument_t Model::getInstanceDocument( const rtl::OUString& rName )
+Model::XDocument_t Model::getInstanceDocument( const OUString& rName )
throw( RuntimeException )
{
ensureAtLeastOneInstance();
@@ -600,7 +598,7 @@ Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding )
return xNewBinding;
}
-Model::XPropertySet_t Model::getBinding( const rtl::OUString& sId )
+Model::XPropertySet_t Model::getBinding( const OUString& sId )
throw( RuntimeException )
{
DBG_INVARIANT();
@@ -637,7 +635,7 @@ Model::XSubmission_t Model::cloneSubmission(const XPropertySet_t& xSubmission)
return xNewSubmission;
}
-Model::XSubmission_t Model::getSubmission( const rtl::OUString& sId )
+Model::XSubmission_t Model::getSubmission( const OUString& sId )
throw( RuntimeException )
{
DBG_INVARIANT();
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 2e989ab1aa87..d4c5672ed994 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -101,7 +101,7 @@ class Model : public Model_t
private:
- rtl::OUString msID; /// the model ID
+ OUString msID; /// the model ID
BindingCollection* mpBindings; /// the bindings
SubmissionCollection* mpSubmissions; /// the submissions
InstanceCollection* mpInstances; /// the instance(s)
@@ -109,7 +109,7 @@ private:
XDataTypeRepository_t mxDataTypes; /// the XSD data-types used
XDocument_t mxForeignSchema; /// the XSD-schema part we cannot
/// map onto data types
- rtl::OUString msSchemaRef; /// xforms:model/@schema attribute
+ OUString msSchemaRef; /// xforms:model/@schema attribute
XNameContainer_t mxNamespaces; /// namespaces for entire model
@@ -149,8 +149,8 @@ public:
void setForeignSchema( const XDocument_t& );
// get/set the xforms:model/@schema attribute
- rtl::OUString getSchemaRef() const;
- void setSchemaRef( const rtl::OUString& );
+ OUString getSchemaRef() const;
+ void setSchemaRef( const OUString& );
// get/set namespaces for entire model
XNameContainer_t getNamespaces() const;
@@ -188,7 +188,7 @@ public:
/// set a data value in the instance
/// (also defers notifications)
- bool setSimpleContent( const XNode_t&, const rtl::OUString& );
+ bool setSimpleContent( const XNode_t&, const OUString& );
/// load instance data
void loadInstance( sal_Int32 nInstance );
@@ -208,10 +208,10 @@ public:
//
- virtual rtl::OUString SAL_CALL getID()
+ virtual OUString SAL_CALL getID()
throw( RuntimeException_t );
- virtual void SAL_CALL setID( const rtl::OUString& sID )
+ virtual void SAL_CALL setID( const OUString& sID )
throw( RuntimeException_t );
virtual void SAL_CALL initialize()
@@ -229,10 +229,10 @@ public:
virtual void SAL_CALL refresh()
throw( RuntimeException_t );
- virtual void SAL_CALL submit( const rtl::OUString& sID )
+ virtual void SAL_CALL submit( const OUString& sID )
throw( VetoException_t, WrappedTargetException_t, RuntimeException_t );
- virtual void SAL_CALL submitWithInteraction( const ::rtl::OUString& id, const XInteractionHandler_t& _rxHandler )
+ virtual void SAL_CALL submitWithInteraction( const OUString& id, const XInteractionHandler_t& _rxHandler )
throw( VetoException_t, WrappedTargetException_t, RuntimeException_t );
virtual XDataTypeRepository_t SAL_CALL getDataTypeRepository( )
@@ -244,7 +244,7 @@ public:
virtual XSet_t SAL_CALL getInstances()
throw( RuntimeException_t );
- virtual XDocument_t SAL_CALL getInstanceDocument( const rtl::OUString& )
+ virtual XDocument_t SAL_CALL getInstanceDocument( const OUString& )
throw( RuntimeException_t );
virtual XDocument_t SAL_CALL getDefaultInstance()
@@ -260,7 +260,7 @@ public:
virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& )
throw( RuntimeException_t );
- virtual XPropertySet_t SAL_CALL getBinding( const rtl::OUString& )
+ virtual XPropertySet_t SAL_CALL getBinding( const OUString& )
throw( RuntimeException_t );
virtual XSet_t SAL_CALL getBindings()
@@ -275,7 +275,7 @@ public:
virtual XSubmission_t SAL_CALL cloneSubmission( const XPropertySet_t& )
throw( RuntimeException_t );
- virtual XSubmission_t SAL_CALL getSubmission( const rtl::OUString& )
+ virtual XSubmission_t SAL_CALL getSubmission( const OUString& )
throw( RuntimeException_t );
virtual XSet_t SAL_CALL getSubmissions()
@@ -283,23 +283,23 @@ public:
// XPropertySet
- virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p)
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p)
throw( css::uno::RuntimeException )
{ return PropertySetBase::getPropertyValue(p); }
- virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
throw( css::uno::RuntimeException )
{ PropertySetBase::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
throw( css::uno::RuntimeException )
{ PropertySetBase::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
throw( css::uno::RuntimeException )
{ PropertySetBase::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
throw( css::uno::RuntimeException )
{ PropertySetBase::removeVetoableChangeListener(p1, p2); }
@@ -307,7 +307,7 @@ public:
throw( css::uno::RuntimeException )
{ return PropertySetBase::getPropertySetInfo(); }
- virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2)
+ virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2)
throw( css::uno::RuntimeException )
{ PropertySetBase::setPropertyValue(p1, p2); }
@@ -318,30 +318,30 @@ public:
/// determine a reasonable control service for a given node
/// (based on data type MIP assigned to the node)
- virtual rtl::OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (RuntimeException_t);
+ virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (RuntimeException_t);
/// call getDefaultBindingExpressionForNode with default evaluation context
- virtual rtl::OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t);
+ virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t);
/// determine a reasonable default binding expression for a given node
/// and a given evaluation context
/// @returns expression, or empty string if no expression could be derived
- rtl::OUString getDefaultBindingExpressionForNode(
+ OUString getDefaultBindingExpressionForNode(
const XNode_t&,
const EvaluationContext& );
- virtual rtl::OUString SAL_CALL getNodeDisplayName( const XNode_t&,
+ virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&,
sal_Bool bDetail )
throw( RuntimeException_t );
- virtual rtl::OUString SAL_CALL getNodeName( const XNode_t& )
+ virtual OUString SAL_CALL getNodeName( const XNode_t& )
throw( RuntimeException_t );
- virtual rtl::OUString SAL_CALL getBindingName( const XPropertySet_t&,
+ virtual OUString SAL_CALL getBindingName( const XPropertySet_t&,
sal_Bool bDetail )
throw( RuntimeException_t );
- virtual rtl::OUString SAL_CALL getSubmissionName( const XPropertySet_t&,
+ virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&,
sal_Bool bDetail )
throw( RuntimeException_t );
@@ -351,44 +351,44 @@ public:
virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& )
throw( RuntimeException_t );
- virtual XDocument_t SAL_CALL newInstance( const rtl::OUString& sName,
- const rtl::OUString& sURL,
+ virtual XDocument_t SAL_CALL newInstance( const OUString& sName,
+ const OUString& sURL,
sal_Bool bURLOnce )
throw( RuntimeException_t );
- virtual void SAL_CALL renameInstance( const rtl::OUString& sFrom,
- const rtl::OUString& sTo,
- const rtl::OUString& sURL,
+ virtual void SAL_CALL renameInstance( const OUString& sFrom,
+ const OUString& sTo,
+ const OUString& sURL,
sal_Bool bURLOnce )
throw( RuntimeException_t );
- virtual void SAL_CALL removeInstance( const rtl::OUString& sName )
+ virtual void SAL_CALL removeInstance( const OUString& sName )
throw( RuntimeException_t );
virtual XModel_t SAL_CALL newModel( const Frame_XModel_t& xComponent,
- const rtl::OUString& sName )
+ const OUString& sName )
throw( RuntimeException_t );
virtual void SAL_CALL renameModel( const Frame_XModel_t& xComponent,
- const rtl::OUString& sFrom,
- const rtl::OUString& sTo )
+ const OUString& sFrom,
+ const OUString& sTo )
throw( RuntimeException_t );
virtual void SAL_CALL removeModel( const Frame_XModel_t& xComponent,
- const rtl::OUString& sName )
+ const OUString& sName )
throw( RuntimeException_t );
virtual XNode_t SAL_CALL createElement( const XNode_t& xParent,
- const rtl::OUString& sName )
+ const OUString& sName )
throw( RuntimeException_t );
virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent,
- const rtl::OUString& sName )
+ const OUString& sName )
throw( RuntimeException_t );
virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode,
- const rtl::OUString& sName )
+ const OUString& sName )
throw( RuntimeException_t );
virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&,
@@ -398,21 +398,21 @@ public:
virtual void SAL_CALL removeBindingForNode( const XNode_t& )
throw( RuntimeException_t );
- virtual rtl::OUString SAL_CALL getResultForExpression(
+ virtual OUString SAL_CALL getResultForExpression(
const XPropertySet_t& xBinding,
sal_Bool bIsBindingExpression,
- const rtl::OUString& sExpression )
+ const OUString& sExpression )
throw( RuntimeException_t );
- virtual sal_Bool SAL_CALL isValidXMLName( const rtl::OUString& sName )
+ virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName )
throw( RuntimeException_t );
- virtual sal_Bool SAL_CALL isValidPrefixName( const rtl::OUString& sName )
+ virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName )
throw( RuntimeException_t );
virtual void SAL_CALL setNodeValue(
const XNode_t& xNode,
- const rtl::OUString& sValue )
+ const OUString& sValue )
throw( RuntimeException_t );
diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx
index 35fa556af8af..582cb054a43f 100644
--- a/forms/source/xforms/model_helper.hxx
+++ b/forms/source/xforms/model_helper.hxx
@@ -119,7 +119,7 @@ public:
virtual bool isValid( const T& t ) const
{
const com::sun::star::beans::PropertyValue* pValues = t.getConstArray();
- rtl::OUString sInstance( "Instance" );
+ OUString sInstance( "Instance" );
sal_Bool bFound = sal_False;
for( sal_Int32 i = 0; ( ! bFound ) && ( i < t.getLength() ); i++ )
{
@@ -135,23 +135,23 @@ public:
//
sal_Int32 lcl_findInstance( const InstanceCollection*,
- const rtl::OUString& );
+ const OUString& );
// get values from Sequence<PropertyValue> describing an Instance
void getInstanceData(
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&,
- rtl::OUString* pID,
+ OUString* pID,
com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*,
- rtl::OUString* pURL,
+ OUString* pURL,
bool* pURLOnce );
// set values on Sequence<PropertyValue> for an Instance
void setInstanceData(
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&,
- const rtl::OUString* pID,
+ const OUString* pID,
const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*,
- const rtl::OUString* pURL,
+ const OUString* pURL,
const bool* pURLOnce );
} // namespace xforms
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 6b912ce917da..39c269087710 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -53,8 +53,6 @@
#include <com/sun/star/xsd/DataTypeClass.hpp>
-using rtl::OUString;
-using rtl::OUStringBuffer;
using com::sun::star::beans::PropertyValue;
using com::sun::star::io::XInputStream;
using com::sun::star::io::XActiveDataSink;
@@ -413,8 +411,8 @@ void Model::removeBindingIfUseless( const XPropertySet_t& xBinding )
}
}
-Model::XDocument_t Model::newInstance( const rtl::OUString& sName,
- const rtl::OUString& sURL,
+Model::XDocument_t Model::newInstance( const OUString& sName,
+ const OUString& sURL,
sal_Bool bURLOnce )
throw( RuntimeException )
{
@@ -437,7 +435,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName,
static sal_Int32 lcl_findProp( const PropertyValue* pValues,
sal_Int32 nLength,
- const rtl::OUString& rName )
+ const OUString& rName )
{
bool bFound = false;
sal_Int32 n = 0;
@@ -449,7 +447,7 @@ static sal_Int32 lcl_findProp( const PropertyValue* pValues,
}
sal_Int32 xforms::lcl_findInstance( const InstanceCollection* pInstances,
- const rtl::OUString& rName )
+ const OUString& rName )
{
sal_Int32 nLength = pInstances->countItems();
sal_Int32 n = 0;
@@ -463,9 +461,9 @@ sal_Int32 xforms::lcl_findInstance( const InstanceCollection* pInstances,
return bFound ? ( n - 1 ) : -1;
}
-void Model::renameInstance( const rtl::OUString& sFrom,
- const rtl::OUString& sTo,
- const rtl::OUString& sURL,
+void Model::renameInstance( const OUString& sFrom,
+ const OUString& sTo,
+ const OUString& sURL,
sal_Bool bURLOnce )
throw( RuntimeException )
{
@@ -504,7 +502,7 @@ void Model::renameInstance( const rtl::OUString& sFrom,
}
}
-void Model::removeInstance( const rtl::OUString& sName )
+void Model::removeInstance( const OUString& sName )
throw( RuntimeException )
{
sal_Int32 nPos = lcl_findInstance( mpInstances, sName );
@@ -616,7 +614,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent,
}
Model::XNode_t Model::renameNode( const XNode_t& xNode,
- const rtl::OUString& sName )
+ const OUString& sName )
throw( RuntimeException )
{
// early out if we don't have to change the name
@@ -764,14 +762,14 @@ void Model::removeBindingForNode( const XNode_t& )
static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode )
{
- ::rtl::OUString sResult;
+ OUString sResult;
OSL_ENSURE( _rxAttrNode.is(), "lcl_serializeForDisplay( attr ): invalid argument!" );
if ( _rxAttrNode.is() )
{
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
aBuffer.append( _rxAttrNode->getName() );
aBuffer.appendAscii( "=" );
- ::rtl::OUString sValue = _rxAttrNode->getValue();
+ OUString sValue = _rxAttrNode->getValue();
sal_Unicode nQuote = '"';
if ( sValue.indexOf( nQuote ) >= 0 )
nQuote = '\'';
@@ -786,7 +784,7 @@ static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode )
static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
{
- ::rtl::OUString sResult;
+ OUString sResult;
// create document fragment
Reference<XDocument> xDocument( getDocumentBuilder()->newDocument() );
@@ -966,7 +964,7 @@ sal_Bool Model::isValidPrefixName( const OUString& sName )
void Model::setNodeValue(
const XNode_t& xNode,
- const rtl::OUString& sValue )
+ const OUString& sValue )
throw( RuntimeException )
{
setSimpleContent( xNode, sValue );
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index 5f9c808ac16d..0505a50f1094 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -39,22 +39,22 @@ public:
NamedCollection() {}
virtual ~NamedCollection() {}
- const T& getItem( const rtl::OUString& rName ) const
+ const T& getItem( const OUString& rName ) const
{
OSL_ENSURE( hasItem( rName ), "invalid name" );
return *findItem( rName );
}
- bool hasItem( const rtl::OUString& rName ) const
+ bool hasItem( const OUString& rName ) const
{
return findItem( rName ) != maItems.end();
}
- typedef com::sun::star::uno::Sequence<rtl::OUString> Names_t;
+ typedef com::sun::star::uno::Sequence<OUString> Names_t;
Names_t getNames() const
{
// iterate over members, and collect all those that have names
- std::vector<rtl::OUString> aNames;
+ std::vector<OUString> aNames;
for( typename std::vector<T>::const_iterator aIter = maItems.begin();
aIter != maItems.end();
++aIter )
@@ -67,14 +67,14 @@ public:
// copy names to Sequence and return
Names_t aResult( aNames.size() );
- rtl::OUString* pStrings = aResult.getArray();
+ OUString* pStrings = aResult.getArray();
std::copy( aNames.begin(), aNames.end(), pStrings );
return aResult;
}
protected:
- typename std::vector<T>::const_iterator findItem( const rtl::OUString& rName ) const
+ typename std::vector<T>::const_iterator findItem( const OUString& rName ) const
{
for( typename std::vector<T>::const_iterator aIter = maItems.begin();
aIter != maItems.end();
@@ -105,7 +105,7 @@ public:
// XNameAccess : XElementAccess
virtual typename Collection<T>::Any_t SAL_CALL getByName(
- const rtl::OUString& aName )
+ const OUString& aName )
throw( typename Collection<T>::NoSuchElementException_t,
typename Collection<T>::WrappedTargetException_t,
typename Collection<T>::RuntimeException_t )
@@ -124,7 +124,7 @@ public:
}
virtual sal_Bool SAL_CALL hasByName(
- const rtl::OUString& aName )
+ const OUString& aName )
throw( typename Collection<T>::RuntimeException_t )
{
return hasItem( aName ) ? sal_True : sal_False;
diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx
index 256f11ce895c..af45a3e239a8 100644
--- a/forms/source/xforms/pathexpression.cxx
+++ b/forms/source/xforms/pathexpression.cxx
@@ -39,8 +39,6 @@
#include <functional>
-using rtl::OUString;
-using rtl::OUStringBuffer;
using com::sun::star::uno::Reference;
using com::sun::star::uno::Sequence;
using com::sun::star::xml::dom::XNode;
@@ -89,7 +87,7 @@ void PathExpression::setExpression( const OUString& rExpression )
maNodes.clear();
}
-const rtl::OUString PathExpression::_getExpressionForEvaluation() const
+const OUString PathExpression::_getExpressionForEvaluation() const
{
OUString sExpr = ComputedExpression::_getExpressionForEvaluation();
if( sExpr.isEmpty())
diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx
index ddfc5362b030..93d187b20e44 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -51,7 +51,7 @@ private:
protected:
/// get expression for evaluation
- const rtl::OUString _getExpressionForEvaluation() const;
+ const OUString _getExpressionForEvaluation() const;
public:
@@ -61,7 +61,7 @@ public:
/// set the expression string
/// (overridden to do remove old listeners)
/// (also defines simple expressions)
- void setExpression( const rtl::OUString& rExpression );
+ void setExpression( const OUString& rExpression );
/// evaluate the expression relative to the content node.
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index ae56f7618e67..daa50bb2af20 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -108,7 +108,7 @@ void PropertySetBase::notifyAndCachePropertyValue( sal_Int32 nHandle )
{
// determine the type of this property
::cppu::IPropertyArrayHelper& rPropertyMetaData = getInfoHelper();
- ::rtl::OUString sPropName;
+ OUString sPropName;
OSL_VERIFY( rPropertyMetaData.fillPropertyMembersByHandle( &sPropName, NULL, nHandle ) );
Property aProperty = rPropertyMetaData.getPropertyByName( sPropName );
// default construct a value of this type
@@ -161,7 +161,7 @@ sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValu
{
PropertyAccessorBase& rAccessor = locatePropertyHandler( nHandle );
if ( !rAccessor.approveValue( rValue ) )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 0 );
+ throw IllegalArgumentException( OUString(), *this, 0 );
rAccessor.getValue( rOldValue );
if ( rOldValue != rValue )
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 29899d1b67de..bdbd5ab1406b 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -353,7 +353,7 @@ public:
#define PROPERTY_FLAGS( NAME, TYPE, FLAG ) com::sun::star::beans::Property( \
- ::rtl::OUString( #NAME, sizeof( #NAME ) - 1, RTL_TEXTENCODING_ASCII_US ), \
+ OUString( #NAME, sizeof( #NAME ) - 1, RTL_TEXTENCODING_ASCII_US ), \
HANDLE_##NAME, getCppuType( static_cast< TYPE* >( NULL ) ), FLAG )
#define PROPERTY( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, com::sun::star::beans::PropertyAttribute::BOUND )
#define PROPERTY_RO( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, com::sun::star::beans::PropertyAttribute::BOUND | com::sun::star::beans::PropertyAttribute::READONLY )
diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx
index 50cd74f54672..ac125380c433 100644
--- a/forms/source/xforms/resourcehelper.cxx
+++ b/forms/source/xforms/resourcehelper.cxx
@@ -24,7 +24,6 @@
#include <rtl/ustring.hxx>
#include <tools/string.hxx>
-using rtl::OUString;
namespace xforms
{
diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx
index 486bd5437676..bc54cf800072 100644
--- a/forms/source/xforms/resourcehelper.hxx
+++ b/forms/source/xforms/resourcehelper.hxx
@@ -23,21 +23,20 @@
#include <frm_resource.hrc>
#include <sal/types.h>
-
-namespace rtl { class OUString; }
+#include <rtl/ustring.hxx>
namespace xforms
{
/// get a resource string for the current language
- rtl::OUString getResource( sal_uInt16 );
+ OUString getResource( sal_uInt16 );
// overloaded: get a resource string, and substitute parameters
- rtl::OUString getResource( sal_uInt16, const rtl::OUString& );
- rtl::OUString getResource( sal_uInt16, const rtl::OUString&,
- const rtl::OUString& );
- rtl::OUString getResource( sal_uInt16, const rtl::OUString&,
- const rtl::OUString&,
- const rtl::OUString& );
+ OUString getResource( sal_uInt16, const OUString& );
+ OUString getResource( sal_uInt16, const OUString&,
+ const OUString& );
+ OUString getResource( sal_uInt16, const OUString&,
+ const OUString&,
+ const OUString& );
} // namespace
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index d8bb867d3b13..a9dd5348627e 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -57,8 +57,6 @@
-using rtl::OUString;
-using rtl::OUStringBuffer;
using com::sun::star::beans::UnknownPropertyException;
using com::sun::star::beans::PropertyVetoException;
using com::sun::star::lang::IllegalArgumentException;
@@ -440,7 +438,7 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue(
{
// for convinience reasons (????), we accept a string which contains
// a comma-separated list of namespace prefixes
- ::rtl::OUString sTokenList;
+ OUString sTokenList;
if ( rValue >>= sTokenList )
{
std::vector< OUString > aPrefixes;
@@ -448,7 +446,7 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue(
while ( p >= 0 )
aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) );
- Sequence< ::rtl::OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() );
+ Sequence< OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() );
return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) );
}
}
@@ -498,11 +496,11 @@ void SAL_CALL Submission::submitWithInteraction(
// as long as this class is not really threadsafe, we need to copy
// the members we're interested in
Reference< XModel > xModel( mxModel );
- ::rtl::OUString sID( msID );
+ OUString sID( msID );
if ( !xModel.is() || msID.isEmpty() )
throw RuntimeException(
- ::rtl::OUString( "This is not a valid submission object." ),
+ OUString( "This is not a valid submission object." ),
*this
);
@@ -680,27 +678,27 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL Submission::getP
{
return PropertySetBase::getPropertySetInfo();
}
-void SAL_CALL Submission::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
+void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
PropertySetBase::setPropertyValue( aPropertyName, aValue );
}
-Any SAL_CALL Submission::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
return PropertySetBase::getPropertyValue( PropertyName );
}
-void SAL_CALL Submission::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
PropertySetBase::addPropertyChangeListener( aPropertyName, xListener );
}
-void SAL_CALL Submission::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
PropertySetBase::removePropertyChangeListener( aPropertyName, aListener );
}
-void SAL_CALL Submission::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
PropertySetBase::addVetoableChangeListener( PropertyName, aListener );
}
-void SAL_CALL Submission::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
PropertySetBase::removeVetoableChangeListener( PropertyName, aListener );
}
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index f811ad2dd524..32485299a2f3 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -64,21 +64,21 @@ typedef cppu::ImplInheritanceHelper2<
class Submission : public Submission_t
{
// submission properties
- rtl::OUString msID;
- rtl::OUString msBind;
+ OUString msID;
+ OUString msBind;
ComputedExpression maRef;
- rtl::OUString msAction;
- rtl::OUString msMethod;
- rtl::OUString msVersion;
+ OUString msAction;
+ OUString msMethod;
+ OUString msVersion;
bool mbIndent;
- rtl::OUString msMediaType;
- rtl::OUString msEncoding;
+ OUString msMediaType;
+ OUString msEncoding;
bool mbOmitXmlDeclaration;
bool mbStandalone;
- rtl::OUString msCDataSectionElement;
- rtl::OUString msReplace;
- rtl::OUString msSeparator;
- com::sun::star::uno::Sequence< rtl::OUString > msIncludeNamespacePrefixes;
+ OUString msCDataSectionElement;
+ OUString msReplace;
+ OUString msSeparator;
+ com::sun::star::uno::Sequence< OUString > msIncludeNamespacePrefixes;
private:
@@ -108,32 +108,32 @@ public:
void setModel(
const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& );
- rtl::OUString getID() const; /// get ID for this submission
- void setID( const rtl::OUString& ); /// set ID for this submission
+ OUString getID() const; /// get ID for this submission
+ void setID( const OUString& ); /// set ID for this submission
- rtl::OUString getBind() const;
- void setBind( const rtl::OUString& );
+ OUString getBind() const;
+ void setBind( const OUString& );
- rtl::OUString getRef() const;
- void setRef( const rtl::OUString& );
+ OUString getRef() const;
+ void setRef( const OUString& );
- rtl::OUString getAction() const;
- void setAction( const rtl::OUString& );
+ OUString getAction() const;
+ void setAction( const OUString& );
- rtl::OUString getMethod() const;
- void setMethod( const rtl::OUString& );
+ OUString getMethod() const;
+ void setMethod( const OUString& );
- rtl::OUString getVersion() const;
- void setVersion( const rtl::OUString& );
+ OUString getVersion() const;
+ void setVersion( const OUString& );
bool getIndent() const;
void setIndent( bool );
- rtl::OUString getMediaType() const;
- void setMediaType( const rtl::OUString& );
+ OUString getMediaType() const;
+ void setMediaType( const OUString& );
- rtl::OUString getEncoding() const;
- void setEncoding( const rtl::OUString& );
+ OUString getEncoding() const;
+ void setEncoding( const OUString& );
bool getOmitXmlDeclaration() const;
void setOmitXmlDeclaration( bool );
@@ -141,17 +141,17 @@ public:
bool getStandalone() const;
void setStandalone( bool );
- rtl::OUString getCDataSectionElement() const;
- void setCDataSectionElement( const rtl::OUString& );
+ OUString getCDataSectionElement() const;
+ void setCDataSectionElement( const OUString& );
- rtl::OUString getReplace() const;
- void setReplace( const rtl::OUString& );
+ OUString getReplace() const;
+ void setReplace( const OUString& );
- rtl::OUString getSeparator() const;
- void setSeparator( const rtl::OUString& );
+ OUString getSeparator() const;
+ void setSeparator( const OUString& );
- com::sun::star::uno::Sequence< rtl::OUString > getIncludeNamespacePrefixes() const;
- void setIncludeNamespacePrefixes( const com::sun::star::uno::Sequence< rtl::OUString >& );
+ com::sun::star::uno::Sequence< OUString > getIncludeNamespacePrefixes() const;
+ void setIncludeNamespacePrefixes( const com::sun::star::uno::Sequence< OUString >& );
/** perform the submission
@@ -207,10 +207,10 @@ public:
// get/set name
//
- 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& )
+ virtual void SAL_CALL setName( const OUString& )
throw( com::sun::star::uno::RuntimeException );
@@ -249,12 +249,12 @@ public:
// (need to disambiguate this)
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/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 543c6d0bb515..18da787de5f0 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::task;
using namespace com::sun::star::xml::dom;
-CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aReplace, const Reference<XDocument>& aDocument, const Reference<XFrame>& aFrame)
+CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, const Reference<XDocument>& aDocument, const Reference<XFrame>& aFrame)
{
if (!m_aResultStream.is())
return CSubmission::UNKNOWN_ERROR;
@@ -63,13 +63,13 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
// open the stream from the result...
// build media descriptor
Sequence< PropertyValue > descriptor(2);
- descriptor[0] = PropertyValue(::rtl::OUString("InputStream"),
+ descriptor[0] = PropertyValue(OUString("InputStream"),
-1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE);
- descriptor[1] = PropertyValue(::rtl::OUString("ReadOnly"),
+ descriptor[1] = PropertyValue(OUString("ReadOnly"),
-1, makeAny(sal_True), PropertyState_DIRECT_VALUE);
- ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE);
- ::rtl::OUString aTarget = ::rtl::OUString("_default");
+ OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE);
+ OUString aTarget = OUString("_default");
xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor);
return CSubmission::SUCCESS;
@@ -100,7 +100,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
return CSubmission::SUCCESS;
}
} catch (const Exception& e) {
- ::rtl::OString aMsg("Exception during replace:\n");
+ OString aMsg("Exception during replace:\n");
aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
OSL_FAIL(aMsg.getStr());
}
diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx
index 4e7726d44c31..6a85797e8522 100644
--- a/forms/source/xforms/submission/serialization.hxx
+++ b/forms/source/xforms/submission/serialization.hxx
@@ -37,7 +37,7 @@ namespace CSS = com::sun::star;
Serialize an XObject
*/
-typedef std::map<rtl::OUString, rtl::OUString> PropMap;
+typedef std::map<OUString, OUString> PropMap;
class CSerialization
{
@@ -64,7 +64,7 @@ public:
void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props)
{
m_properties.clear();
- rtl::OUString aValue;
+ OUString aValue;
for (sal_Int32 i=0; i<props.getLength(); i++)
{
if (props[i].Value >>= aValue)
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index fcf80c267112..0cc80e2200fa 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -70,9 +70,9 @@ sal_Bool CSerializationURLEncoded::is_unreserved(sal_Char c)
}
return sal_False;
}
-void CSerializationURLEncoded::encode_and_append(const ::rtl::OUString& aString, ::rtl::OStringBuffer& aBuffer)
+void CSerializationURLEncoded::encode_and_append(const OUString& aString, OStringBuffer& aBuffer)
{
- ::rtl::OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
+ OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() );
sal_Char tmpChar[4]; tmpChar[3] = 0;
@@ -119,9 +119,9 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode)
// is this an element node?
if (aNode->getNodeType() == NodeType_ELEMENT_NODE)
{
- ::rtl::OUString aName = aNode->getNodeName();
+ OUString aName = aNode->getNodeName();
// find any text children
- ::rtl::OUStringBuffer aValue;
+ OUStringBuffer aValue;
Reference< XText > aText;
for(sal_Int32 i=0; i < aChildList->getLength(); i++)
{
@@ -136,8 +136,8 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode)
// found anything?
if (aValue.getLength() > 0)
{
- ::rtl::OUString aUnencValue = aValue.makeStringAndClear();
- ::rtl::OStringBuffer aEncodedBuffer;
+ OUString aUnencValue = aValue.makeStringAndClear();
+ OStringBuffer aEncodedBuffer;
encode_and_append(aName, aEncodedBuffer);
aEncodedBuffer.append("=");
encode_and_append(aUnencValue, aEncodedBuffer);
diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx
index 0eb58872597e..a778d5177082 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.hxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.hxx
@@ -32,7 +32,7 @@ private:
CSS::uno::Reference< CSS::io::XPipe > m_aPipe;
sal_Bool is_unreserved(sal_Char);
- void encode_and_append(const rtl::OUString& aString, rtl::OStringBuffer& aBuffer);
+ void encode_and_append(const OUString& aString, OStringBuffer& aBuffer);
void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode);
void serialize_nodeset();
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 0998b4c46cfc..ac714afb9730 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -115,7 +115,7 @@ protected:
CSS::uno::Reference< CSS::xml::dom::XDocumentFragment > m_aFragment;
CSS::uno::Reference< CSS::io::XInputStream > m_aResultStream;
CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext;
- rtl::OUString m_aEncoding;
+ OUString m_aEncoding;
::std::auto_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler
,com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment>& _rOutEnv);
@@ -130,7 +130,7 @@ public:
UNKNOWN_ERROR
};
- CSubmission(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+ CSubmission(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
: m_aURLObj(aURL)
, m_aFragment(aFragment)
, m_xContext(::comphelper::getProcessComponentContext())
@@ -138,13 +138,13 @@ public:
virtual ~CSubmission() {}
- virtual void setEncoding(const rtl::OUString& aEncoding)
+ virtual void setEncoding(const OUString& aEncoding)
{
m_aEncoding = aEncoding;
}
virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& ) = 0;
- virtual SubmissionResult replace(const rtl::OUString&, const CSS::uno::Reference< CSS::xml::dom::XDocument >&, const CSS::uno::Reference< CSS::frame::XFrame>&);
+ virtual SubmissionResult replace(const OUString&, const CSS::uno::Reference< CSS::xml::dom::XDocument >&, const CSS::uno::Reference< CSS::frame::XFrame>&);
};
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index bbfd09dcd1bf..62efea1ebbca 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -40,12 +40,9 @@ using namespace osl;
using namespace ucbhelper;
using namespace std;
-using ::rtl::OUString;
-using ::rtl::OStringToOUString;
-using ::rtl::OStringBuffer;
-CSubmissionGet::CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionGet::CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx
index 2e5e6038edcb..2acd28440b29 100644
--- a/forms/source/xforms/submission/submission_get.hxx
+++ b/forms/source/xforms/submission/submission_get.hxx
@@ -29,7 +29,7 @@ class CSubmissionGet : public CSubmission
private:
CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext;
public:
- CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
+ CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler);
};
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index b313bd269cb7..73bdf82c0bf8 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -37,10 +37,9 @@ using namespace osl;
using namespace ucbhelper;
using namespace std;
-using ::rtl::OUString;
-CSubmissionPost::CSubmissionPost(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionPost::CSubmissionPost(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
diff --git a/forms/source/xforms/submission/submission_post.hxx b/forms/source/xforms/submission/submission_post.hxx
index c842f35372dd..b9ce66ae87a8 100644
--- a/forms/source/xforms/submission/submission_post.hxx
+++ b/forms/source/xforms/submission/submission_post.hxx
@@ -25,7 +25,7 @@
class CSubmissionPost : public CSubmission
{
public:
- CSubmissionPost(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
+ CSubmissionPost(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler);
};
diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx
index e5ea3154ab1b..5beeb6386c43 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -36,9 +36,8 @@ using namespace osl;
using namespace ucbhelper;
using namespace std;
-using ::rtl::OUString;
-CSubmissionPut::CSubmissionPut(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
+CSubmissionPut::CSubmissionPut(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx
index 9f35de3ceb34..d17ad970916d 100644
--- a/forms/source/xforms/submission/submission_put.hxx
+++ b/forms/source/xforms/submission/submission_put.hxx
@@ -28,7 +28,7 @@
class CSubmissionPut : public CSubmission
{
public:
- CSubmissionPut(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
+ CSubmissionPut(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment);
virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler);
};
diff --git a/forms/source/xforms/unohelper.cxx b/forms/source/xforms/unohelper.cxx
index df62262a264b..35273757944f 100644
--- a/forms/source/xforms/unohelper.cxx
+++ b/forms/source/xforms/unohelper.cxx
@@ -43,7 +43,6 @@ using com::sun::star::beans::Property;
using com::sun::star::beans::XPropertySet;
using com::sun::star::beans::XPropertySetInfo;
using com::sun::star::beans::PropertyAttribute::READONLY;
-using rtl::OUString;
void xforms::copy( const Reference<XPropertySet>& xFrom,
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index 7e03f9967239..ebd73595bc4c 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -36,7 +36,6 @@ using com::sun::star::uno::RuntimeException;
using com::sun::star::form::binding::XValueBinding;
using com::sun::star::beans::XPropertySet;
using com::sun::star::container::XNameContainer;
-using rtl::OUString;
namespace frm
diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx
index 11553efd4b23..f4e101440646 100644
--- a/forms/source/xforms/xformsevent.cxx
+++ b/forms/source/xforms/xformsevent.cxx
@@ -25,7 +25,6 @@ namespace sun {
namespace star {
namespace xforms {
-using rtl::OUString;
using com::sun::star::uno::RuntimeException;
void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg,
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index 66738d200506..8f1649d908df 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -42,7 +42,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > {
inline XFormsEventConcrete( void ) : m_canceled(sal_False) {}
virtual ~XFormsEventConcrete( void ) {}
- virtual rtl::OUString SAL_CALL getType() throw (RuntimeException_t);
+ virtual OUString SAL_CALL getType() throw (RuntimeException_t);
virtual XEventTarget_t SAL_CALL getTarget() throw (RuntimeException_t);
virtual XEventTarget_t SAL_CALL getCurrentTarget() throw (RuntimeException_t);
virtual PhaseType_t SAL_CALL getEventPhase() throw (RuntimeException_t);
@@ -53,13 +53,13 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > {
virtual void SAL_CALL preventDefault() throw (RuntimeException_t);
virtual void SAL_CALL initXFormsEvent(
- const rtl::OUString& typeArg,
+ const OUString& typeArg,
sal_Bool canBubbleArg,
sal_Bool cancelableArg )
throw (RuntimeException_t);
virtual void SAL_CALL initEvent(
- const rtl::OUString& eventTypeArg,
+ const OUString& eventTypeArg,
sal_Bool canBubbleArg,
sal_Bool cancelableArg)
throw (RuntimeException_t);
@@ -70,7 +70,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > {
protected:
- rtl::OUString m_eventType;
+ OUString m_eventType;
XEventTarget_t m_target;
XEventTarget_t m_currentTarget;
PhaseType_t m_phase;
diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx
index 5458cd177382..7c55516d12ca 100644
--- a/forms/source/xforms/xmlhelper.cxx
+++ b/forms/source/xforms/xmlhelper.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
#include <comphelper/processfactory.hxx>
-using rtl::OUString;
using com::sun::star::uno::Reference;
using com::sun::star::uno::UNO_QUERY_THROW;
using com::sun::star::container::XNameContainer;
diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx
index c6eb1658aebb..d55432d6ffc2 100644
--- a/forms/source/xforms/xmlhelper.hxx
+++ b/forms/source/xforms/xmlhelper.hxx
@@ -21,9 +21,8 @@
#define _XMLHELPER_HXX
#include <sal/types.h>
+#include <rtl/ustring.hxx>
-
-namespace rtl { class OUString; }
namespace com { namespace sun { namespace star {
namespace uno { template<typename T> class Reference; }
namespace container { class XNameContainer; }
@@ -31,10 +30,10 @@ namespace com { namespace sun { namespace star {
} } }
-bool isValidQName( const rtl::OUString& sName,
+bool isValidQName( const OUString& sName,
const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces );
-bool isValidPrefixName( const rtl::OUString& sName,
+bool isValidPrefixName( const OUString& sName,
const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces );
com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocumentBuilder> getDocumentBuilder();
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 75c6922e109f..6e93845b61bd 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -39,15 +39,15 @@ Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create(
return aInstance;
}
-::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static()
+OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static()
{
- return ::rtl::OUString("com.sun.star.comp.xml.xpath.XFormsExtension");
+ return OUString("com.sun.star.comp.xml.xpath.XFormsExtension");
}
-Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static()
+Sequence< OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aSequence(1);
- aSequence[0] = ::rtl::OUString("com.sun.star.xml.xpath.XPathExtension");
+ Sequence< OUString > aSequence(1);
+ aSequence[0] = OUString("com.sun.star.xml.xpath.XPathExtension");
return aSequence;
}
diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx
index 4e1d87f7d68f..b95adb5d1b90 100644
--- a/forms/source/xforms/xpathlib/extension.hxx
+++ b/forms/source/xforms/xpathlib/extension.hxx
@@ -46,8 +46,8 @@ private:
public:
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 >& aFactory);
- 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();
com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel();
com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode();
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 6c35ea7fee90..ed2c5068d8ef 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -92,7 +92,7 @@ void xforms_booleanFromStringFunction(xmlXPathParserContextPtr ctxt, int nargs)
if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
xmlChar *pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
- ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
+ OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
if (aString.equalsIgnoreAsciiCase("true") ||
aString.equalsIgnoreAsciiCase("1"))
xmlXPathReturnTrue(ctxt);
@@ -224,7 +224,7 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs)
if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
xmlChar* pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
- ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
+ OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
if (aString.equalsIgnoreAsciiCase("version"))
xmlXPathReturnString(ctxt, (xmlChar*)_version);
else if (aString.equalsIgnoreAsciiCase("conformance-level"))
@@ -235,9 +235,9 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs)
// Date and Time Functions
-static ::rtl::OString makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_True)
+static OString makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_True)
{
- ::rtl::OStringBuffer aDateTimeString;
+ OStringBuffer aDateTimeString;
aDateTimeString.append((sal_Int32)aDateTime.GetYear());
aDateTimeString.append("-");
if (aDateTime.GetMonth()<10) aDateTimeString.append("0");
@@ -281,19 +281,19 @@ void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int /*nargs*/)
indicated by a "Z".
*/
DateTime aDateTime( DateTime::SYSTEM );
- ::rtl::OString aDateTimeString = makeDateTimeString(aDateTime);
+ OString aDateTimeString = makeDateTimeString(aDateTime);
xmlChar *pString = static_cast<xmlChar*>(xmlMalloc(aDateTimeString.getLength()+1));
strncpy((char*)pString, (char*)aDateTimeString.getStr(), aDateTimeString.getLength());
pString[aDateTimeString.getLength()] = 0;
xmlXPathReturnString(ctxt, pString);
}
-static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTime)
+static sal_Bool parseDateTime(const OUString& aString, DateTime& aDateTime)
{
// take apart a canonical literal xsd:dateTime string
//CCYY-MM-DDThh:mm:ss(Z)
- ::rtl::OUString aDateTimeString = aString.trim();
+ OUString aDateTimeString = aString.trim();
// check length
if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20)
@@ -302,10 +302,10 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim
sal_Int32 nDateLength = 10;
sal_Int32 nTimeLength = 8;
- ::rtl::OUString aUTCString("Z");
+ OUString aUTCString("Z");
- ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
- ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
+ OUString aDateString = aDateTimeString.copy(0, nDateLength);
+ OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
sal_Int32 nIndex = 0;
sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32();
@@ -335,7 +335,7 @@ void xforms_daysFromDateFunction(xmlXPathParserContextPtr ctxt, int nargs)
if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
xmlChar* pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
- ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
+ OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
DateTime aDateTime( DateTime::EMPTY );
if (parseDateTime(aString, aDateTime))
@@ -358,7 +358,7 @@ void xforms_secondsFromDateTimeFunction(xmlXPathParserContextPtr ctxt, int nargs
if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
xmlChar* pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
- ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
+ OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
DateTime aDateTime( DateTime::EMPTY );
@@ -507,7 +507,7 @@ void xforms_instanceFuction(xmlXPathParserContextPtr ctxt, int nargs)
if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
xmlChar *pString = xmlXPathPopString(ctxt);
if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE);
- ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
+ OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8);
Reference< XModel > aModel = ((CLibxml2XFormsExtension*)ctxt->context->funcLookupData)->getModel();
if (aModel.is())
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index 408fb130c4c5..cd9b3b5b69c6 100644
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.hxx
@@ -28,7 +28,7 @@ namespace formula
class FORMULA_DLLPUBLIC SAL_NO_VTABLE ExternalReferenceHelper
{
public:
- virtual ::rtl::OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const = 0;
+ virtual OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const = 0;
protected:
~ExternalReferenceHelper() {}
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 85295b244cb4..b53bb2df4316 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -170,7 +170,7 @@ public:
/// Core implementation of XFormulaOpCodeMapper::getMappings()
::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >
createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ) const;
+ const ::com::sun::star::uno::Sequence< OUString >& rNames ) const;
/// Core implementation of XFormulaOpCodeMapper::getAvailableMappings()
::com::sun::star::uno::Sequence<
@@ -229,21 +229,21 @@ public:
bool CompileTokenArray();
void CreateStringFromTokenArray( String& rFormula );
- void CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer );
+ void CreateStringFromTokenArray( OUStringBuffer& rBuffer );
FormulaToken* CreateStringFromToken( String& rFormula, FormulaToken* pToken,
bool bAllowArrAdvance = false );
- FormulaToken* CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pToken,
+ FormulaToken* CreateStringFromToken( OUStringBuffer& rBuffer, FormulaToken* pToken,
bool bAllowArrAdvance = false );
- void AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal );
- void AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal );
- void AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr );
+ void AppendBoolean( OUStringBuffer& rBuffer, bool bVal );
+ void AppendDouble( OUStringBuffer& rBuffer, double fVal );
+ void AppendString( OUStringBuffer& rBuffer, const String & rStr );
/** Set symbol map corresponding to one of predefined formula::FormulaGrammar::Grammar,
including an address reference convention. */
inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
- static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
+ static void UpdateSeparatorsNative( const OUString& rSep, const OUString& rArrayColSep, const OUString& rArrayRowSep );
static void ResetNativeSymbols();
static void SetNativeSymbols( const OpCodeMapPtr& xMap );
protected:
@@ -260,14 +260,14 @@ protected:
virtual bool HandleSingleRef();
virtual bool HandleDbData();
- virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP);
- virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
- virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
- virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
- virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
+ virtual void CreateStringFromExternal(OUStringBuffer& rBuffer, FormulaToken* pTokenP);
+ virtual void CreateStringFromSingleRef(OUStringBuffer& rBuffer,FormulaToken* pTokenP);
+ virtual void CreateStringFromDoubleRef(OUStringBuffer& rBuffer,FormulaToken* pTokenP);
+ virtual void CreateStringFromMatrix(OUStringBuffer& rBuffer,FormulaToken* pTokenP);
+ virtual void CreateStringFromIndex(OUStringBuffer& rBuffer,FormulaToken* pTokenP);
virtual void LocalizeString( String& rName ); // modify rName - input: exact name
- void AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError );
+ void AppendErrorConstant( OUStringBuffer& rBuffer, sal_uInt16 nError );
bool GetToken();
OpCode NextToken();
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
index cbf279df5eff..07945ca27101 100644
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
@@ -40,8 +40,8 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
::std::auto_ptr<FormulaCompiler> m_pCompiler;
SAL_WNODEPRECATED_DECLARATIONS_POP
public:
- 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::uno::XComponentContext >& _xContext);
protected:
@@ -57,7 +57,7 @@ private:
virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException);
// Methods
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames,
+ const ::com::sun::star::uno::Sequence< OUString >& rNames,
sal_Int32 nLanguage )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -67,11 +67,11 @@ private:
::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/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index c876ccad7f56..1747c2f2ddce 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -52,7 +52,7 @@ namespace formula
virtual sal_uInt32 getCount() const = 0;
virtual const IFunctionCategory* getCategory(sal_uInt32 nPos) const = 0;
virtual void fillLastRecentlyUsedFunctions(::std::vector< const IFunctionDescription*>& _rLastRUFunctions) const = 0;
- virtual const IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const = 0;
+ virtual const IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const = 0;
virtual sal_Unicode getSingleToken(const EToken _eToken) const = 0;
@@ -68,7 +68,7 @@ namespace formula
virtual sal_uInt32 getCount() const = 0;
virtual const IFunctionDescription* getFunction(sal_uInt32 _nPos) const = 0;
virtual sal_uInt32 getNumber() const = 0;
- virtual ::rtl::OUString getName() const = 0;
+ virtual OUString getName() const = 0;
protected:
~IFunctionCategory() {}
@@ -78,23 +78,23 @@ namespace formula
{
public:
IFunctionDescription(){}
- virtual ::rtl::OUString getFunctionName() const = 0;
+ virtual OUString getFunctionName() const = 0;
virtual const IFunctionCategory* getCategory() const = 0;
- virtual ::rtl::OUString getDescription() const = 0;
+ virtual OUString getDescription() const = 0;
// GetSuppressedArgCount
virtual xub_StrLen getSuppressedArgumentCount() const = 0;
// GetFormulaString
- virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const = 0;
+ virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const = 0;
// GetVisibleArgMapping
virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const = 0;
virtual void initArgumentInfo() const = 0;
- virtual ::rtl::OUString getSignature() const = 0;
- virtual rtl::OString getHelpId() const = 0;
+ virtual OUString getSignature() const = 0;
+ virtual OString getHelpId() const = 0;
// parameter
virtual sal_uInt32 getParameterCount() const = 0;
- virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const = 0;
- virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const = 0;
+ virtual OUString getParameterName(sal_uInt32 _nPos) const = 0;
+ virtual OUString getParameterDescription(sal_uInt32 _nPos) const = 0;
virtual bool isParameterOptional(sal_uInt32 _nPos) const = 0;
protected:
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 6fe77efb0049..595ddb63fc5a 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -44,7 +44,7 @@ public:
inline sal_uInt16 GetEdFocus() const { return nEdFocus; }
inline const String& GetUndoStr() const { return aUndoStr; }
inline sal_Bool GetMatrixFlag()const{ return bMatrix;}
- inline rtl::OString GetUniqueId()const { return aUniqueId;}
+ inline OString GetUniqueId()const { return aUniqueId;}
inline const Selection& GetSelection()const { return aSelection;}
inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
@@ -55,7 +55,7 @@ public:
inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; }
inline void SetMatrixFlag(sal_Bool bNew) { bMatrix=bNew;}
- inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;}
+ inline void SetUniqueId(const OString nNew) { aUniqueId=nNew;}
inline void SetSelection(const Selection& aSel) { aSelection=aSel;}
protected:
void Reset();
@@ -72,7 +72,7 @@ private:
sal_uInt16 nEdFocus;
String aUndoStr;
sal_Bool bMatrix;
- rtl::OString aUniqueId;
+ OString aUniqueId;
Selection aSelection;
};
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 666750f64857..5a55f5ca81d1 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -68,7 +68,7 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( sal_Bool bForced = sal_False );
- void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
+ void SetFocusWin(Window *pWin,const OString& nUniqueId);
void SetMeText(const String& _sText);
void Update();
@@ -112,7 +112,7 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( sal_Bool bForced = sal_False );
- void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
+ void SetFocusWin(Window *pWin,const OString& nUniqueId);
void HighlightFunctionParas(const String& aFormula);
void SetMeText(const String& _sText);
diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx
index da67a85f890c..27c9b6683964 100644
--- a/formula/inc/formula/formulahelper.hxx
+++ b/formula/inc/formula/formulahelper.hxx
@@ -51,7 +51,7 @@ namespace formula
xub_StrLen& rFStart, // Ein- und Ausgabe
xub_StrLen* pFEnd = NULL,
const IFunctionDescription** ppFDesc = NULL,
- ::std::vector< ::rtl::OUString>* pArgs = NULL ) const;
+ ::std::vector< OUString>* pArgs = NULL ) const;
xub_StrLen GetFunctionStart( const String& rFormula, xub_StrLen nStart,
sal_Bool bBack, String* pFuncName = NULL ) const;
@@ -61,7 +61,7 @@ namespace formula
xub_StrLen GetArgStart ( const String& rFormula, xub_StrLen nStart,
sal_uInt16 nArg ) const;
- void GetArgStrings ( ::std::vector< ::rtl::OUString >& _rArgs,
+ void GetArgStrings ( ::std::vector< OUString >& _rArgs,
const String& rFormula,
xub_StrLen nFuncPos,
sal_uInt16 nArgs ) const;
@@ -69,7 +69,7 @@ namespace formula
void FillArgStrings ( const String& rFormula,
xub_StrLen nFuncPos,
sal_uInt16 nArgs,
- ::std::vector< ::rtl::OUString >& _rArgs ) const;
+ ::std::vector< OUString >& _rArgs ) const;
};
// =============================================================================
} // formula
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 3e990cbbe92e..514d11caf14e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -183,12 +183,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = rtl::OUString(",");
+ rStr = OUString(",");
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = rtl::OUString(";");
+ rStr = OUString(";");
return true;
}
}
@@ -197,12 +197,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = rtl::OUString(",");
+ rStr = OUString(",");
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = rtl::OUString(";");
+ rStr = OUString(";");
return true;
}
}
@@ -211,12 +211,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = rtl::OUString(";");
+ rStr = OUString(";");
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = rtl::OUString("|");
+ rStr = OUString("|");
return true;
}
}
@@ -265,13 +265,13 @@ void FormulaCompiler::OpCodeMap::putExternalSoftly( const String & rSymbol, cons
if (bOk)
mpExternalHashMap->insert( ExternalHashMap::value_type( rSymbol, rAddIn));
}
-uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler,const uno::Sequence< ::rtl::OUString >& rNames ) const
+uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler,const uno::Sequence< OUString >& rNames ) const
{
const sal_Int32 nLen = rNames.getLength();
uno::Sequence< sheet::FormulaToken > aTokens( nLen);
sheet::FormulaToken* pToken = aTokens.getArray();
- ::rtl::OUString const * pName = rNames.getConstArray();
- ::rtl::OUString const * const pStop = pName + nLen;
+ OUString const * pName = rNames.getConstArray();
+ OUString const * const pStop = pName + nLen;
for ( ; pName < pStop; ++pName, ++pToken)
{
OpCodeHashMap::const_iterator iLook( mpHashMap->find( *pName));
@@ -279,7 +279,7 @@ uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceO
pToken->OpCode = (*iLook).second;
else
{
- ::rtl::OUString aIntName;
+ OUString aIntName;
if (hasExternals())
{
ExternalHashMap::const_iterator iExt( mpExternalHashMap->find( *pName));
@@ -461,7 +461,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
{
FormulaOpCodeMapEntry aEntry;
aEntry.Name = (*it).first;
- aEntry.Token.Data <<= ::rtl::OUString( (*it).second);
+ aEntry.Token.Data <<= OUString( (*it).second);
aEntry.Token.OpCode = ocExternal;
aVec.push_back( aEntry);
}
@@ -485,10 +485,10 @@ void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eO
DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) ||
(eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) ||
(eOp == ocArrayRowSep),
- rtl::OStringBuffer(
+ OStringBuffer(
RTL_CONSTASCII_STRINGPARAM("OpCodeMap::putOpCode: reusing OpCode ")).
append(sal_Int32(eOp)).append(RTL_CONSTASCII_STRINGPARAM(" (")).
- append(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US)).
+ append(OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US)).
append(')').getStr());
mpTable[eOp] = rStr;
mpHashMap->insert( OpCodeHashMap::value_type( rStr, eOp));
@@ -595,7 +595,7 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::CreateOpCodeMap(
xMap->putOpCode( pArr2->Name, eOp);
else
{
- ::rtl::OUString aExternalName;
+ OUString aExternalName;
if (pArr2->Token.Data >>= aExternalName)
xMap->putExternal( pArr2->Name, aExternalName);
else
@@ -672,9 +672,9 @@ void FormulaCompiler::InitSymbolsEnglishXL() const
// TODO: For now, just replace the separators to the Excel English
// variants. Later, if we want to properly map Excel functions with Calc
// functions, we'll need to do a little more work here.
- mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocSep);
- mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocArrayColSep);
- mxSymbolsEnglishXL->putOpCode(rtl::OUString(';'), ocArrayRowSep);
+ mxSymbolsEnglishXL->putOpCode(OUString(','), ocSep);
+ mxSymbolsEnglishXL->putOpCode(OUString(','), ocArrayColSep);
+ mxSymbolsEnglishXL->putOpCode(OUString(';'), ocArrayRowSep);
}
// -----------------------------------------------------------------------------
@@ -857,7 +857,7 @@ sal_uInt16 FormulaCompiler::GetErrorConstant( const String& rName ) const
}
-void FormulaCompiler::AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError )
+void FormulaCompiler::AppendErrorConstant( OUStringBuffer& rBuffer, sal_uInt16 nError )
{
OpCode eOp;
switch (nError)
@@ -1615,12 +1615,12 @@ void FormulaCompiler::PopTokenArray()
// -----------------------------------------------------------------------------
void FormulaCompiler::CreateStringFromTokenArray( String& rFormula )
{
- rtl::OUStringBuffer aBuffer( pArr->GetLen() * 5 );
+ OUStringBuffer aBuffer( pArr->GetLen() * 5 );
CreateStringFromTokenArray( aBuffer );
rFormula = aBuffer.makeStringAndClear();
}
-void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
+void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
{
rBuffer.setLength(0);
if( !pArr->GetLen() )
@@ -1655,13 +1655,13 @@ void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
// -----------------------------------------------------------------------------
FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP,bool bAllowArrAdvance )
{
- rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance );
rFormula += aBuffer.makeStringAndClear();
return p;
}
-FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP,bool bAllowArrAdvance )
+FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, FormulaToken* pTokenP,bool bAllowArrAdvance )
{
bool bNext = true;
bool bSpaces = false;
@@ -1792,7 +1792,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal )
+void FormulaCompiler::AppendDouble( OUStringBuffer& rBuffer, double fVal )
{
if ( mxSymbols->isEnglish() )
{
@@ -1811,12 +1811,12 @@ void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal )
}
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal )
+void FormulaCompiler::AppendBoolean( OUStringBuffer& rBuffer, bool bVal )
{
rBuffer.append( mxSymbols->getSymbol(static_cast<OpCode>(bVal ? ocTrue : ocFalse)) );
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr )
+void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const String & rStr )
{
rBuffer.append(sal_Unicode('"'));
if ( lcl_UnicodeStrChr( rStr.GetBuffer(), '"' ) == NULL )
@@ -1824,14 +1824,14 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
else
{
String aStr( rStr );
- aStr.SearchAndReplaceAll( rtl::OUString('"'), rtl::OUString("\"\"") );
+ aStr.SearchAndReplaceAll( OUString('"'), OUString("\"\"") );
rBuffer.append(aStr);
}
rBuffer.append(sal_Unicode('"'));
}
void FormulaCompiler::UpdateSeparatorsNative(
- const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep )
+ const OUString& rSep, const OUString& rArrayColSep, const OUString& rArrayRowSep )
{
NonConstOpCodeMapPtr xSymbolsNative;
lcl_fillNativeSymbols(xSymbolsNative);
@@ -1992,23 +1992,23 @@ bool FormulaCompiler::HandleDbData()
return true;
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
+void FormulaCompiler::CreateStringFromSingleRef(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
{
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::CreateStringFromDoubleRef(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
+void FormulaCompiler::CreateStringFromDoubleRef(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
{
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::CreateStringFromIndex(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
+void FormulaCompiler::CreateStringFromIndex(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
{
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::CreateStringFromMatrix(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
+void FormulaCompiler::CreateStringFromMatrix(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
{
}
// -----------------------------------------------------------------------------
-void FormulaCompiler::CreateStringFromExternal(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
+void FormulaCompiler::CreateStringFromExternal(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
{
}
// -----------------------------------------------------------------------------
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 3ae91cdafc09..d7bbaf4dcec6 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -29,7 +29,7 @@ namespace formula
// -----------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::findValue( getSupportedServiceNames_Static(), _rServiceName, sal_True ).getLength() != 0;
}
@@ -62,7 +62,7 @@ FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj()
::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >
SAL_CALL FormulaOpCodeMapperObj::getMappings(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames,
+ const ::com::sun::star::uno::Sequence< OUString >& rNames,
sal_Int32 nLanguage )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
@@ -86,24 +86,24 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
return xMap->createSequenceOfAvailableMappings( *m_pCompiler,nGroups);
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static()
+OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static()
{
- return rtl::OUString( "simple.formula.FormulaOpCodeMapperObj" );
+ return OUString( "simple.formula.FormulaOpCodeMapperObj" );
}
// --------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
-uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static()
+uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSeq( 1 );
- aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.FormulaOpCodeMapper" );
+ uno::Sequence< OUString > aSeq( 1 );
+ aSeq[0] = OUString( "com.sun.star.sheet.FormulaOpCodeMapper" );
return aSeq;
}
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 84180f02fcf1..b341cdc19253 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -305,7 +305,7 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter
break;
case uno::TypeClass_STRING:
{
- String aStrVal( _aToken.Data.get<rtl::OUString>() );
+ String aStrVal( _aToken.Data.get<OUString>() );
if ( eOpCode == ocPush )
AddString( aStrVal );
else if ( eOpCode == ocBad )
@@ -754,7 +754,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
FormulaToken* FormulaTokenArray::AddString( const sal_Unicode* pStr )
{
- return AddString( rtl::OUString( pStr ) );
+ return AddString( OUString( pStr ) );
}
FormulaToken* FormulaTokenArray::AddString( const String& rStr )
@@ -769,7 +769,7 @@ FormulaToken* FormulaTokenArray::AddDouble( double fVal )
FormulaToken* FormulaTokenArray::AddExternal( const sal_Unicode* pStr )
{
- return AddExternal( rtl::OUString( pStr ) );
+ return AddExternal( OUString( pStr ) );
}
FormulaToken* FormulaTokenArray::AddExternal( const String& rStr,
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 4c42c6bc4455..529b42a952b8 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -33,18 +33,18 @@ namespace formula
OEmptyFunctionDescription(){}
virtual ~OEmptyFunctionDescription(){}
- virtual ::rtl::OUString getFunctionName() const { return ::rtl::OUString(); }
+ virtual OUString getFunctionName() const { return OUString(); }
virtual const IFunctionCategory* getCategory() const { return NULL; }
- virtual ::rtl::OUString getDescription() const { return ::rtl::OUString(); }
+ virtual OUString getDescription() const { return OUString(); }
virtual xub_StrLen getSuppressedArgumentCount() const { return 0; }
- virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& ) const { return ::rtl::OUString(); }
+ virtual OUString getFormula(const ::std::vector< OUString >& ) const { return OUString(); }
virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {}
virtual void initArgumentInfo() const {}
- virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); }
- virtual rtl::OString getHelpId() const { return ""; }
+ virtual OUString getSignature() const { return OUString(); }
+ virtual OString getHelpId() const { return ""; }
virtual sal_uInt32 getParameterCount() const { return 0; }
- virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); }
- virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); }
+ virtual OUString getParameterName(sal_uInt32 ) const { return OUString(); }
+ virtual OUString getParameterDescription(sal_uInt32 ) const { return OUString(); }
virtual bool isParameterOptional(sal_uInt32 ) const { return sal_False; }
};
}
@@ -70,7 +70,7 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula,
xub_StrLen& rFStart, // Input and output
xub_StrLen* pFEnd, // = NULL
const IFunctionDescription** ppFDesc, // = NULL
- ::std::vector< ::rtl::OUString>* pArgs ) const // = NULL
+ ::std::vector< OUString>* pArgs ) const // = NULL
{
xub_StrLen nOldStart = rFStart;
String aFname;
@@ -86,7 +86,7 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula,
if ( ppFDesc )
{
*ppFDesc = NULL;
- const ::rtl::OUString sTemp( aFname );
+ const OUString sTemp( aFname );
const sal_uInt32 nCategoryCount = m_pFunctionManager->getCount();
for(sal_uInt32 j= 0; j < nCategoryCount && !*ppFDesc; ++j)
{
@@ -124,7 +124,7 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula,
void FormulaHelper::FillArgStrings( const String& rFormula,
xub_StrLen nFuncPos,
sal_uInt16 nArgs,
- ::std::vector< ::rtl::OUString >& _rArgs ) const
+ ::std::vector< OUString >& _rArgs ) const
{
xub_StrLen nStart = 0;
xub_StrLen nEnd = 0;
@@ -161,7 +161,7 @@ void FormulaHelper::FillArgStrings( const String& rFormula,
//------------------------------------------------------------------------
-void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
+void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs
,const String& rFormula,
xub_StrLen nFuncPos,
sal_uInt16 nArgs ) const
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 414c6fc23d13..df893f624b8c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -211,11 +211,11 @@ namespace formula
FormulaHelper
m_aFormulaHelper;
- rtl::OString m_aEditHelpId;
+ OString m_aEditHelpId;
- rtl::OString aOldHelp;
- rtl::OString aOldUnique;
- rtl::OString aActivWinId;
+ OString aOldHelp;
+ OString aOldUnique;
+ OString aActivWinId;
sal_Bool bIsShutDown;
Font aFntBold;
@@ -224,7 +224,7 @@ namespace formula
sal_Bool bEditFlag;
const IFunctionDescription* pFuncDesc;
xub_StrLen nArgs;
- ::std::vector< ::rtl::OUString > m_aArguments;
+ ::std::vector< OUString > m_aArguments;
Selection aFuncSel;
FormulaDlg_Impl(Dialog* pParent
@@ -433,10 +433,10 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM
m_aBinaryOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::BINARY_OPERATORS);
m_pBinaryOpCodesEnd = m_aBinaryOpCodes.getConstArray() + m_aBinaryOpCodes.getLength();
- uno::Sequence< ::rtl::OUString > aArgs(3);
- aArgs[TOKEN_OPEN] = ::rtl::OUString("(");
- aArgs[TOKEN_CLOSE] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
- aArgs[TOKEN_SEP] = ::rtl::OUString(";");
+ uno::Sequence< OUString > aArgs(3);
+ aArgs[TOKEN_OPEN] = OUString("(");
+ aArgs[TOKEN_CLOSE] = OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ aArgs[TOKEN_SEP] = OUString(";");
m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF);
m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::SPECIAL);
@@ -447,7 +447,7 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM
void FormulaDlg_Impl::DeleteArgs()
{
- ::std::vector< ::rtl::OUString>().swap(m_aArguments);
+ ::std::vector< OUString>().swap(m_aArguments);
nArgs = 0;
}
namespace
@@ -845,7 +845,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
aFtEditName.SetText( pFuncDesc->getFunctionName() );
aFtEditName.Show();
pParaWin->Show();
- const rtl::OString aHelpId = pFuncDesc->getHelpId();
+ const OString aHelpId = pFuncDesc->getHelpId();
if ( !aHelpId.isEmpty() )
pMEdit->SetHelpId(aHelpId);
}
@@ -936,7 +936,7 @@ void FormulaDlg_Impl::ClearAllParas()
}
String FormulaDlg_Impl::RepairFormula(const String& aFormula)
{
- rtl::OUString aResult('=');
+ OUString aResult('=');
try
{
UpdateTokenArray(aFormula);
@@ -1171,7 +1171,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
for(i=0;i<=nEd;i++)
{
if ( m_aArguments[i].isEmpty() )
- m_aArguments[i] = ::rtl::OUString(" ");
+ m_aArguments[i] = OUString(" ");
}
if(pParaWin->GetArgument(nEd).Len()!=0)
m_aArguments[nEd] = pParaWin->GetArgument(nEd);
@@ -1187,7 +1187,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
for(i=nClearPos;i<nArgs;i++)
{
- m_aArguments[i] = ::rtl::OUString();
+ m_aArguments[i] = OUString();
}
}
}
@@ -1696,7 +1696,7 @@ void FormulaModalDialog::RefInputDoneAfter( sal_Bool bForced )
m_pImpl->RefInputDoneAfter( bForced );
}
-void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
+void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId)
{
if(pWin->GetUniqueId()==nUniqueId)
{
@@ -1813,7 +1813,7 @@ void FormulaDlg::RefInputDoneAfter( sal_Bool bForced )
m_pImpl->RefInputDoneAfter( bForced );
}
-void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
+void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId)
{
if(pWin->GetUniqueId()==nUniqueId)
{
@@ -1885,7 +1885,7 @@ IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl)
if (pData) // won't be destroyed over Close;
{
m_pImpl->m_pHelper->setReferenceInput(pData);
- rtl::OString nUniqueId(pData->GetUniqueId());
+ OString nUniqueId(pData->GetUniqueId());
SetFocusWin(this,nUniqueId);
}
return 0;
@@ -1910,7 +1910,7 @@ void FormEditData::Reset()
nOffset = 0;
nEdFocus = 0;
bMatrix =sal_False;
- aUniqueId=rtl::OString();
+ aUniqueId=OString();
aSelection.Min()=0;
aSelection.Max()=0;
aUndoStr.Erase();
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 1b372557f102..7094994f1049 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -169,7 +169,7 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb )
const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() );
if ( pDesc )
{
- const rtl::OString sHelpId = pDesc->getHelpId();
+ const OString sHelpId = pDesc->getHelpId();
if ( !sHelpId.isEmpty() )
aLbFunction.SetHelpId(sHelpId);
}
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index bcd59f3c11ec..6a4a36ae8a5f 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -72,7 +72,7 @@ private:
m_pFunctionManager;
::std::vector< TFunctionDesc > aLRUList;
- rtl::OString m_aHelpId;
+ OString m_aHelpId;
void impl_addFunctions(const IFunctionCategory* _pCategory);
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 4c68e6d471fd..50a2d0ded967 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -313,7 +313,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
nArgs = pFuncDesc->getSuppressedArgumentCount();
pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping);
aSlider.Hide();
- rtl::OString sHelpId = pFuncDesc->getHelpId();
+ OString sHelpId = pFuncDesc->getHelpId();
SetHelpId( sHelpId );
aEdArg1.SetHelpId( sHelpId );
aEdArg2.SetHelpId( sHelpId );
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index c6fc4db1af8b..4619f98457a7 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -35,8 +35,6 @@
using namespace com::sun::star;
-using ::rtl::OUString;
-
class ControlHelper {
public:
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index 3827afedcf24..52e5c41b72f6 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -27,9 +27,9 @@
//for Cocoa types
@interface NSString (OOoAdditions)
-+ (id) stringWithOUString:(const rtl::OUString&)ouString;
-- (id) initWithOUString:(const rtl::OUString&)ouString;
-- (rtl::OUString) OUString;
++ (id) stringWithOUString:(const OUString&)ouString;
+- (id) initWithOUString:(const OUString&)ouString;
+- (OUString) OUString;
@end
#endif // _NSSTRING_OOOADDITIONS_HXX_
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index 6397a2561274..17c81520b33d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -143,7 +143,7 @@ CFileOpenDialog::~CFileOpenDialog()
//
//------------------------------------------------------------------------
-void SAL_CALL CFileOpenDialog::setTitle(const rtl::OUString& aTitle)
+void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle)
{
m_dialogTitle = aTitle;
m_ofn.lpstrTitle = reinterpret_cast<LPCTSTR>(m_dialogTitle.getStr());
@@ -153,7 +153,7 @@ void SAL_CALL CFileOpenDialog::setTitle(const rtl::OUString& aTitle)
//
//------------------------------------------------------------------------
-void CFileOpenDialog::setFilter(const rtl::OUString& aFilter)
+void CFileOpenDialog::setFilter(const OUString& aFilter)
{
// Format is like
// "*.TXT" or multiple separate by ';' like "*.TXT;*.DOC;*.SXW"
@@ -188,7 +188,7 @@ sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const
//
//------------------------------------------------------------------------
-void SAL_CALL CFileOpenDialog::setDefaultName(const rtl::OUString& aName)
+void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName)
{
m_fileNameBuffer.setLength(0);
m_fileNameBuffer.append(aName);
@@ -199,7 +199,7 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const rtl::OUString& aName)
//
//------------------------------------------------------------------------
-void SAL_CALL CFileOpenDialog::setDisplayDirectory(const rtl::OUString& aDirectory)
+void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory)
{
m_displayDirectory = aDirectory;
m_ofn.lpstrInitialDir = reinterpret_cast<LPCTSTR>(m_displayDirectory.getStr());
@@ -209,7 +209,7 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const rtl::OUString& aDirecto
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
+OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
{
return m_displayDirectory;
}
@@ -218,9 +218,9 @@ rtl::OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() const
+OUString SAL_CALL CFileOpenDialog::getFullFileName() const
{
- return rtl::OUString(m_fileNameBuffer.getStr(),
+ return OUString(m_fileNameBuffer.getStr(),
_wcslenex(m_fileNameBuffer.getStr()));
}
@@ -228,29 +228,29 @@ rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() const
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getFileName() const
+OUString SAL_CALL CFileOpenDialog::getFileName() const
{
- return rtl::OUString(m_fileTitleBuffer.getStr());
+ return OUString(m_fileTitleBuffer.getStr());
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-rtl::OUString CFileOpenDialog::getFileExtension()
+OUString CFileOpenDialog::getFileExtension()
{
if (m_ofn.nFileExtension)
- return rtl::OUString(m_fileNameBuffer.getStr() + m_ofn.nFileExtension,
+ return OUString(m_fileNameBuffer.getStr() + m_ofn.nFileExtension,
rtl_ustr_getLength(m_fileNameBuffer.getStr() + m_ofn.nFileExtension));
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-void CFileOpenDialog::setDefaultFileExtension(const rtl::OUString& aExtension)
+void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension)
{
m_defaultExtension = aExtension;
m_ofn.lpstrDefExt = reinterpret_cast<LPCTSTR>(m_defaultExtension.getStr());
@@ -340,7 +340,7 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)
// Attention: assuming that nFileOffset is always greater 0 because under
// Windows there is always a drive letter or a server in a complete path
// the OPENFILENAME docu never says that nFileOffset can be 0
- m_displayDirectory = rtl::OUString(reinterpret_cast<const sal_Unicode*>(m_ofn.lpstrFile),m_ofn.nFileOffset);
+ m_displayDirectory = OUString(reinterpret_cast<const sal_Unicode*>(m_ofn.lpstrFile),m_ofn.nFileOffset);
}
}
@@ -348,7 +348,7 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
+OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
{
OSL_ASSERT(IsWindow(m_hwndFileOpenDlg));
@@ -361,16 +361,16 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
if (nLen > 0)
{
m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
- return rtl::OUString(m_helperBuffer.getStr());
+ return OUString(m_helperBuffer.getStr());
}
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
+OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
{
OSL_ASSERT(IsWindow(m_hwndFileOpenDlg));
@@ -383,16 +383,16 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
if (nLen > 0)
{
m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
- return rtl::OUString(m_helperBuffer.getStr());
+ return OUString(m_helperBuffer.getStr());
}
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
+OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
{
OSL_ASSERT(IsWindow(m_hwndFileOpenDlg));
@@ -405,16 +405,16 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
if (nLen > 0)
{
m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
- return rtl::OUString(m_helperBuffer.getStr());
+ return OUString(m_helperBuffer.getStr());
}
- return rtl::OUString();
+ return OUString();
}
//------------------------------------------------------------------------
//
//------------------------------------------------------------------------
-sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const rtl::OUString&)
+sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&)
{
return 0;
}
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index bd335b73ccd1..94b0281faa0d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -142,11 +142,11 @@ public:
virtual ~CFileOpenDialog();
- virtual void SAL_CALL setTitle(const rtl::OUString& aTitle);
+ virtual void SAL_CALL setTitle(const OUString& aTitle);
// to set a filter string using the M$ format
// e.g. FltName\0*.txt;*.rtf\0...\0\0
- void SAL_CALL setFilter(const rtl::OUString& aFilter);
+ void SAL_CALL setFilter(const OUString& aFilter);
// set the index of the current filter when the
// dialog is about to shown, the index starts with 1
@@ -162,29 +162,29 @@ public:
// set the name and optional the path of the
// file that will be initially be shown when
// the dialog will be displayed
- virtual void SAL_CALL setDefaultName(const rtl::OUString& aName);
+ virtual void SAL_CALL setDefaultName(const OUString& aName);
// set the initial directory
- virtual void SAL_CALL setDisplayDirectory(const rtl::OUString& aDirectory);
+ virtual void SAL_CALL setDisplayDirectory(const OUString& aDirectory);
// returns only the path of the selected file
- virtual rtl::OUString SAL_CALL getLastDisplayDirectory() const;
+ virtual OUString SAL_CALL getLastDisplayDirectory() const;
// returns the full file name including drive letter, path
// file name and file extension
- virtual rtl::OUString SAL_CALL getFullFileName() const;
+ virtual OUString SAL_CALL getFullFileName() const;
// returns the file name and the file extension without
// drive letter and path
- rtl::OUString SAL_CALL getFileName() const;
+ OUString SAL_CALL getFileName() const;
// returns the file extension of the selected file
- rtl::OUString SAL_CALL getFileExtension();
+ OUString SAL_CALL getFileExtension();
// set a default extension, only the first three letters of
// the given extension will be used; the given extension
// should not contain a '.'
- void SAL_CALL setDefaultFileExtension(const rtl::OUString& aExtension);
+ void SAL_CALL setDefaultFileExtension(const OUString& aExtension);
// enables or disables the multiselection mode for
// the FileOpen/FileSave dialog
@@ -209,14 +209,14 @@ public:
// including path and drive information
// can be called only if the dialog is
// already displayed
- rtl::OUString SAL_CALL getCurrentFilePath() const;
+ OUString SAL_CALL getCurrentFilePath() const;
// retrievs the currently selected folder
- rtl::OUString SAL_CALL getCurrentFolderPath() const;
+ OUString SAL_CALL getCurrentFolderPath() const;
// retrievs the currently selected file name
// without drive and path
- rtl::OUString SAL_CALL getCurrentFileName() const;
+ OUString SAL_CALL getCurrentFileName() const;
protected:
// have to be overwritten when subclasses
@@ -234,7 +234,7 @@ protected:
virtual void SAL_CALL postModal(sal_Int16 nDialogResult);
// message handler, to be overwritten by subclasses
- virtual sal_uInt32 SAL_CALL onShareViolation(const rtl::OUString& aPathName);
+ virtual sal_uInt32 SAL_CALL onShareViolation(const OUString& aPathName);
virtual sal_uInt32 SAL_CALL onFileOk();
virtual void SAL_CALL onSelChanged(HWND hwndListBox);
virtual void SAL_CALL onHelp();
@@ -276,14 +276,14 @@ protected:
private:
// FileOpen or FileSaveDialog
bool m_bFileOpenDialog;
- rtl::OUString m_dialogTitle;
- rtl::OUString m_displayDirectory;
- rtl::OUString m_defaultExtension;
-
- mutable rtl::OUStringBuffer m_filterBuffer;
- mutable rtl::OUStringBuffer m_fileTitleBuffer;
- mutable rtl::OUStringBuffer m_helperBuffer;
- mutable rtl::OUStringBuffer m_fileNameBuffer;
+ OUString m_dialogTitle;
+ OUString m_displayDirectory;
+ OUString m_defaultExtension;
+
+ mutable OUStringBuffer m_filterBuffer;
+ mutable OUStringBuffer m_fileTitleBuffer;
+ mutable OUStringBuffer m_helperBuffer;
+ mutable OUStringBuffer m_fileNameBuffer;
CGetFileNameWrapper m_GetFileNameWrapper;
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index e8514093cb1f..8c98a07e15f3 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -53,11 +53,11 @@ namespace
const bool STARTUP_SUSPENDED = true;
const bool STARTUP_ALIVE = false;
- uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+ uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(2);
- aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+ uno::Sequence<OUString> aRet(2);
+ aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -93,7 +93,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
{
if ( rBHelper.bDisposed )
throw lang::DisposedException(
- rtl::OUString( "object is already disposed" ),
+ OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
if ( !rBHelper.bInDispose && !rBHelper.bDisposed )
@@ -109,7 +109,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
{
if ( rBHelper.bDisposed )
throw lang::DisposedException(
- rtl::OUString( "object is already disposed" ),
+ OUString( "object is already disposed" ),
static_cast< XFilePicker2* >( this ) );
rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
@@ -174,9 +174,9 @@ void SAL_CALL CFilePicker::dialogSizeChanged()
// If there are more then one listener the return value of the last one wins
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
+OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
{
- rtl::OUString aHelpText;
+ OUString aHelpText;
::cppu::OInterfaceContainerHelper* pICHelper =
rBHelper.getContainer( getCppuType((uno::Reference<XFilePickerListener>*)0));
@@ -195,7 +195,7 @@ rtl::OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
overwrittes the one before if it is not empty
*/
- rtl::OUString temp;
+ OUString temp;
uno::Reference<XFilePickerListener> xFPListener(iter.next(), uno::UNO_QUERY);
if (xFPListener.is())
@@ -267,7 +267,7 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setTitle(const rtl::OUString& aTitle) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -278,7 +278,7 @@ void SAL_CALL CFilePicker::setTitle(const rtl::OUString& aTitle) throw(uno::Runt
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::appendFilter(const rtl::OUString& aTitle, const rtl::OUString& aFilter)
+void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter)
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -290,7 +290,7 @@ void SAL_CALL CFilePicker::appendFilter(const rtl::OUString& aTitle, const rtl::
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setCurrentFilter(const rtl::OUString& aTitle)
+void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -302,7 +302,7 @@ void SAL_CALL CFilePicker::setCurrentFilter(const rtl::OUString& aTitle)
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -313,7 +313,7 @@ rtl::OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeExcepti
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::appendFilterGroup(const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
+void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -325,7 +325,7 @@ void SAL_CALL CFilePicker::appendFilterGroup(const rtl::OUString& sGroupTitle, c
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)
+void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -337,7 +337,7 @@ void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName)
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setDisplayDirectory(const rtl::OUString& aDirectory)
+void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -349,7 +349,7 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const rtl::OUString& aDirectory)
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -360,7 +360,7 @@ rtl::OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeExce
//
//-----------------------------------------------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
@@ -370,22 +370,22 @@ uno::Sequence<rtl::OUString> SAL_CALL CFilePicker::getFiles() throw(uno::Runtime
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
osl::MutexGuard aGuard(m_aMutex);
- const uno::Sequence< ::rtl::OUString > lSource = m_pImpl->getFiles();
+ const uno::Sequence< OUString > lSource = m_pImpl->getFiles();
const ::sal_Int32 c = lSource.getLength();
if (c < 2)
return lSource;
- const ::rtl::OUString sPath = lSource[0];
- ::comphelper::SequenceAsVector< ::rtl::OUString > lTarget;
+ const OUString sPath = lSource[0];
+ ::comphelper::SequenceAsVector< OUString > lTarget;
::sal_Int32 i = 1;
for (i=1; i<c; ++i)
{
- const ::rtl::OUString sFile = lSource[i];
+ const OUString sFile = lSource[i];
if (sFile.indexOf ('/') > 0)
{
// a) file contains own path !
@@ -394,7 +394,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL CFilePicker::getSelectedFiles() throw
else
{
// b) file is relative to given path
- ::rtl::OUStringBuffer sFull(256);
+ OUStringBuffer sFull(256);
sFull.append (sPath);
sFull.appendAscii("/" );
@@ -432,7 +432,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
OSL_FAIL("Could not start event notifier thread!");
throw uno::RuntimeException(
- rtl::OUString("Error executing dialog"),
+ OUString("Error executing dialog"),
static_cast<XFilePicker2*>(this));
}
@@ -482,7 +482,7 @@ throw(uno::RuntimeException)
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const ::rtl::OUString& aLabel)
+void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel)
throw (uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -495,7 +495,7 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const ::rtl::OUString&
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
+OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
throw (uno::RuntimeException)
{
OSL_ASSERT(0 != m_pImpl.get());
@@ -600,7 +600,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
uno::Any aAny;
if ( 0 == aArguments.getLength( ) )
throw lang::IllegalArgumentException(
- rtl::OUString( "no arguments" ),
+ OUString( "no arguments" ),
static_cast<XFilePicker2*>(this), 1);
aAny = aArguments[0];
@@ -608,7 +608,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
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;
@@ -670,7 +670,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
default:
throw lang::IllegalArgumentException(
- rtl::OUString( "Unknown template" ),
+ OUString( "Unknown template" ),
static_cast< XFilePicker2* >( this ),
1 );
}
@@ -707,20 +707,20 @@ void SAL_CALL CFilePicker::cancel()
// XServiceInfo
// -------------------------------------------------
-rtl::OUString SAL_CALL CFilePicker::getImplementationName()
+OUString SAL_CALL CFilePicker::getImplementationName()
throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
}
// -------------------------------------------------
// XServiceInfo
// -------------------------------------------------
-sal_Bool SAL_CALL CFilePicker::supportsService(const rtl::OUString& ServiceName)
+sal_Bool SAL_CALL CFilePicker::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--;)
if (SupportedServicesNames[n] == ServiceName)
@@ -733,7 +733,7 @@ sal_Bool SAL_CALL CFilePicker::supportsService(const rtl::OUString& ServiceName)
// XServiceInfo
// -------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
throw(uno::RuntimeException)
{
return FilePicker_getSupportedServiceNames();
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 8791661f63db..2d81c34cc44a 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -83,7 +83,7 @@ public:
// 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( )
@@ -96,42 +96,42 @@ public:
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);
//------------------------------------------------------------------------------------
@@ -147,10 +147,10 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
throw(::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel )
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
throw (::com::sun::star::uno::RuntimeException);
//------------------------------------------------
@@ -196,13 +196,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);
//------------------------------------------------------------------------------------
@@ -211,7 +211,7 @@ public:
void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
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/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 315bbbabc34d..53d1e51f2c73 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -35,7 +35,6 @@
// namespace directives
//-------------------------------------------------------------------
-using ::rtl::OUString;
//-------------------------------------------------------------------------------------
// ctor
@@ -218,13 +217,13 @@ sal_Bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEnt
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL CFilterContainer::setCurrentFilter( const ::rtl::OUString& aName )
+void SAL_CALL CFilterContainer::setCurrentFilter( const OUString& aName )
{
m_sCurrentFilter = aName;
}
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL CFilterContainer::getCurrentFilter() const
+OUString SAL_CALL CFilterContainer::getCurrentFilter() const
{
return m_sCurrentFilter;
}
@@ -278,7 +277,7 @@ void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength
// e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
//-------------------------------------------------------------------
-rtl::OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
+OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
{
// calculate the required buffer size
sal_uInt32 reqBuffSize = _getTotalFilterLength( aFilterContainer );
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 306fb7192488..2ef15ac0b1ca 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -34,7 +34,7 @@ class CFilterContainer
public:
// defines a filter entry which is made of a name and a filter value
// e.g. 'Text *.txt'
- typedef std::pair< rtl::OUString, rtl::OUString > FILTER_ENTRY_T;
+ typedef std::pair< OUString, OUString > FILTER_ENTRY_T;
public:
explicit CFilterContainer( sal_Int32 initSize = 0 );
@@ -44,13 +44,13 @@ public:
// returns false if duplicates are not allowed and
// the filter is already in the container
sal_Bool SAL_CALL addFilter(
- const ::rtl::OUString& aName,
- const ::rtl::OUString& aFilter,
+ const OUString& aName,
+ const OUString& aFilter,
sal_Bool bAllowDuplicates = sal_False );
// delete the specified filter returns true on
// success and false if the filter was not found
- sal_Bool SAL_CALL delFilter( const ::rtl::OUString& aName );
+ sal_Bool SAL_CALL delFilter( const OUString& aName );
// the number of filter already added
sal_Int32 SAL_CALL numFilter( );
@@ -61,12 +61,12 @@ public:
// retrieve a filter from the container both methods
// return true on success and false if the specified
// filter was not found
- sal_Bool SAL_CALL getFilter( const ::rtl::OUString& aName, ::rtl::OUString& theFilter ) const;
- sal_Bool SAL_CALL getFilter( sal_Int32 aIndex, ::rtl::OUString& theFilter ) const;
+ sal_Bool SAL_CALL getFilter( const OUString& aName, OUString& theFilter ) const;
+ sal_Bool SAL_CALL getFilter( sal_Int32 aIndex, OUString& theFilter ) const;
// returns the position of the specified filter or -1
// if the filter was not found
- sal_Int32 SAL_CALL getFilterPos( const ::rtl::OUString& aName ) const;
+ sal_Int32 SAL_CALL getFilterPos( const OUString& aName ) const;
// starts enumerating the filter in the container
void SAL_CALL beginEnumFilter( );
@@ -75,10 +75,10 @@ public:
sal_Bool SAL_CALL getNextFilter( FILTER_ENTRY_T& nextFilterEntry );
// cache current filter
- void SAL_CALL setCurrentFilter( const ::rtl::OUString& aName );
+ void SAL_CALL setCurrentFilter( const OUString& aName );
// returns cached current filter
- ::rtl::OUString SAL_CALL getCurrentFilter() const;
+ OUString SAL_CALL getCurrentFilter() const;
protected:
typedef std::vector< FILTER_ENTRY_T > FILTER_VECTOR_T;
@@ -88,13 +88,13 @@ private:
CFilterContainer( const CFilterContainer& );
CFilterContainer& SAL_CALL operator=( const CFilterContainer& );
- sal_Int32 SAL_CALL getFilterTagPos( const ::rtl::OUString& aName ) const;
+ sal_Int32 SAL_CALL getFilterTagPos( const OUString& aName ) const;
private:
FILTER_VECTOR_T m_vFilters;
FILTER_VECTOR_T::const_iterator m_iter;
sal_Bool m_bIterInitialized;
- ::rtl::OUString m_sCurrentFilter;
+ OUString m_sCurrentFilter;
};
//----------------------------------------------------------------
@@ -102,7 +102,7 @@ private:
// the Win32 API requires, e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
//----------------------------------------------------------------
-rtl::OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer );
+OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer );
#endif
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 43eee4a49672..bc37fbad9666 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -402,7 +402,7 @@ sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow )
// occurred (the file in not there or not accessible etc.)
//---------------------------------------------------
-sal_Bool SAL_CALL CFilePreview::update( const rtl::OUString& aFileName )
+sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName )
{
OSL_PRECOND( IsWindow( m_hwnd ), "Preview window not initialized" );
@@ -484,7 +484,7 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC )
//
//---------------------------------------------------
-sal_Bool CFilePreview::loadFile( const rtl::OUString& aFileName )
+sal_Bool CFilePreview::loadFile( const OUString& aFileName )
{
HANDLE hFile = 0;
HGLOBAL hGlobal = 0;
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index d543bb07971d..f7d7177464da 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -140,7 +140,7 @@ public:
// preview of the given file will be shown
// returns true on success or false if an error
// occurred (the file in not there or not accessible etc.)
- virtual sal_Bool SAL_CALL update( const rtl::OUString& aFileName );
+ virtual sal_Bool SAL_CALL update( const OUString& aFileName );
protected:
// clients can create instances only through the static create method
@@ -162,7 +162,7 @@ protected:
protected:
virtual void SAL_CALL onPaint( HWND hWnd, HDC hDC );
- sal_Bool loadFile( const rtl::OUString& aFileName );
+ sal_Bool loadFile( const OUString& aFileName );
private:
CAutoOleInit m_autoOleInit;
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index ce5165594641..77a86181d5ae 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -72,11 +72,11 @@ namespace
const bool STARTUP_SUSPENDED = true;
const bool STARTUP_ALIVE = false;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
+ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = ::rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+ css::uno::Sequence< OUString > aRet(2);
+ aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
return aRet;
}
}
@@ -137,7 +137,7 @@ void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode)
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setTitle(const ::rtl::OUString& sTitle)
+void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -148,8 +148,8 @@ void SAL_CALL VistaFilePicker::setTitle(const ::rtl::OUString& sTitle)
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::appendFilter(const ::rtl::OUString& sTitle ,
- const ::rtl::OUString& sFilter)
+void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
+ const OUString& sFilter)
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
@@ -162,7 +162,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const ::rtl::OUString& sTitle ,
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setCurrentFilter(const ::rtl::OUString& sTitle)
+void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
@@ -174,7 +174,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const ::rtl::OUString& sTitle)
}
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getCurrentFilter()
+OUString SAL_CALL VistaFilePicker::getCurrentFilter()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -182,12 +182,12 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const ::rtl::OUString& sTitle)
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, ::rtl::OUString());
+ const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
return sTitle;
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::appendFilterGroup(const ::rtl::OUString& /*sGroupTitle*/,
+void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString& /*sGroupTitle*/,
const css::uno::Sequence< css::beans::StringPair >& rFilters )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
@@ -200,7 +200,7 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const ::rtl::OUString&
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setDefaultName(const ::rtl::OUString& sName )
+void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -211,13 +211,13 @@ void SAL_CALL VistaFilePicker::setDefaultName(const ::rtl::OUString& sName )
}
//-----------------------------------------------------------------------------------------
-void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirectory)
+void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
- const ::rtl::OUString aPackage("org.openoffice.Office.Common/");
- const ::rtl::OUString aRelPath("Path/Info");
- const ::rtl::OUString aKey("WorkPathChanged");
+ const OUString aPackage("org.openoffice.Office.Common/");
+ const OUString aRelPath("Path/Info");
+ const OUString aKey("WorkPathChanged");
css::uno::Any aValue = ::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(m_xSMGR), aPackage, aRelPath, aKey, ::comphelper::ConfigurationHelper::E_READONLY);
@@ -238,20 +238,20 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec
}
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
+OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
- const ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+ const OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
return sDirectory;
}
//-----------------------------------------------------------------------------------------
// @deprecated cant be supported any longer ... see IDL description for further details
-css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getFiles()
+css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -259,13 +259,13 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getFiles()
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const css::uno::Sequence< ::rtl::OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< ::rtl::OUString >());
+ const css::uno::Sequence< OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< OUString >());
m_lLastFiles = lFiles;
return lFiles;
}
//-----------------------------------------------------------------------------------------
-css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
+css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
throw(css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -273,7 +273,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSelectedFiles
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const css::uno::Sequence< ::rtl::OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< ::rtl::OUString >());
+ const css::uno::Sequence< OUString > lFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES, css::uno::Sequence< OUString >());
m_lLastFiles = lFiles;
return lFiles;
}
@@ -303,7 +303,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSelectedFiles
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::PROCESS_MESSAGES);
const ::sal_Bool bOK = rRequest->getArgumentOrDefault(PROP_DIALOG_SHOW_RESULT, (::sal_Bool)sal_False );
- m_lLastFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES , css::uno::Sequence< ::rtl::OUString >());
+ m_lLastFiles = rRequest->getArgumentOrDefault(PROP_SELECTED_FILES , css::uno::Sequence< OUString >());
::sal_Int16 nResult = css::ui::dialogs::ExecutableDialogResults::CANCEL;
if (bOK)
@@ -368,7 +368,7 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
//-----------------------------------------------------------------------------------------
void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,
- const ::rtl::OUString& sLabel )
+ const OUString& sLabel )
throw (css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -383,7 +383,7 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,
//
//-----------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
+OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
throw (css::uno::RuntimeException)
{
RequestRef rRequest(new Request());
@@ -391,7 +391,7 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,
rRequest->setArgument(PROP_CONTROL_ID, nControlId);
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
- const ::rtl::OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, ::rtl::OUString());
+ const OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, OUString());
return sLabel;
}
@@ -476,7 +476,7 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
{
if (lArguments.getLength() < 1)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
static_cast< css::ui::dialogs::XFilePicker2* >( this ),
1);
@@ -603,20 +603,20 @@ void SAL_CALL VistaFilePicker::cancel()
// XServiceInfo
// -------------------------------------------------
-::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName()
+OUString SAL_CALL VistaFilePicker::getImplementationName()
throw(css::uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.fpicker.VistaFileDialog");
+ return OUString("com.sun.star.comp.fpicker.VistaFileDialog");
}
// -------------------------------------------------
// XServiceInfo
// -------------------------------------------------
-sal_Bool SAL_CALL VistaFilePicker::supportsService(const ::rtl::OUString& sServiceName)
+sal_Bool SAL_CALL VistaFilePicker::supportsService(const OUString& sServiceName)
throw(css::uno::RuntimeException )
{
- css::uno::Sequence< ::rtl::OUString > lSupportedServicesNames = VistaFilePicker_getSupportedServiceNames();
+ css::uno::Sequence< OUString > lSupportedServicesNames = VistaFilePicker_getSupportedServiceNames();
for (sal_Int32 n = lSupportedServicesNames.getLength(); n--;)
if (lSupportedServicesNames[n] == sServiceName)
@@ -629,7 +629,7 @@ sal_Bool SAL_CALL VistaFilePicker::supportsService(const ::rtl::OUString& sServi
// XServiceInfo
// -------------------------------------------------
-css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
throw(css::uno::RuntimeException)
{
return VistaFilePicker_getSupportedServiceNames();
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 0986838bb688..5728a7c81993 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -85,7 +85,7 @@ public:
// XExecutableDialog functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle )
+ virtual void SAL_CALL setTitle( const OUString& sTitle )
throw( css::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute( )
@@ -98,47 +98,47 @@ public:
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
throw( css::uno::RuntimeException );
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString& sName )
+ virtual void SAL_CALL setDefaultName( const OUString& sName )
throw( css::uno::RuntimeException );
- virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& sDirectory )
+ virtual void SAL_CALL setDisplayDirectory( const OUString& sDirectory )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getDisplayDirectory( )
+ virtual OUString SAL_CALL getDisplayDirectory( )
throw( css::uno::RuntimeException );
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( )
+ virtual css::uno::Sequence< OUString > SAL_CALL getFiles( )
throw( css::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilePicker2 functions
//------------------------------------------------------------------------------------
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles( )
+ virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles( )
throw( css::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilterManager functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL appendFilter( const ::rtl::OUString& sTitle ,
- const ::rtl::OUString& sFilter )
+ virtual void SAL_CALL appendFilter( const OUString& sTitle ,
+ const OUString& sFilter )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
- virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& sTitle )
+ virtual void SAL_CALL setCurrentFilter( const OUString& sTitle )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getCurrentFilter( )
+ virtual OUString SAL_CALL getCurrentFilter( )
throw( css::uno::RuntimeException );
//------------------------------------------------------------------------------------
// XFilterGroupManager functions
//------------------------------------------------------------------------------------
- virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle,
+ virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle,
const css::uno::Sequence< css::beans::StringPair >& lFilters )
throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException );
@@ -161,10 +161,10 @@ public:
throw(css::uno::RuntimeException );
virtual void SAL_CALL setLabel( sal_Int16 nControlId,
- const ::rtl::OUString& sLabel )
+ const OUString& sLabel )
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
throw (css::uno::RuntimeException);
//------------------------------------------------
@@ -219,13 +219,13 @@ public:
// 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& 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);
/*
@@ -235,7 +235,7 @@ public:
void SAL_CALL fileSelectionChanged(const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL directoryChanged(const css::ui::dialogs::FilePickerEvent& aEvent );
- ::rtl::OUString SAL_CALL helpRequested(const css::ui::dialogs::FilePickerEvent& aEvent ) const;
+ OUString SAL_CALL helpRequested(const css::ui::dialogs::FilePickerEvent& aEvent ) const;
void SAL_CALL controlStateChanged(const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL dialogSizeChanged( );
@@ -260,7 +260,7 @@ public:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
//---------------------------------------------------------------------
- css::uno::Sequence< ::rtl::OUString > m_lLastFiles;
+ css::uno::Sequence< OUString > m_lLastFiles;
//---------------------------------------------------------------------
/** execute the COM dialog within a STA thread
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 772265059a36..3935ca298bb5 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -240,8 +240,8 @@ void VistaFilePickerEventHandler::stopListening()
}
}
-static const ::rtl::OUString PROP_CONTROL_ID("control_id");
-static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener");
+static const OUString PROP_CONTROL_ID("control_id");
+static const OUString PROP_PICKER_LISTENER("picker_listener");
//-----------------------------------------------------------------------------------------
class AsyncPickerEvents : public RequestHandler
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 95b12b3e805b..971955314bfc 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -63,7 +63,7 @@ namespace vista{
static const ::sal_Int16 INVALID_CONTROL_ID = -1;
static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
-typedef ::comphelper::SequenceAsVector< ::rtl::OUString > TStringList;
+typedef ::comphelper::SequenceAsVector< OUString > TStringList;
// Guids used for IFileDialog::SetClientGuid
static const GUID CLIENTID_FILEDIALOG_SIMPLE = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
@@ -77,10 +77,10 @@ static const GUID CLIENTID_FILEOPEN_PLAY = {0x32CFB147, 0xF5AE, 0x4F9
static const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
//-----------------------------------------------------------------------------
-::rtl::OUString lcl_getURLFromShellItem (IShellItem* pItem)
+OUString lcl_getURLFromShellItem (IShellItem* pItem)
{
LPOLESTR pStr = NULL;
- ::rtl::OUString sURL;
+ OUString sURL;
SIGDN eConversion = SIGDN_FILESYSPATH;
HRESULT hr = pItem->GetDisplayName ( eConversion, &pStr );
@@ -91,9 +91,9 @@ static const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46B
hr = pItem->GetDisplayName ( eConversion, &pStr );
if ( FAILED(hr) )
- return ::rtl::OUString();
+ return OUString();
- sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr));
+ sURL = OUString(reinterpret_cast<sal_Unicode*>(pStr));
}
else
{
@@ -313,8 +313,8 @@ void VistaFilePickerImpl::impl_sta_removeFilePickerListener(const RequestRef& rR
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)
{
- const ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, ::rtl::OUString());
- const ::rtl::OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, ::rtl::OUString());
+ const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
+ const OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -329,7 +329,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
rRequest->getArgumentOrDefault(PROP_FILTER_GROUP, css::uno::Sequence< css::beans::StringPair >());
// SYNCHRONIZED->
- ::rtl::OUString aEmpty;
+ OUString aEmpty;
::osl::ResettableMutexGuard aLock(m_aMutex);
if ( m_lFilters.numFilter() > 0 && aFilterGroup.getLength() > 0 )
@@ -347,7 +347,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_setCurrentFilter(const RequestRef& rRequest)
{
- const ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, ::rtl::OUString());
+ const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -370,7 +370,7 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
- ::rtl::OUString sTitle;
+ OUString sTitle;
::sal_Int32 nRealIndex = (nIndex-1); // COM dialog base on 1 ... filter container on 0 .-)
if (
(nRealIndex >= 0 ) &&
@@ -479,7 +479,7 @@ static const ::sal_Int32 GROUP_CHECKBOXES = 4;
//-------------------------------------------------------------------------------
static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogCustomize iCustom, sal_uInt16 nControlId)
{
- ::rtl::OUString aLabel = rResourceProvider.getResString(nControlId);
+ OUString aLabel = rResourceProvider.getResString(nControlId);
aLabel = SOfficeToWindowsLabel(aLabel);
iCustom->SetControlLabel(nControlId, reinterpret_cast<LPCWSTR>(aLabel.getStr()) );
}
@@ -639,7 +639,7 @@ void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequ
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
{
- ::rtl::OUString sTitle = rRequest->getArgumentOrDefault(PROP_TITLE, ::rtl::OUString());
+ OUString sTitle = rRequest->getArgumentOrDefault(PROP_TITLE, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -653,7 +653,7 @@ void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
{
- ::rtl::OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+ OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -667,7 +667,7 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)
{
- ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString());
+ OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString());
if( !m_bInExecute)
{
@@ -704,7 +704,7 @@ void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)
HRESULT hResult = iDialog->GetFolder( &pFolder );
if ( FAILED(hResult) )
return;
- ::rtl::OUString sFolder = lcl_getURLFromShellItem ( pFolder );
+ OUString sFolder = lcl_getURLFromShellItem ( pFolder );
if( sFolder.getLength())
rRequest->setArgument( PROP_DIRECTORY, sFolder );
}
@@ -712,7 +712,7 @@ void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)
//-------------------------------------------------------------------------------
void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)
{
- ::rtl::OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+ OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
TFileDialog iDialog = impl_getBaseDialogInterface();
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -741,7 +741,7 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
::osl::ResettableMutexGuard aLock(m_aMutex);
::std::vector< COMDLG_FILTERSPEC > lFilters = lcl_buildFilterList(m_lFilters);
- ::rtl::OUString sCurrentFilter = m_lFilters.getCurrentFilter();
+ OUString sCurrentFilter = m_lFilters.getCurrentFilter();
sal_Int32 nCurrentFilter = m_lFilters.getFilterPos(sCurrentFilter);
TFileDialog iDialog = impl_getBaseDialogInterface();
TFileDialogCustomize iCustomize = impl_getCustomizeInterface();
@@ -818,7 +818,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
TStringList lFiles;
if (iItem.is())
{
- const ::rtl::OUString sURL = lcl_getURLFromShellItem(iItem);
+ const OUString sURL = lcl_getURLFromShellItem(iItem);
if (sURL.getLength() > 0)
lFiles.push_back(sURL);
}
@@ -834,7 +834,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
hResult = iItems->GetItemAt(i, &iItem);
if ( SUCCEEDED(hResult) )
{
- const ::rtl::OUString sURL = lcl_getURLFromShellItem(iItem);
+ const OUString sURL = lcl_getURLFromShellItem(iItem);
if (sURL.getLength() > 0)
lFiles.push_back(sURL);
}
@@ -882,10 +882,10 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
{
if (m_sFilename.getLength())
{
- ::rtl::OUString aFileURL(m_sDirectory);
+ OUString aFileURL(m_sDirectory);
sal_Int32 nIndex = aFileURL.lastIndexOf('/');
if (nIndex != aFileURL.getLength()-1)
- aFileURL += ::rtl::OUString("/");
+ aFileURL += OUString("/");
aFileURL += m_sFilename;
TFileDialogCustomize iCustom = impl_getCustomizeInterface();
@@ -909,7 +909,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
}
// Check existence of file. Set folder only for this special case
- ::rtl::OUString aSystemPath;
+ OUString aSystemPath;
osl_getSystemPathFromFileURL( aFileURL.pData, &aSystemPath.pData );
WIN32_FIND_DATA aFindFileData;
@@ -1062,11 +1062,11 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)
case css::ui::dialogs::ControlActions::ADD_ITEMS :
{
- css::uno::Sequence< ::rtl::OUString > lItems;
+ css::uno::Sequence< OUString > lItems;
aValue >>= lItems;
for (::sal_Int32 i=0; i<lItems.getLength(); ++i)
{
- const ::rtl::OUString& sItem = lItems[i];
+ const OUString& sItem = lItems[i];
hResult = iCustom->AddControlItem(nId, i, reinterpret_cast<LPCTSTR>(sItem.getStr()));
}
}
@@ -1130,7 +1130,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)
{
::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );
- ::rtl::OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, ::rtl::OUString() );
+ OUString sLabel = rRequest->getArgumentOrDefault(PROP_CONTROL_LABEL, OUString() );
// dont check for right values here ...
// most parameters are optional !
@@ -1168,12 +1168,12 @@ void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)
iCustom->SetControlState(nId, eState);
}
//-------------------------------------------------------------------------------
-void VistaFilePickerImpl::impl_SetDefaultExtension( const rtl::OUString& currentFilter )
+void VistaFilePickerImpl::impl_SetDefaultExtension( const OUString& currentFilter )
{
TFileDialog iDialog = impl_getBaseDialogInterface();
if (currentFilter.getLength())
{
- rtl::OUString FilterExt;
+ OUString FilterExt;
m_lFilters.getFilter(currentFilter, FilterExt);
sal_Int32 posOfPoint = FilterExt.indexOf(L'.');
@@ -1183,7 +1183,7 @@ void VistaFilePickerImpl::impl_SetDefaultExtension( const rtl::OUString& current
if (posOfSemiColon < 0)
posOfSemiColon = FilterExt.getLength() - 1;
- FilterExt = rtl::OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
+ FilterExt = OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
iDialog->SetDefaultExtension ( reinterpret_cast<LPCTSTR>(FilterExt.getStr()) );
}
}
@@ -1216,8 +1216,8 @@ void VistaFilePickerImpl::onAutoExtensionChanged (bool bChecked)
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
- const ::rtl::OUString sFilter = m_lFilters.getCurrentFilter ();
- ::rtl::OUString sExt ;
+ const OUString sFilter = m_lFilters.getCurrentFilter ();
+ OUString sExt ;
if ( !m_lFilters.getFilter (sFilter, sExt))
return;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 4279ab9b54e8..467922818e1c 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -74,26 +74,26 @@ static const ::sal_Int32 FEATURE_PLAY = 256;
static const ::sal_Int32 FEATURE_READONLY = 512;
static const ::sal_Int32 FEATURE_VERSION = 1024;
-static const ::rtl::OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert]
-static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
-static const ::rtl::OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!)
-static const ::rtl::OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString PROP_TITLE("title" ); // [OUString]
-static const ::rtl::OUString PROP_FILENAME("filename" ); // [OUString]
-static const ::rtl::OUString PROP_DIRECTORY("directory" ); // [OUString]
-static const ::rtl::OUString PROP_FEATURES("features" ); // [sal_Int32]
-static const ::rtl::OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
-static const ::rtl::OUString PROP_FILTER_TITLE("filter_title" ); // [OUString]
-static const ::rtl::OUString PROP_FILTER_VALUE("filter_value" ); // [OUString]
-static const ::rtl::OUString PROP_FORCE("force" ); // [sal_Bool]
-static const ::rtl::OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters
-
-static const ::rtl::OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_VALUE("control_value" ); // [Any]
-static const ::rtl::OUString PROP_CONTROL_LABEL("control_label" ); // [OUString]
-static const ::rtl::OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString STRING_SEPARATOR("------------------------------------------" );
+static const OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert]
+static const OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
+static const OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!)
+static const OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
+static const OUString PROP_TITLE("title" ); // [OUString]
+static const OUString PROP_FILENAME("filename" ); // [OUString]
+static const OUString PROP_DIRECTORY("directory" ); // [OUString]
+static const OUString PROP_FEATURES("features" ); // [sal_Int32]
+static const OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
+static const OUString PROP_FILTER_TITLE("filter_title" ); // [OUString]
+static const OUString PROP_FILTER_VALUE("filter_value" ); // [OUString]
+static const OUString PROP_FORCE("force" ); // [sal_Bool]
+static const OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters
+
+static const OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16]
+static const OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16]
+static const OUString PROP_CONTROL_VALUE("control_value" ); // [Any]
+static const OUString PROP_CONTROL_LABEL("control_label" ); // [OUString]
+static const OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF
+static const OUString STRING_SEPARATOR("------------------------------------------" );
//-----------------------------------------------------------------------------
/** native implementation of the file picker on Vista and upcoming windows versions.
@@ -282,7 +282,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
/// fill filter list of internal used dialog.
void impl_sta_setFiltersOnDialog();
- void impl_SetDefaultExtension( const rtl::OUString& currentFilter );
+ void impl_SetDefaultExtension( const OUString& currentFilter );
private:
@@ -309,7 +309,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
* Because the outside provided UNO API decouple showing the dialog
* and asking for results .-)
*/
- css::uno::Sequence< ::rtl::OUString > m_lLastFiles;
+ css::uno::Sequence< OUString > m_lLastFiles;
//---------------------------------------------------------------------
/** help us to handle dialog events and provide them to interested office
@@ -327,10 +327,10 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
HWND m_hParentWindow;
//
- ::rtl::OUString m_sDirectory;
+ OUString m_sDirectory;
//
- ::rtl::OUString m_sFilename;
+ OUString m_sFilename;
// Resource provider
CResourceProvider m_ResProvider;
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index d55a4eae29e2..f67291698e1a 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -109,16 +109,16 @@ CWinFileOpenImpl::~CWinFileOpenImpl()
// we expect the directory in URL format
//------------------------------------------------------------------------
-void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
+void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
throw( IllegalArgumentException, uno::RuntimeException )
{
- rtl::OUString aSysDirectory;
+ OUString aSysDirectory;
if( aDirectory.getLength() > 0)
{
if ( ::osl::FileBase::E_None !=
::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory))
throw IllegalArgumentException(
- rtl::OUString("Invalid directory"),
+ OUString("Invalid directory"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// we ensure that there is a trailing '/' at the end of
@@ -139,7 +139,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
// we return the directory in URL format
//------------------------------------------------------------------------
-rtl::OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
+OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
{
return m_FilePickerState->getDisplayDirectory(this);
}
@@ -148,7 +148,7 @@ rtl::OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeExceptio
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::setDefaultName(const rtl::OUString& aName)
+void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
throw( IllegalArgumentException, uno::RuntimeException )
{
// we don't set the default name directly
@@ -169,7 +169,7 @@ void SAL_CALL CWinFileOpenImpl::setDefaultName(const rtl::OUString& aName)
// the first entry is the path url, all other entries are file names
//-----------------------------------------------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL CWinFileOpenImpl::getFiles()
+uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()
throw(uno::RuntimeException)
{
return m_FilePickerState->getFiles(this);
@@ -189,7 +189,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)
rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
else
throw uno::RuntimeException(
- rtl::OUString("Error executing dialog"),
+ OUString("Error executing dialog"),
static_cast<XFilePicker2*>(m_FilePicker));
return rc;
@@ -201,14 +201,14 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)
// empty
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const rtl::OUString& aFilter)
+void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUString& aFilter)
throw(IllegalArgumentException, uno::RuntimeException)
{
sal_Bool bRet = m_filterContainer->addFilter(aTitle, aFilter);
if (!bRet)
throw IllegalArgumentException(
- rtl::OUString("filter already exists"),
+ OUString("filter already exists"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// #95345# see MSDN OPENFILENAME
@@ -226,14 +226,14 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const
// sets a current filter
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
+void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
throw( IllegalArgumentException, uno::RuntimeException)
{
sal_Int32 filterPos = m_filterContainer->getFilterPos(aTitle);
if (filterPos < 0)
throw IllegalArgumentException(
- rtl::OUString("filter doesn't exist"),
+ OUString("filter doesn't exist"),
static_cast<XFilePicker2*>(m_FilePicker), 1);
// filter index of the base class starts with 1
@@ -244,11 +244,11 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
// returns the currently selected filter
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
{
sal_uInt32 nIndex = getSelectedFilterIndex();
- rtl::OUString currentFilter;
+ OUString currentFilter;
if (nIndex > 0)
{
// filter index of the base class starts with 1
@@ -273,7 +273,7 @@ inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator()
// XFilterGroupManager
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
+void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
throw (IllegalArgumentException, uno::RuntimeException)
{
(void) sGroupTitle; // avoid warning
@@ -350,7 +350,7 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna
//
//-----------------------------------------------------------------------------------------
-void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const rtl::OUString& aLabel )
+void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel )
throw (uno::RuntimeException)
{
OSL_ASSERT(m_FilePickerState);
@@ -362,14 +362,14 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const rtl::OUStr
//
//-----------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
+OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
throw (uno::RuntimeException)
{
OSL_ASSERT(m_FilePickerState);
if ( !filterControlCommand( aControlId ))
return m_FilePickerState->getLabel(aControlId);
else
- return rtl::OUString();
+ return OUString();
}
//-----------------------------------------------------------------------------------------
@@ -570,7 +570,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
//-----------------------------------------
sal_Int16 aCtrlId = sal::static_int_cast< sal_Int16 >(GetDlgCtrlID(hWnd));
- rtl::OUString aLabel = m_ResProvider.getResString(aCtrlId);
+ OUString aLabel = m_ResProvider.getResString(aCtrlId);
if (aLabel.getLength())
setLabel(aCtrlId, aLabel);
}
@@ -872,7 +872,7 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)
FilePickerEvent evt;
evt.ElementId = sal::static_int_cast< sal_Int16 >(lphi->iCtrlId);
- rtl::OUString aPopupHelpText = m_FilePicker->helpRequested(evt);
+ OUString aPopupHelpText = m_FilePicker->helpRequested(evt);
if (aPopupHelpText.getLength())
{
@@ -941,7 +941,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
{
sal_uInt32 nIndex = getSelectedFilterIndex();
- rtl::OUString currentFilter;
+ OUString currentFilter;
if (nIndex > 0)
{
// filter index of the base class starts with 1
@@ -949,7 +949,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
if (currentFilter.getLength())
{
- rtl::OUString FilterExt;
+ OUString FilterExt;
m_filterContainer->getFilter(currentFilter, FilterExt);
sal_Int32 posOfPoint = FilterExt.indexOf(L'.');
@@ -959,7 +959,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
if (posOfSemiColon < 0)
posOfSemiColon = FilterExt.getLength() - 1;
- FilterExt = rtl::OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
+ FilterExt = OUString(pFirstExtStart, posOfSemiColon - posOfPoint);
SendMessage(m_hwndFileOpenDlg, CDM_SETDEFEXT, 0, reinterpret_cast<LPARAM>(FilterExt.getStr()));
}
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index d74b3eeead3f..b1be8a1dfbfa 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -65,35 +65,35 @@ public:
// XFilePicker
//-----------------------------------------------------------------------------------------
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName )
+ virtual void SAL_CALL setDefaultName( const OUString& aName )
throw( ::com::sun::star::lang::IllegalArgumentException, ::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 );
- 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( ) throw ( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getDisplayDirectory( ) throw ( ::com::sun::star::uno::RuntimeException );
//-----------------------------------------------------------------------------------------
// XFilterManager
//-----------------------------------------------------------------------------------------
- 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
//-----------------------------------------------------------------------------------------
- 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);
//-----------------------------------------------------------------------------------------
@@ -109,10 +109,10 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel )
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId )
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
throw ( ::com::sun::star::uno::RuntimeException);
//------------------------------------------------
@@ -203,7 +203,7 @@ private:
std::auto_ptr<CCustomControl> m_CustomControls;
CFilePicker* m_FilePicker;
WNDPROC m_pfnOldDlgProc;
- rtl::OUString m_defaultName;
+ OUString m_defaultName;
sal_Bool m_bInitialSelChanged;
CHelpPopupWindow m_HelpPopupWindow;
CFilePickerState* m_FilePickerState;
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index b20b65d020cc..1d7450c5e5ef 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -79,12 +79,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&
{
if ( m_rBroadcastHelper.bDisposed )
throw lang::DisposedException(
- ::rtl::OUString( "FilePicker is already disposed" ),
+ OUString( "FilePicker is already disposed" ),
uno::Reference< uno::XInterface >() );
if ( m_rBroadcastHelper.bInDispose )
throw lang::DisposedException(
- ::rtl::OUString( "FilePicker will be disposed now." ),
+ OUString( "FilePicker will be disposed now." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.addInterface( aType, xListener );
@@ -99,7 +99,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&
{
if ( m_rBroadcastHelper.bDisposed )
throw lang::DisposedException(
- ::rtl::OUString( "FilePicker is already disposed." ),
+ OUString( "FilePicker is already disposed." ),
uno::Reference< uno::XInterface >() );
m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 265259dbece1..6205b7ca8ae9 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -80,7 +80,7 @@ class Request
//---------------------------------------------------------------------
template< class TArgumentType >
- void setArgument(const ::rtl::OUString& sName ,
+ void setArgument(const OUString& sName ,
const TArgumentType& aValue)
{
m_lArguments[sName] <<= aValue;
@@ -88,7 +88,7 @@ class Request
//---------------------------------------------------------------------
template< class TArgumentType >
- TArgumentType getArgumentOrDefault(const ::rtl::OUString& sName ,
+ TArgumentType getArgumentOrDefault(const OUString& sName ,
const TArgumentType& aDefault)
{
return m_lArguments.getUnpackedValueOrDefault(sName, aDefault);
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index e9e5bc289f6a..65345b045b53 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -34,7 +34,6 @@
// namespace directives
//------------------------------------------------------------
-using rtl::OUString;
namespace // private
{
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index e68093d23723..33518470c5b4 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -183,7 +183,7 @@ sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const
CLabelControlCommand::CLabelControlCommand(
sal_Int16 aControlId,
- const rtl::OUString& aLabel ) :
+ const OUString& aLabel ) :
CControlCommand( aControlId ),
m_aLabel( aLabel )
{
@@ -239,7 +239,7 @@ CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCom
//
//---------------------------------------------
-rtl::OUString SAL_CALL CLabelControlCommand::getLabel( ) const
+OUString SAL_CALL CLabelControlCommand::getLabel( ) const
{
return m_aLabel;
}
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index 2c7ae2fd2363..01063ff901a8 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -99,16 +99,16 @@ class CLabelControlCommand : public CControlCommand
public:
CLabelControlCommand(
sal_Int16 aControlId,
- const rtl::OUString& aLabel );
+ const OUString& aLabel );
virtual void SAL_CALL exec( CFilePickerState* aFilePickerState );
virtual CControlCommandResult* SAL_CALL handleRequest( CControlCommandRequest* aRequest );
- rtl::OUString SAL_CALL getLabel( ) const;
+ OUString SAL_CALL getLabel( ) const;
private:
- rtl::OUString m_aLabel;
+ OUString m_aLabel;
};
//---------------------------------------------
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 983dd784cee3..2853ca9d73ba 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -78,19 +78,19 @@ private:
class CLabelCommandResult : public CControlCommandResult
{
public:
- CLabelCommandResult( sal_Bool bResult, const rtl::OUString& aLabel ) :
+ CLabelCommandResult( sal_Bool bResult, const OUString& aLabel ) :
CControlCommandResult( bResult ),
m_aLabel( aLabel )
{
}
- rtl::OUString SAL_CALL getLabel( ) const
+ OUString SAL_CALL getLabel( ) const
{
return m_aLabel;
}
private:
- rtl::OUString m_aLabel;
+ OUString m_aLabel;
};
#endif
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index e019fd0aac42..a760f112aeb4 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -36,7 +36,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
using ::com::sun::star::lang::IllegalArgumentException;
-using rtl::OUString;
//------------------------------------------------------------------------
//
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 991f15a1f51b..f178de583973 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -38,7 +38,6 @@
//
//---------------------------------------------
-using rtl::OUString;
using com::sun::star::uno::Any;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -152,7 +151,7 @@ void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, s
//
//---------------------------------------------
-void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel )
+void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel )
{
CLabelControlCommand* label_command = new CLabelControlCommand(
aControlId, aLabel );
@@ -207,9 +206,9 @@ OUString MatchFixBrokenPath(const OUString& path)
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
-static ::rtl::OUString trimTrailingSpaces(const ::rtl::OUString& rString)
+static OUString trimTrailingSpaces(const OUString& rString)
{
- rtl::OUString aResult(rString);
+ OUString aResult(rString);
sal_Int32 nIndex = rString.lastIndexOf(' ');
if (nIndex == rString.getLength()-1)
@@ -219,7 +218,7 @@ static ::rtl::OUString trimTrailingSpaces(const ::rtl::OUString& rString)
if (nIndex >= 0)
aResult = rString.copy(0,nIndex+1);
else
- aResult = ::rtl::OUString();
+ aResult = OUString();
}
return aResult;
}
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 5a250e2db4e0..414dd3360792 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -56,13 +56,13 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable ) = 0;
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel ) = 0;
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel ) = 0;
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId ) = 0;
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) = 0;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog ) = 0;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog ) = 0;
- virtual rtl::OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) = 0;
+ virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) = 0;
};
//---------------------------------------------
@@ -82,13 +82,13 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel );
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel );
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId );
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
+ virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
void SAL_CALL reset( );
@@ -116,13 +116,13 @@ public:
virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable );
- virtual void SAL_CALL setLabel( sal_Int16 aControlId, const ::rtl::OUString& aLabel );
+ virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel );
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 aControlId );
+ virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
+ virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
void SAL_CALL initFilePickerControls( CControlCommand* firstControlCommand );
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index c0f70a79ba23..732d3e01b920 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -25,7 +25,6 @@
//
//------------------------------------------------------------------------
-using rtl::OUString;
using osl::Mutex;
//------------------------------------------------------------------------
@@ -110,7 +109,7 @@ CHelpPopupWindow::~CHelpPopupWindow( )
//
//---------------------------------------------------
-void SAL_CALL CHelpPopupWindow::setText( const rtl::OUString& aHelpText )
+void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText )
{
m_HelpText = aHelpText;
}
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index 3e565c2f59cc..de52b916245f 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -74,7 +74,7 @@ public:
The client may set the text the window is showing
on next activation.
*/
- void SAL_CALL setText( const rtl::OUString& aHelpText );
+ void SAL_CALL setText( const OUString& aHelpText );
/*
Shows the window with the text that was last set.
@@ -111,7 +111,7 @@ private:
HWND m_hwndParent;
HINSTANCE m_hInstance;
sal_Bool m_bWndClassRegistered;
- ::rtl::OUString m_HelpText;
+ OUString m_HelpText;
HBITMAP m_hBitmapShadow;
HBRUSH m_hBrushShadow;
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 0488b4ed10a1..e20b7b0c9e6f 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -24,7 +24,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
//-------------------------------
//
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index d7dcd14d2e63..06c83efefd98 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -22,9 +22,9 @@
#include <rtl/ustring.hxx>
-const ::rtl::OUString BACKSLASH( "\\" );
-const ::rtl::OUString FILTER_SEPARATOR( "------------------------------------------" );
-const ::rtl::OUString ALL_FILES_WILDCARD( "*.*" );
+const OUString BACKSLASH( "\\" );
+const OUString FILTER_SEPARATOR( "------------------------------------------" );
+const OUString ALL_FILES_WILDCARD( "*.*" );
const ::sal_Bool ALLOW_DUPLICATES = sal_True;
#endif
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 2b889e39a552..2ea545867b24 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -35,7 +35,6 @@ using com::sun::star::lang::XMultiServiceFactory;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::lang::DisposedException;
using com::sun::star::lang::IllegalArgumentException;
-using rtl::OUString;
using osl::MutexGuard;
using namespace cppu;
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 3854de3aeb04..aa36dc6995ca 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -48,7 +48,7 @@ public:
// 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( )
@@ -58,29 +58,29 @@ public:
// XFolderPicker functions
//------------------------------------------------------------------------------------
- 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 rtl::OUString SAL_CALL getDirectory( )
+ virtual OUString SAL_CALL getDirectory( )
throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDescription( const rtl::OUString& aDescription )
+ virtual void SAL_CALL setDescription( const OUString& aDescription )
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/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index 71fb53653eea..10705cd4b795 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -27,7 +27,6 @@
#include <systools/win32/comtools.hxx>
-using rtl::OUString;
using osl::Condition;
const sal_uInt32 MSG_BROWSEFORFOLDER = WM_USER + 1;
@@ -341,7 +340,7 @@ OUString SAL_CALL CMtaFolderPicker::getDirectory( )
//
//--------------------------------------------------------------------
-void SAL_CALL CMtaFolderPicker::setDescription( const rtl::OUString& aDescription )
+void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription )
{
m_Description = aDescription;
}
@@ -429,7 +428,7 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
//
//--------------------------------------------------------------------
-LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const rtl::OUString& aDirectory )
+LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory )
{
// parameter checking
if ( !aDirectory.getLength( ) )
@@ -491,7 +490,7 @@ void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable )
//
//--------------------------------------------------------------------
-void SAL_CALL CMtaFolderPicker::setSelection( const rtl::OUString& aDirectory )
+void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory )
{
OSL_ASSERT( IsWindow( m_hwnd ) );
@@ -506,7 +505,7 @@ void SAL_CALL CMtaFolderPicker::setSelection( const rtl::OUString& aDirectory )
//
//--------------------------------------------------------------------
-void SAL_CALL CMtaFolderPicker::setStatusText( const rtl::OUString& aStatusText )
+void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText )
{
OSL_ASSERT( IsWindow( m_hwnd ) );
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index aebb156db50f..6824d41420a5 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -98,14 +98,14 @@ public:
// shell functions
sal_Bool SAL_CALL browseForFolder( );
- virtual void SAL_CALL setDisplayDirectory( const rtl::OUString& aDirectory );
- virtual rtl::OUString SAL_CALL getDisplayDirectory( );
- virtual rtl::OUString SAL_CALL getDirectory( );
+ virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory );
+ virtual OUString SAL_CALL getDisplayDirectory( );
+ virtual OUString SAL_CALL getDirectory( );
- virtual void SAL_CALL setDescription( const rtl::OUString& aDescription );
+ virtual void SAL_CALL setDescription( const OUString& aDescription );
- virtual void SAL_CALL setTitle( const rtl::OUString& aTitle );
- rtl::OUString SAL_CALL getTitle( );
+ virtual void SAL_CALL setTitle( const OUString& aTitle );
+ OUString SAL_CALL getTitle( );
//-----------------------------------------------------
// XCancellable
@@ -115,18 +115,18 @@ public:
protected:
void SAL_CALL enableOk( sal_Bool bEnable );
- void SAL_CALL setSelection( const rtl::OUString& aDirectory );
- void SAL_CALL setStatusText( const rtl::OUString& aStatusText );
+ void SAL_CALL setSelection( const OUString& aDirectory );
+ void SAL_CALL setStatusText( const OUString& aStatusText );
virtual void SAL_CALL onInitialized( );
- virtual void SAL_CALL onSelChanged( const rtl::OUString& aNewPath ) = 0;
+ virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) = 0;
private:
sal_uInt32 onValidateFailed();
// helper functions
- LPITEMIDLIST SAL_CALL getItemIdListFromPath( const rtl::OUString& aDirectory );
- rtl::OUString SAL_CALL getPathFromItemIdList( LPCITEMIDLIST lpItemIdList );
+ LPITEMIDLIST SAL_CALL getItemIdListFromPath( const OUString& aDirectory );
+ OUString SAL_CALL getPathFromItemIdList( LPCITEMIDLIST lpItemIdList );
void SAL_CALL releaseItemIdList( LPITEMIDLIST lpItemIdList );
unsigned int run( );
@@ -159,10 +159,10 @@ private:
unsigned m_uStaThreadId;
HANDLE m_hEvtThrdReady;
HWND m_hwndStaRequestWnd;
- rtl::OUString m_dialogTitle;
- rtl::OUString m_Description;
- rtl::OUString m_displayDir;
- rtl::OUString m_SelectedDir;
+ OUString m_dialogTitle;
+ OUString m_Description;
+ OUString m_displayDir;
+ OUString m_SelectedDir;
BROWSEINFOW m_bi;
CAutoPathBuff m_pathBuff;
HINSTANCE m_hInstance;
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index add1ee46da65..9cf282aa48d7 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -33,7 +33,6 @@
using com::sun::star::uno::RuntimeException;
using com::sun::star::lang::IllegalArgumentException;
using com::sun::star::lang::EventObject;
-using rtl::OUString;
using namespace com::sun::star::ui::dialogs;
using osl::FileBase;
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 77abfa2e2efd..1c87dfc59325 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -46,17 +46,17 @@ public:
// XFolderPicker
//-----------------------------------------------------
- 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 rtl::OUString SAL_CALL getDirectory( )
+ virtual OUString SAL_CALL getDirectory( )
throw( com::sun::star::uno::RuntimeException );
protected:
- virtual void SAL_CALL onSelChanged( const rtl::OUString& aNewPath );
+ virtual void SAL_CALL onSelChanged( const OUString& aNewPath );
private:
CFolderPicker* m_pFolderPicker;
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index 43e4bceba3e1..17162e3c479b 100644
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
@@ -32,7 +32,6 @@
// namespace directives
//------------------------------------------------------------------------
-using rtl::OUString;
//------------------------------------------------------------------------
//
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 403ab1cdeffc..5abdcb459e68 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -27,8 +27,6 @@
// namespace directives
//------------------------------------------------------------
-using rtl::OUString;
-using rtl::OUStringBuffer;
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -39,9 +37,9 @@ using ::com::sun::star::uno::Sequence;
//
//------------------------------------------------------------
-const rtl::OUString TILDE( "~" );
+const OUString TILDE( "~" );
const sal_Unicode TILDE_SIGN = L'~';
-const rtl::OUString AMPERSAND( "&" );
+const OUString AMPERSAND( "&" );
const sal_Unicode AMPERSAND_SIGN = L'&';
//------------------------------------------------------------
@@ -447,7 +445,7 @@ void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar,
// '&' -> '&&'
//------------------------------------------------------------
-OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
+OUString SOfficeToWindowsLabel( const OUString& aSOLabel )
{
OUString aWinLabel = aSOLabel;
@@ -459,7 +457,7 @@ OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
// doubled in length, maybe some waste
// of memory but how long is a label
// normaly(?)
- rtl::OUStringBuffer aBuffer( nStrLen * 2 );
+ OUStringBuffer aBuffer( nStrLen * 2 );
Replace( aWinLabel, TILDE_SIGN, AMPERSAND_SIGN, aBuffer );
@@ -478,7 +476,7 @@ OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
// '~' -> '~~'
//------------------------------------------------------------
-OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel )
+OUString WindowsToSOfficeLabel( const OUString& aWinLabel )
{
OUString aSOLabel = aWinLabel;
@@ -490,7 +488,7 @@ OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel )
// doubled in length, maybe some waste
// of memory but how long is a label
// normaly(?)
- rtl::OUStringBuffer aBuffer( nStrLen * 2 );
+ OUStringBuffer aBuffer( nStrLen * 2 );
Replace( aSOLabel, AMPERSAND_SIGN, TILDE_SIGN, aBuffer );
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 9c6a69ddab80..52ed28dd15ee 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -82,7 +82,7 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr );
// '~' -> '&'
// '~~' -> '~'
// '&' -> '&&'
-rtl::OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel );
+OUString SOfficeToWindowsLabel( const OUString& aSOLabel );
// converts a windows label to a soffice label
// the following rules for character replacements
@@ -90,7 +90,7 @@ rtl::OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel );
// '&' -> '~'
// '&&' -> '&'
// '~' -> '~~'
-rtl::OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel );
+OUString WindowsToSOfficeLabel( const OUString& aWinLabel );
#endif
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 4e4cc9e0a9e7..3cd22e602f37 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -32,7 +32,6 @@
// namespace directives
//------------------------------------------------------------
-using rtl::OUString;
using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 852b225bf30c..d02164faf37e 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -33,7 +33,7 @@ public:
CResourceProvider( );
~CResourceProvider( );
- rtl::OUString getResString( sal_Int16 aId );
+ OUString getResString( sal_Int16 aId );
private:
CResourceProvider_Impl* m_pImpl;
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 2e83bd4c04c2..19723a1366d9 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -70,7 +70,7 @@ String aEmptyStr;
SAL_IMPLEMENT_MAIN()
{
Reference< XMultiServiceFactory > xMS;
- xMS = cppu::createRegistryServiceFactory( rtl::OUString( "applicat.rdb" ), sal_True );
+ xMS = cppu::createRegistryServiceFactory( OUString( "applicat.rdb" ), sal_True );
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMSch;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext;
@@ -114,7 +114,7 @@ private:
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/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 116a18602fe7..853a433567bc 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -49,17 +49,17 @@ class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer,
virtual void SAL_CALL release() throw ();
// 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 )
+ 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< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
+ 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);
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 55e87c1a658f..042c311971ca 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -56,9 +56,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
virtual FWE_DLLPUBLIC void SAL_CALL release() throw ();
// XServiceInfo
- virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
// XTypeProvider
virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
@@ -92,7 +92,7 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
// helper
//---------------------------------------------------------------------------------------------------------
- sal_Bool impl_tryToChangeProperty( const rtl::OUString& aCurrentValue ,
+ sal_Bool impl_tryToChangeProperty( const OUString& aCurrentValue ,
const com::sun::star::uno::Any& aNewValue ,
com::sun::star::uno::Any& aOldValue ,
com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
@@ -111,9 +111,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
// members
//---------------------------------------------------------------------------------------------------------
- rtl::OUString m_aCommandURL;
- rtl::OUString m_aHelpURL;
- rtl::OUString m_aText;
+ OUString m_aCommandURL;
+ OUString m_aHelpURL;
+ OUString m_aText;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > m_xBitmap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xActionTriggerContainer;
};
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 44f035604aad..8788d43ecb1b 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -55,9 +55,9 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase
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/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index a50b6c8c525d..372fc9a13a0d 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -39,9 +39,9 @@ class FWI_DLLPUBLIC Converter
static css::uno::Sequence< css::beans::NamedValue > convert_seqPropVal2seqNamedVal ( const css::uno::Sequence< css::beans::PropertyValue >& lSource );
// Seq<String> => Vector<String>
- static OUStringList convert_seqOUString2OUStringList( const css::uno::Sequence< ::rtl::OUString >& lSource );
+ static OUStringList convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource );
- static ::rtl::OUString convert_DateTime2ISO8601 ( const DateTime& aSource );
+ static OUString convert_DateTime2ISO8601 ( const DateTime& aSource );
};
} // namespace framework
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index c4521d1aaa76..63cc2169c9e1 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -142,27 +142,27 @@ class FilterCache : private ThreadHelpBase
@onerror We return false.
*//*-*****************************************************************************************************/
- sal_Bool searchType ( const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sMediaType ,
- const ::rtl::OUString& sClipboardFormat ,
+ sal_Bool searchType ( const OUString& sURL ,
+ const OUString& sMediaType ,
+ const OUString& sClipboardFormat ,
CheckedTypeIterator& aStartEntry ,
- ::rtl::OUString& sResult ) const;
+ OUString& sResult ) const;
- sal_Bool searchFilterForType ( const ::rtl::OUString& sInternalTypeName ,
+ sal_Bool searchFilterForType ( const OUString& sInternalTypeName ,
CheckedStringListIterator& aStartEntry ,
- ::rtl::OUString& sResult ) const;
+ OUString& sResult ) const;
- sal_Bool searchDetectorForType ( const ::rtl::OUString& sInternalTypeName ,
+ sal_Bool searchDetectorForType ( const OUString& sInternalTypeName ,
CheckedStringListIterator& aStartEntry ,
- ::rtl::OUString& sResult ) const;
+ OUString& sResult ) const;
- sal_Bool searchLoaderForType ( const ::rtl::OUString& sInternalTypeName ,
+ sal_Bool searchLoaderForType ( const OUString& sInternalTypeName ,
CheckedStringListIterator& aStartEntry ,
- ::rtl::OUString& sResult ) const;
+ OUString& sResult ) const;
- sal_Bool searchContentHandlerForType ( const ::rtl::OUString& sInternalTypeName ,
+ sal_Bool searchContentHandlerForType ( const OUString& sInternalTypeName ,
CheckedStringListIterator& aStartEntry ,
- ::rtl::OUString& sResult ) const;
+ OUString& sResult ) const;
/*-****************************************************************************************************//**
@short get all properties of a cache entry by given name
@@ -178,32 +178,32 @@ class FilterCache : private ThreadHelpBase
@onerror We return an empty Any.
*//*-*****************************************************************************************************/
- css::uno::Sequence< ::rtl::OUString > getAllTypeNames () const;
- css::uno::Sequence< ::rtl::OUString > getAllFilterNames () const;
- css::uno::Sequence< ::rtl::OUString > getAllDetectorNames () const; // without default detector!
- css::uno::Sequence< ::rtl::OUString > getAllLoaderNames () const; // without default loader!
- css::uno::Sequence< ::rtl::OUString > getAllContentHandlerNames () const;
- css::uno::Sequence< ::rtl::OUString > getAllDetectorNamesWithDefault () const; // default detector is last one!
- css::uno::Sequence< ::rtl::OUString > getAllLoaderNamesWithDefault () const; // default loader is last one!
- ::rtl::OUString getDefaultLoader () const;
-
- css::uno::Sequence< css::beans::PropertyValue > getTypeProperties ( const ::rtl::OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getFilterProperties ( const ::rtl::OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getDetectorProperties ( const ::rtl::OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getLoaderProperties ( const ::rtl::OUString& sName ) const;
- css::uno::Sequence< css::beans::PropertyValue > getContentHandlerProperties ( const ::rtl::OUString& sName ) const;
-
- FileType getType ( const ::rtl::OUString& sName ) const;
- Filter getFilter ( const ::rtl::OUString& sName ) const;
- Detector getDetector ( const ::rtl::OUString& sName ) const;
- Loader getLoader ( const ::rtl::OUString& sName ) const;
- ContentHandler getContentHandler ( const ::rtl::OUString& sName ) const;
-
- sal_Bool existsType ( const ::rtl::OUString& sName ) const;
- sal_Bool existsFilter ( const ::rtl::OUString& sName ) const;
- sal_Bool existsDetector ( const ::rtl::OUString& sName ) const;
- sal_Bool existsLoader ( const ::rtl::OUString& sName ) const;
- sal_Bool existsContentHandler ( const ::rtl::OUString& sName ) const;
+ css::uno::Sequence< OUString > getAllTypeNames () const;
+ css::uno::Sequence< OUString > getAllFilterNames () const;
+ css::uno::Sequence< OUString > getAllDetectorNames () const; // without default detector!
+ css::uno::Sequence< OUString > getAllLoaderNames () const; // without default loader!
+ css::uno::Sequence< OUString > getAllContentHandlerNames () const;
+ css::uno::Sequence< OUString > getAllDetectorNamesWithDefault () const; // default detector is last one!
+ css::uno::Sequence< OUString > getAllLoaderNamesWithDefault () const; // default loader is last one!
+ OUString getDefaultLoader () const;
+
+ css::uno::Sequence< css::beans::PropertyValue > getTypeProperties ( const OUString& sName ) const;
+ css::uno::Sequence< css::beans::PropertyValue > getFilterProperties ( const OUString& sName ) const;
+ css::uno::Sequence< css::beans::PropertyValue > getDetectorProperties ( const OUString& sName ) const;
+ css::uno::Sequence< css::beans::PropertyValue > getLoaderProperties ( const OUString& sName ) const;
+ css::uno::Sequence< css::beans::PropertyValue > getContentHandlerProperties ( const OUString& sName ) const;
+
+ FileType getType ( const OUString& sName ) const;
+ Filter getFilter ( const OUString& sName ) const;
+ Detector getDetector ( const OUString& sName ) const;
+ Loader getLoader ( const OUString& sName ) const;
+ ContentHandler getContentHandler ( const OUString& sName ) const;
+
+ sal_Bool existsType ( const OUString& sName ) const;
+ sal_Bool existsFilter ( const OUString& sName ) const;
+ sal_Bool existsDetector ( const OUString& sName ) const;
+ sal_Bool existsLoader ( const OUString& sName ) const;
+ sal_Bool existsContentHandler ( const OUString& sName ) const;
/*-****************************************************************************************************//**
@short support special query modes
@@ -221,7 +221,7 @@ class FilterCache : private ThreadHelpBase
@onerror We return an empty result set.
*//*-*****************************************************************************************************/
- css::uno::Any queryFilters( const ::rtl::OUString& sQuery ) const;
+ css::uno::Any queryFilters( const OUString& sQuery ) const;
/*-****************************************************************************************************//**
@short support registration of elements in current configuration
@@ -270,39 +270,39 @@ class FilterCache : private ThreadHelpBase
@onerror We return false then.
*//*-*****************************************************************************************************/
- sal_Bool addFilter ( const ::rtl::OUString& sName ,
+ sal_Bool addFilter ( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
sal_Bool bException ) throw(css::container::ElementExistException ,
css::registry::InvalidRegistryException);
- sal_Bool replaceFilter( const ::rtl::OUString& sName ,
+ sal_Bool replaceFilter( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
sal_Bool bException ) throw(css::container::NoSuchElementException ,
css::registry::InvalidRegistryException);
- sal_Bool removeFilter ( const ::rtl::OUString& sName ,
+ sal_Bool removeFilter ( const OUString& sName ,
sal_Bool bException ) throw(css::container::NoSuchElementException ,
css::registry::InvalidRegistryException);
- sal_Bool addType ( const ::rtl::OUString& sName ,
+ sal_Bool addType ( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
sal_Bool bException ) throw(css::container::ElementExistException ,
css::registry::InvalidRegistryException);
- sal_Bool replaceType ( const ::rtl::OUString& sName ,
+ sal_Bool replaceType ( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
sal_Bool bException ) throw(css::container::NoSuchElementException ,
css::registry::InvalidRegistryException);
- sal_Bool removeType ( const ::rtl::OUString& sName ,
+ sal_Bool removeType ( const OUString& sName ,
sal_Bool bException ) throw(css::container::NoSuchElementException ,
css::registry::InvalidRegistryException);
- sal_Bool addDetector ( const ::rtl::OUString& sName ,
+ sal_Bool addDetector ( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
sal_Bool bException ) throw(css::container::ElementExistException ,
css::registry::InvalidRegistryException);
- sal_Bool replaceDetector( const ::rtl::OUString& sName ,
+ sal_Bool replaceDetector( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties ,
sal_Bool bException ) throw(css::container::NoSuchElementException ,
css::registry::InvalidRegistryException);
- sal_Bool removeDetector ( const ::rtl::OUString& sName ,
+ sal_Bool removeDetector ( const OUString& sName ,
sal_Bool bException ) throw(css::container::NoSuchElementException ,
css::registry::InvalidRegistryException);
@@ -347,44 +347,44 @@ class FilterCache : private ThreadHelpBase
private:
- static sal_Bool implcp_searchType ( const ::rtl::OUString& sURL ,
- const ::rtl::OUString* pMediaType ,
- const ::rtl::OUString* pClipboardFormat ,
+ static sal_Bool implcp_searchType ( const OUString& sURL ,
+ const OUString* pMediaType ,
+ const OUString* pClipboardFormat ,
const CheckedTypeIterator& aStartEntry ,
- const ::rtl::OUString& sResult );
- static sal_Bool implcp_searchFilterForType ( const ::rtl::OUString& sInternalTypeName ,
+ const OUString& sResult );
+ static sal_Bool implcp_searchFilterForType ( const OUString& sInternalTypeName ,
const CheckedStringListIterator& aStartEntry ,
- const ::rtl::OUString& sResult );
- static sal_Bool implcp_searchDetectorForType ( const ::rtl::OUString& sInternalTypeName ,
+ const OUString& sResult );
+ static sal_Bool implcp_searchDetectorForType ( const OUString& sInternalTypeName ,
const CheckedStringListIterator& aStartEntry ,
- const ::rtl::OUString& sResult );
- static sal_Bool implcp_searchLoaderForType ( const ::rtl::OUString& sInternalTypeName ,
+ const OUString& sResult );
+ static sal_Bool implcp_searchLoaderForType ( const OUString& sInternalTypeName ,
const CheckedStringListIterator& aStartEntry ,
- const ::rtl::OUString& sResult );
- static sal_Bool implcp_searchContentHandlerForType ( const ::rtl::OUString& sInternalTypeName ,
+ const OUString& sResult );
+ static sal_Bool implcp_searchContentHandlerForType ( const OUString& sInternalTypeName ,
const CheckedStringListIterator& aStartEntry ,
- const ::rtl::OUString& sResult );
- static sal_Bool implcp_getTypeProperties ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getFilterProperties ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getDetectorProperties ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getLoaderProperties ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getContentHandlerProperties ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getType ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getFilter ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getDetector ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getLoader ( const ::rtl::OUString& sName );
- static sal_Bool implcp_getContentHandler ( const ::rtl::OUString& sName );
- static sal_Bool implcp_existsType ( const ::rtl::OUString& sName );
- static sal_Bool implcp_existsFilter ( const ::rtl::OUString& sName );
- static sal_Bool implcp_existsDetector ( const ::rtl::OUString& sName );
- static sal_Bool implcp_existsLoader ( const ::rtl::OUString& sName );
- static sal_Bool implcp_existsContentHandler ( const ::rtl::OUString& sName );
- static sal_Bool implcp_addFilter ( const ::rtl::OUString& sName ,
+ const OUString& sResult );
+ static sal_Bool implcp_getTypeProperties ( const OUString& sName );
+ static sal_Bool implcp_getFilterProperties ( const OUString& sName );
+ static sal_Bool implcp_getDetectorProperties ( const OUString& sName );
+ static sal_Bool implcp_getLoaderProperties ( const OUString& sName );
+ static sal_Bool implcp_getContentHandlerProperties ( const OUString& sName );
+ static sal_Bool implcp_getType ( const OUString& sName );
+ static sal_Bool implcp_getFilter ( const OUString& sName );
+ static sal_Bool implcp_getDetector ( const OUString& sName );
+ static sal_Bool implcp_getLoader ( const OUString& sName );
+ static sal_Bool implcp_getContentHandler ( const OUString& sName );
+ static sal_Bool implcp_existsType ( const OUString& sName );
+ static sal_Bool implcp_existsFilter ( const OUString& sName );
+ static sal_Bool implcp_existsDetector ( const OUString& sName );
+ static sal_Bool implcp_existsLoader ( const OUString& sName );
+ static sal_Bool implcp_existsContentHandler ( const OUString& sName );
+ static sal_Bool implcp_addFilter ( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties );
- static sal_Bool implcp_replaceFilter ( const ::rtl::OUString& sName ,
+ static sal_Bool implcp_replaceFilter ( const OUString& sName ,
const css::uno::Sequence< css::beans::PropertyValue >& lProperties );
- static sal_Bool implcp_removeFilter ( const ::rtl::OUString& sName );
- static sal_Bool implcp_queryFilters ( const ::rtl::OUString& sQuery );
+ static sal_Bool implcp_removeFilter ( const OUString& sName );
+ static sal_Bool implcp_queryFilters ( const OUString& sQuery );
#endif // #ifdef ENABLE_ASSERTIONS
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 8fb2090582df..e8591bba2c08 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -94,9 +94,9 @@ struct FileType
inline void impl_clear()
{
bPreferred = sal_False ;
- sName = ::rtl::OUString() ;
- sMediaType = ::rtl::OUString() ;
- sClipboardFormat = ::rtl::OUString() ;
+ sName = OUString() ;
+ sMediaType = OUString() ;
+ sClipboardFormat = OUString() ;
nDocumentIconID = 0 ;
lUINames.free ();
lURLPattern.free();
@@ -122,10 +122,10 @@ struct FileType
public:
sal_Bool bPreferred ;
- ::rtl::OUString sName ;
+ OUString sName ;
OUStringHashMap lUINames ;
- ::rtl::OUString sMediaType ;
- ::rtl::OUString sClipboardFormat ;
+ OUString sMediaType ;
+ OUString sClipboardFormat ;
sal_Int32 nDocumentIconID ;
OUStringList lURLPattern ;
OUStringList lExtensions ;
@@ -158,14 +158,14 @@ struct Filter
inline void impl_clear()
{
nOrder = 0 ;
- sName = ::rtl::OUString();
- sType = ::rtl::OUString();
- sDocumentService = ::rtl::OUString();
- sFilterService = ::rtl::OUString();
- sUIComponent = ::rtl::OUString();
+ sName = OUString();
+ sType = OUString();
+ sDocumentService = OUString();
+ sFilterService = OUString();
+ sUIComponent = OUString();
nFlags = 0 ;
nFileFormatVersion = 0 ;
- sTemplateName = ::rtl::OUString();
+ sTemplateName = OUString();
lUINames.free ();
lUserData.free ();
}
@@ -192,16 +192,16 @@ struct Filter
public:
sal_Int32 nOrder ;
- ::rtl::OUString sName ;
- ::rtl::OUString sType ;
+ OUString sName ;
+ OUString sType ;
OUStringHashMap lUINames ;
- ::rtl::OUString sDocumentService ;
- ::rtl::OUString sFilterService ;
- ::rtl::OUString sUIComponent ;
+ OUString sDocumentService ;
+ OUString sFilterService ;
+ OUString sUIComponent ;
sal_Int32 nFlags ;
OUStringList lUserData ;
sal_Int32 nFileFormatVersion ;
- ::rtl::OUString sTemplateName ;
+ OUString sTemplateName ;
};
//*****************************************************************************************************************
@@ -229,7 +229,7 @@ struct Detector
inline void impl_clear()
{
- sName = ::rtl::OUString();
+ sName = OUString();
lTypes.free();
}
@@ -245,7 +245,7 @@ struct Detector
//-------------------------------------------------------------------------------------------------------------
public:
- ::rtl::OUString sName ;
+ OUString sName ;
OUStringList lTypes ;
};
@@ -274,7 +274,7 @@ struct Loader
inline void impl_clear()
{
- sName = ::rtl::OUString();
+ sName = OUString();
lUINames.free ();
lTypes.free ();
}
@@ -292,7 +292,7 @@ struct Loader
//-------------------------------------------------------------------------------------------------------------
public:
- ::rtl::OUString sName ;
+ OUString sName ;
OUStringHashMap lUINames ;
OUStringList lTypes ;
};
@@ -321,7 +321,7 @@ struct ContentHandler
inline void impl_clear()
{
- sName = ::rtl::OUString();
+ sName = OUString();
lTypes.free();
}
@@ -337,7 +337,7 @@ struct ContentHandler
//-------------------------------------------------------------------------------------------------------------
public:
- ::rtl::OUString sName ;
+ OUString sName ;
OUStringList lTypes ;
};
@@ -347,10 +347,10 @@ struct ContentHandler
// and could be used in a generic way
//*****************************************************************************************************************
template< class HashType >
-class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString ,
+class SetNodeHash : public ::boost::unordered_map< OUString ,
HashType ,
- rtl::OUStringHash ,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash ,
+ ::std::equal_to< OUString > >
{
//-------------------------------------------------------------------------------------------------------------
// interface
@@ -371,7 +371,7 @@ class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString
// Append changed, added or removed items to special lists
// Necessary for saving changes
//---------------------------------------------------------------------------------------------------------
- void appendChange( const ::rtl::OUString& sName ,
+ void appendChange( const OUString& sName ,
EModifyState eState );
//-------------------------------------------------------------------------------------------------------------
@@ -388,10 +388,10 @@ class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString
// It's an optimism to find registered services faster!
// The preferred hash maps file extensions to preferred types to find these ones faster.
//*****************************************************************************************************************
-class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString ,
+class PerformanceHash : public ::boost::unordered_map< OUString ,
OUStringList ,
- rtl::OUStringHash ,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash ,
+ ::std::equal_to< OUString > >
{
public:
//---------------------------------------------------------------------------------------------------------
@@ -409,7 +409,7 @@ class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString
// and could be used for further searches again, which should be started at next element!
// We stop search at the end of hash. You can start it again by setting it to the begin by himself.
//---------------------------------------------------------------------------------------------------------
- inline sal_Bool findPatternKey( const ::rtl::OUString& sSearchValue ,
+ inline sal_Bool findPatternKey( const OUString& sSearchValue ,
const_iterator& pStepper )
{
sal_Bool bFound = sal_False;
@@ -502,11 +502,11 @@ class DataContainer : private ThreadHelpBase
sal_Bool validateAndRepairLoader ();
sal_Bool validateAndRepairHandler ();
- sal_Bool existsType ( const ::rtl::OUString& sName );
- sal_Bool existsFilter ( const ::rtl::OUString& sName );
- sal_Bool existsDetector ( const ::rtl::OUString& sName );
- sal_Bool existsLoader ( const ::rtl::OUString& sName );
- sal_Bool existsContentHandler ( const ::rtl::OUString& sName );
+ sal_Bool existsType ( const OUString& sName );
+ sal_Bool existsFilter ( const OUString& sName );
+ sal_Bool existsDetector ( const OUString& sName );
+ sal_Bool existsLoader ( const OUString& sName );
+ sal_Bool existsContentHandler ( const OUString& sName );
void addType ( const FileType& aType , sal_Bool bSetModified );
void addFilter ( const Filter& aFilter , sal_Bool bSetModified );
@@ -520,51 +520,51 @@ class DataContainer : private ThreadHelpBase
void replaceLoader ( const Loader& aLoader , sal_Bool bSetModified );
void replaceContentHandler( const ContentHandler& aHandler , sal_Bool bSetModified );
- void removeType ( const ::rtl::OUString& sName , sal_Bool bSetModified );
- void removeFilter ( const ::rtl::OUString& sName , sal_Bool bSetModified );
- void removeDetector ( const ::rtl::OUString& sName , sal_Bool bSetModified );
- void removeLoader ( const ::rtl::OUString& sName , sal_Bool bSetModified );
- void removeContentHandler ( const ::rtl::OUString& sName , sal_Bool bSetModified );
+ void removeType ( const OUString& sName , sal_Bool bSetModified );
+ void removeFilter ( const OUString& sName , sal_Bool bSetModified );
+ void removeDetector ( const OUString& sName , sal_Bool bSetModified );
+ void removeLoader ( const OUString& sName , sal_Bool bSetModified );
+ void removeContentHandler ( const OUString& sName , sal_Bool bSetModified );
static void convertFileTypeToPropertySequence ( const FileType& aSource ,
css::uno::Sequence< css::beans::PropertyValue >& lDestination ,
- const ::rtl::OUString& sCurrentLocale );
+ const OUString& sCurrentLocale );
static void convertFilterToPropertySequence ( const Filter& aSource ,
css::uno::Sequence< css::beans::PropertyValue >& lDestination ,
- const ::rtl::OUString& sCurrentLocale );
+ const OUString& sCurrentLocale );
static void convertDetectorToPropertySequence ( const Detector& aSource ,
css::uno::Sequence< css::beans::PropertyValue >& lDestination );
static void convertLoaderToPropertySequence ( const Loader& aSource ,
css::uno::Sequence< css::beans::PropertyValue >& lDestination ,
- const ::rtl::OUString& sCurrentLocale );
+ const OUString& sCurrentLocale );
static void convertContentHandlerToPropertySequence ( const ContentHandler& aSource ,
css::uno::Sequence< css::beans::PropertyValue >& lDestination );
static void convertPropertySequenceToFilter ( const css::uno::Sequence< css::beans::PropertyValue >& lSource ,
Filter& aDestination ,
- const ::rtl::OUString& sCurrentLocale );
+ const OUString& sCurrentLocale );
static void convertPropertySequenceToFileType ( const css::uno::Sequence< css::beans::PropertyValue >& lSource ,
FileType& aDestination ,
- const ::rtl::OUString& sCurrentLocale );
+ const OUString& sCurrentLocale );
static void convertPropertySequenceToDetector ( const css::uno::Sequence< css::beans::PropertyValue >& lSource ,
Detector& aDestination );
static void convertPropertySequenceToLoader ( const css::uno::Sequence< css::beans::PropertyValue >& lSource ,
Loader& aDestination ,
- const ::rtl::OUString& sCurrentLocale );
+ const OUString& sCurrentLocale );
static void convertPropertySequenceToContentHandler ( const css::uno::Sequence< css::beans::PropertyValue >& lSource ,
ContentHandler& aDestination ,
- const ::rtl::OUString& sCurrentLocale );
- static void extractLocalizedStrings ( const ::rtl::OUString& sCurrentLocale ,
+ const OUString& sCurrentLocale );
+ static void extractLocalizedStrings ( const OUString& sCurrentLocale ,
const css::uno::Any& aCFGValue ,
OUStringHashMap& lLocales );
static void packLocalizedStrings ( sal_Int16 nMode ,
- const ::rtl::OUString& sCurrentLocale ,
+ const OUString& sCurrentLocale ,
css::uno::Any& aCFGValue ,
const OUStringHashMap& lLocales );
- static ::rtl::OUString getLocalelizedString ( const OUStringHashMap& lLocales ,
- const ::rtl::OUString& sLocale );
+ static OUString getLocalelizedString ( const OUStringHashMap& lLocales ,
+ const OUString& sLocale );
static void setLocalelizedString ( OUStringHashMap& lLocales ,
- const ::rtl::OUString& sLocale ,
- const ::rtl::OUString& sValue );
+ const OUString& sLocale ,
+ const OUString& sValue );
static void correctExtensions ( OUStringList& lExtensions );
public:
@@ -580,7 +580,7 @@ class DataContainer : private ThreadHelpBase
PerformanceHash m_aFastContentHandlerCache ; /// hold all registered content handler services for a special file type
PreferredHash m_aPreferredTypesCache ; /// assignment of extensions to preferred types for it
Loader m_aGenericLoader ; /// information about our default frame loader
- ::rtl::OUString m_sLocale ; /// current set locale of configuration to handle right UIName from set of all UINames!
+ OUString m_sLocale ; /// current set locale of configuration to handle right UIName from set of all UINames!
sal_Bool m_bTypesModified ;
sal_Bool m_bFiltersModified ;
sal_Bool m_bDetectorsModified ;
@@ -608,7 +608,7 @@ class FilterCFGAccess : public ::utl::ConfigItem
// interface
//-------------------------------------------------------------------------------------------------------------
public:
- FilterCFGAccess ( const ::rtl::OUString& sPath ,
+ FilterCFGAccess ( const OUString& sPath ,
sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION ,
sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration
virtual ~FilterCFGAccess( );
@@ -618,14 +618,14 @@ class FilterCFGAccess : public ::utl::ConfigItem
void write ( DataContainer& rData ,
DataContainer::ECFGType eType ); // write values from given struct to configuration
- static ::rtl::OUString encodeTypeData ( const FileType& aType ); // build own formated string of type properties
- static void decodeTypeData ( const ::rtl::OUString& sData ,
+ static OUString encodeTypeData ( const FileType& aType ); // build own formated string of type properties
+ static void decodeTypeData ( const OUString& sData ,
FileType& aType );
- static ::rtl::OUString encodeFilterData( const Filter& aFilter ); // build own formated string of filter properties
- static void decodeFilterData( const ::rtl::OUString& sData ,
+ static OUString encodeFilterData( const Filter& aFilter ); // build own formated string of filter properties
+ static void decodeFilterData( const OUString& sData ,
Filter& aFilter );
- static ::rtl::OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList
- static OUStringList decodeStringList( const ::rtl::OUString& sValue );
+ static OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList
+ static OUStringList decodeStringList( const OUString& sValue );
void setProductName ( OUStringHashMap& lUINames );
void resetProductName ( OUStringHashMap& lUINames );
@@ -636,8 +636,8 @@ class FilterCFGAccess : public ::utl::ConfigItem
private:
void impl_initKeyCounts ( ); // set right key counts, which are used at reading/writing of set node properties
void impl_removeNodes ( OUStringList& rChangesList , // helper to remove list of set nodes
- const ::rtl::OUString& sTemplateType ,
- const ::rtl::OUString& sSetName );
+ const OUString& sTemplateType ,
+ const OUString& sSetName );
void impl_loadTypes ( DataContainer& rData ); // helper to load configuration parts
void impl_loadFilters ( DataContainer& rData );
@@ -656,7 +656,7 @@ class FilterCFGAccess : public ::utl::ConfigItem
// debug checks
//-------------------------------------------------------------------------------------------------------------
private:
- static sal_Bool implcp_ctor ( const ::rtl::OUString& sPath , // methods to check incoming parameter on our interface methods!
+ static sal_Bool implcp_ctor ( const OUString& sPath , // methods to check incoming parameter on our interface methods!
sal_Int32 nVersion ,
sal_Int16 nMode );
static sal_Bool implcp_read ( const DataContainer& rData );
@@ -673,8 +673,8 @@ class FilterCFGAccess : public ::utl::ConfigItem
sal_Int32 m_nKeyCountDetectors ;
sal_Int32 m_nKeyCountLoaders ;
sal_Int32 m_nKeyCountContentHandlers ;
- ::rtl::OUString m_sProductName ;
- ::rtl::OUString m_sFormatVersion ;
+ OUString m_sProductName ;
+ OUString m_sFormatVersion ;
};
} // namespace framework
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 62159aa8062e..2b1a5d7f1569 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -100,8 +100,8 @@ class FrameContainer : private ThreadHelpBase
css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > getAllElements() const;
/// special helper for Frame::findFrame()
- css::uno::Reference< css::frame::XFrame > searchOnAllChildrens ( const ::rtl::OUString& sName ) const;
- css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens( const ::rtl::OUString& sName ) const;
+ css::uno::Reference< css::frame::XFrame > searchOnAllChildrens ( const OUString& sName ) const;
+ css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens( const OUString& sName ) const;
}; // class FrameContainer
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 3d957992b750..3a60e3c11245 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -52,19 +52,19 @@ public:
class FwkTabPage : public TabPage
{
private:
- rtl::OUString m_sPageURL;
- rtl::OUString m_sEventHdl;
+ OUString m_sPageURL;
+ OUString m_sEventHdl;
css::uno::Reference< css::awt::XWindow > m_xPage;
css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl;
css::uno::Reference< css::awt::XContainerWindowProvider > m_xWinProvider;
void CreateDialog();
- sal_Bool CallMethod( const rtl::OUString& rMethod );
+ sal_Bool CallMethod( const OUString& rMethod );
public:
FwkTabPage(
Window* pParent,
- const rtl::OUString& rPageURL,
+ const OUString& rPageURL,
const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider );
@@ -79,13 +79,13 @@ struct TabEntry
{
sal_Int32 m_nIndex;
FwkTabPage* m_pPage;
- ::rtl::OUString m_sPageURL;
+ OUString m_sPageURL;
css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl;
TabEntry() :
m_nIndex( -1 ), m_pPage( NULL ) {}
- TabEntry( sal_Int32 nIndex, ::rtl::OUString sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
+ TabEntry( sal_Int32 nIndex, OUString sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
m_nIndex( nIndex ), m_pPage( NULL ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {}
~TabEntry() { delete m_pPage; }
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index fb3b2759929c..532471a45811 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -85,8 +85,8 @@ class MenuManager : public ThreadHelpBase ,
void UpdateSpecialWindowMenu( Menu* pMenu );
void ClearMenuDispatch(const css::lang::EventObject& Source = css::lang::EventObject(),bool _bRemoveOnly = true);
void SetHdl();
- void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
- sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
+ void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
+ sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
struct MenuItemHandler
@@ -95,11 +95,11 @@ class MenuManager : public ThreadHelpBase ,
nItemId( aItemId ), pSubMenuManager( pManager ), xMenuItemDispatch( rDispatch ) {}
sal_uInt16 nItemId;
- ::rtl::OUString aTargetFrame;
- ::rtl::OUString aMenuItemURL;
- ::rtl::OUString aFilter;
- ::rtl::OUString aPassword;
- ::rtl::OUString aTitle;
+ OUString aTargetFrame;
+ OUString aMenuItemURL;
+ OUString aFilter;
+ OUString aPassword;
+ OUString aTitle;
MenuManager* pSubMenuManager;
css::uno::Reference< css::frame::XDispatch > xMenuItemDispatch;
};
@@ -116,7 +116,7 @@ class MenuManager : public ThreadHelpBase ,
sal_Bool m_bActive;
sal_Bool m_bIsBookmarkMenu;
sal_Bool m_bShowMenuImages;
- ::rtl::OUString m_aMenuItemCommand;
+ OUString m_aMenuItemCommand;
Menu* m_pVCLMenu;
css::uno::Reference< css::frame::XFrame > m_xFrame;
::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector;
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 02ddf16d547e..f414cf6714c0 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -146,7 +146,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
* @throw [com::sun::star::beans::UnknownPropertyException]
* if no property with the specified name exists.
*/
- virtual void SAL_CALL impl_removePropertyInfo(const ::rtl::OUString& sProperty)
+ virtual void SAL_CALL impl_removePropertyInfo(const OUString& sProperty)
throw(css::beans::UnknownPropertyException,
css::uno::Exception );
@@ -163,11 +163,11 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
//---------------------------------------------------------------------
/**
*/
- virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ,
const css::uno::Any& aValue ) = 0;
- virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty,
+ virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ) = 0;
//-------------------------------------------------------------------------
@@ -178,7 +178,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
throw(css::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL setPropertyValue(const OUString& sProperty,
const css::uno::Any& aValue )
throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException ,
@@ -186,30 +186,30 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
- virtual css::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& sProperty)
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& sProperty)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
- virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& sProperty,
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& sProperty,
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
- virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
- virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
@@ -219,11 +219,11 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
throw(css::uno::RuntimeException);
- virtual css::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& sName)
+ virtual css::beans::Property SAL_CALL getPropertyByName(const OUString& sName)
throw(css::beans::UnknownPropertyException,
css::uno::RuntimeException );
- virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& sName)
+ virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& sName)
throw(css::uno::RuntimeException);
//-------------------------------------------------------------------------
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 6bc77e5d21f9..b57416806a18 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -54,7 +54,7 @@ struct FWI_DLLPUBLIC ProtocolHandler
public:
/// the uno implementation name of this handler
- ::rtl::OUString m_sUNOName;
+ OUString m_sUNOName;
/// list of URL pattern which defines the protocols which this handler is registered for
OUStringList m_lProtocols;
};
@@ -66,12 +66,12 @@ struct FWI_DLLPUBLIC ProtocolHandler
uno implementation names as value. Overloading of the index operator makes it possible
to search for a key by using a full qualified URL on list of all possible pattern keys.
*/
-class FWI_DLLPUBLIC PatternHash : public BaseHash< ::rtl::OUString >
+class FWI_DLLPUBLIC PatternHash : public BaseHash< OUString >
{
/* interface */
public:
- PatternHash::iterator findPatternKey( const ::rtl::OUString& sURL );
+ PatternHash::iterator findPatternKey( const OUString& sURL );
};
//_________________________________________________________________________________________________________________
@@ -123,7 +123,7 @@ class FWI_DLLPUBLIC HandlerCache
HandlerCache();
virtual ~HandlerCache();
- sal_Bool search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const;
+ sal_Bool search( const OUString& sURL, ProtocolHandler* pReturn ) const;
sal_Bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const;
void takeOver(HandlerHash* pHandler, PatternHash* pPattern);
@@ -152,12 +152,12 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem
/* interface */
public:
- HandlerCFGAccess( const ::rtl::OUString& sPackage );
+ HandlerCFGAccess( const OUString& sPackage );
void read ( HandlerHash** ppHandler ,
PatternHash** ppPattern );
void setCache(HandlerCache* pCache) {m_pCache = pCache;};
- virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames);
+ virtual void Notify(const css::uno::Sequence< OUString >& lPropertyNames);
virtual void Commit();
};
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 726f29c23c7d..44bca4ed7efb 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -43,7 +43,7 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
public com::sun::star::container::XNamed
{
public:
- RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier);
+ RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier);
virtual ~RootActionTriggerContainer();
// XInterface
@@ -53,11 +53,11 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
virtual void SAL_CALL release() throw ();
// 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 )
+ 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< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// XIndexContainer
@@ -86,9 +86,9 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
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);
@@ -98,8 +98,8 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) 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);
private:
void FillContainer();
@@ -108,7 +108,7 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
sal_Bool m_bContainerChanged;
sal_Bool m_bInContainerCreation;
const Menu* m_pMenu;
- const ::rtl::OUString* m_pMenuIdentifier;
+ const OUString* m_pMenuIdentifier;
};
}
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 92da1f14ece9..44b51114e6b6 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -57,7 +57,7 @@ class TaskCreator : private ThreadHelpBase
TaskCreator( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
virtual ~TaskCreator( );
- css::uno::Reference< css::frame::XFrame > createTask( const ::rtl::OUString& sName ,
+ css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName ,
sal_Bool bVisible );
//_______________________
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 7c80170dbb17..f80bb88649a1 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -97,8 +97,8 @@ class Wildcard
@onerror -
*//*-*****************************************************************************************************/
- static sal_Bool match( const ::rtl::OUString& sText ,
- const ::rtl::OUString& sPattern );
+ static sal_Bool match( const OUString& sText ,
+ const OUString& sPattern );
//---------------------------------------------------------------------------------------------------------
// debug and test methods
@@ -121,8 +121,8 @@ class Wildcard
#ifdef ENABLE_ASSERTIONS
- static sal_Bool impldbg_checkParameter_match( const ::rtl::OUString& sText ,
- const ::rtl::OUString& sPattern );
+ static sal_Bool impldbg_checkParameter_match( const OUString& sText ,
+ const OUString& sPattern );
#endif // #ifdef ENABLE_ASSERTIONS
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 3493590385f3..5b8860f563eb 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -144,7 +144,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
*/
CloseDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sTarget);
+ const OUString& sTarget);
//---------------------------------------
/** @short does nothing real. */
@@ -300,7 +300,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
*/
static css::uno::Reference< css::frame::XFrame > static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sTarget);
+ const OUString& sTarget);
}; // class CloseDispatcher
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 4515491b164e..bb65b34ce999 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -107,7 +107,7 @@ class DispatchProvider : // interfaces
const css::uno::Reference< css::frame::XFrame >& xFrame );
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ 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 );
@@ -119,16 +119,16 @@ class DispatchProvider : // interfaces
private:
css::uno::Reference< css::frame::XDispatch > implts_getOrCreateDispatchHelper ( EDispatchHelper eHelper ,
const css::uno::Reference< css::frame::XFrame >& xOwner ,
- const ::rtl::OUString& sTarget = ::rtl::OUString() ,
+ const OUString& sTarget = OUString() ,
sal_Int32 nSearchFlags = 0 );
sal_Bool implts_isLoadableContent ( const css::util::URL& aURL );
css::uno::Reference< css::frame::XDispatch > implts_queryDesktopDispatch ( const css::uno::Reference< css::frame::XFrame > xDesktop ,
const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags );
css::uno::Reference< css::frame::XDispatch > implts_queryFrameDispatch ( const css::uno::Reference< css::frame::XFrame > xFrame ,
const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags );
css::uno::Reference< css::frame::XDispatch > implts_searchProtocolHandler ( const css::util::URL& aURL );
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 80a805188a4d..7e47e949f4db 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -73,7 +73,7 @@ class InterceptionHelper : public css::frame::XDispatchProvider
XInterceptorInfo, it will be registered for one pattern "*" by default.
That would make it possible to handle it in the same manner then real
registered interceptor objects and we must not implement any special code. */
- css::uno::Sequence< ::rtl::OUString > lURLPattern;
+ css::uno::Sequence< OUString > lURLPattern;
};
//_____________________________________________________
@@ -120,13 +120,13 @@ class InterceptionHelper : public css::frame::XDispatchProvider
@return An iterator object, which points directly to the located item inside this list.
In case no interceptor could be found, it points to the end of this list!
*/
- iterator findByPattern(const ::rtl::OUString& sURL)
+ iterator findByPattern(const OUString& sURL)
{
iterator pIt;
for (pIt=begin(); pIt!=end(); ++pIt)
{
sal_Int32 c = pIt->lURLPattern.getLength();
- const ::rtl::OUString* pPattern = pIt->lURLPattern.getConstArray();
+ const OUString* pPattern = pIt->lURLPattern.getConstArray();
for (sal_Int32 i=0; i<c; ++i)
{
@@ -221,7 +221,7 @@ class InterceptionHelper : public css::frame::XDispatchProvider
or NULL otherwise.
*/
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName,
+ const OUString& sTargetFrameName,
sal_Int32 nSearchFlags )
throw(css::uno::RuntimeException);
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 71031cbd8950..f4662f04137b 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -83,7 +83,7 @@ class MailToDispatcher : // interfaces
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTarget ,
+ const OUString& sTarget ,
sal_Int32 nFlags ) throw( css::uno::RuntimeException );
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException );
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index e0b30691d645..cc274c7e4f32 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -54,9 +54,9 @@ namespace framework{
We implement this as a hashtable for strings.
*//*-*************************************************************************************************************/
-typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString ,
- rtl::OUStringHash,
- std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer;
+typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
+ OUStringHash,
+ std::equal_to< OUString > > IMPL_ListenerHashContainer;
/*-************************************************************************************************************//**
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 0e206338bb34..87e95dbd617b 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -103,7 +103,7 @@ class Oxt_Handler : // interfaces
//---------------------------------------------------------------------------------------------------------
// XExtendedFilterDetection
//---------------------------------------------------------------------------------------------------------
- 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 );
//-------------------------------------------------------------------------------------------------------------
// protected methods
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 2c1023c473e2..1a5116b92048 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -56,9 +56,9 @@ namespace framework{
We implement this as a hashtable for strings.
*//*-*************************************************************************************************************/
-typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString ,
- rtl::OUStringHash,
- std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer;
+typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
+ OUStringHash,
+ std::equal_to< OUString > > IMPL_ListenerHashContainer;
/*-************************************************************************************************************//**
@@ -107,7 +107,7 @@ class PopupMenuDispatcher : // interfaces
// 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 ,
+ const OUString& sTarget ,
sal_Int32 nFlags )
throw( ::com::sun::star::uno::RuntimeException );
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index ca8843a368f5..1210a2afe86d 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -87,7 +87,7 @@ class ServiceHandler : // interfaces
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTarget ,
+ const OUString& sTarget ,
sal_Int32 nFlags ) throw( css::uno::RuntimeException );
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException );
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 97d3825dc798..5058f3a3e522 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -73,7 +73,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
//---------------------------------------
/** @short the original queryDispatch() target. */
- ::rtl::OUString m_sDispatchTarget;
+ OUString m_sDispatchTarget;
//---------------------------------------
/** @short list of registered status listener */
@@ -101,7 +101,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
*/
StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sTarget);
+ const OUString& sTarget);
//---------------------------------------
/** @short does nothing real. */
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 8fac399056fc..c343b7661a63 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -85,7 +85,7 @@ class SystemExec : // interfaces
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTarget ,
+ const OUString& sTarget ,
sal_Int32 nFlags ) throw( css::uno::RuntimeException );
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException );
diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx
index 2061d6534b1c..e942de94924f 100644
--- a/framework/inc/framework/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -48,7 +48,7 @@ namespace framework
// the above mentioned restriction!!!
static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu(
- const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier );
+ const Menu* pMenu, const OUString* pMenuIdentifier );
// Fills the submitted rActionTriggerContainer with the structure of the menu
// provided as the second parameter
diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx
index c5fcb63239e9..6390459be0f1 100644
--- a/framework/inc/framework/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -50,10 +50,10 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
~AddonPopupMenu();
// Check if command URL string has the unique prefix to identify addon popup menus
- static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL );
+ static sal_Bool IsCommandURLPrefix( const OUString& aCmdURL );
- void SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
- const rtl::OUString& GetCommandURL() const { return m_aCommandURL; }
+ void SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
+ const OUString& GetCommandURL() const { return m_aCommandURL; }
protected:
void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
@@ -61,7 +61,7 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
private:
AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
- rtl::OUString m_aCommandURL;
+ OUString m_aCommandURL;
friend class AddonMenuManager;
};
@@ -80,7 +80,7 @@ class FWE_DLLPUBLIC AddonMenuManager
static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
// Check if the context string matches the provided xModel context
- static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
+ static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const OUString& aContext );
// Factory method to create different Add-On menu types
static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
@@ -112,11 +112,11 @@ class FWE_DLLPUBLIC AddonMenuManager
// Retrieve the menu entry property values from a sequence
static void GetMenuEntry( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonMenuEntry,
- ::rtl::OUString& rTitle,
- ::rtl::OUString& rURL,
- ::rtl::OUString& rTarget,
- ::rtl::OUString& rImageId,
- ::rtl::OUString& rContext,
+ OUString& rTitle,
+ OUString& rURL,
+ OUString& rTarget,
+ OUString& rImageId,
+ OUString& rContext,
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonSubMenu );
};
diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index 81ea643f4dbd..29694b7fb539 100644
--- a/framework/inc/framework/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -32,7 +32,7 @@ namespace framework
struct FWE_DLLPUBLIC EventsConfig
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aEventNames;
+ ::com::sun::star::uno::Sequence< OUString > aEventNames;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aEventsProperties;
};
diff --git a/framework/inc/framework/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index c2a2b11c10ed..0d9398f7b2a3 100644
--- a/framework/inc/framework/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -31,7 +31,7 @@ namespace framework
typedef Image ( *pfunc_getImage)(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
bool bBig
);
@@ -39,7 +39,7 @@ pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImage
Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
bool bBig
);
diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx
index 277bb855ef1c..1cd56bbd36d9 100644
--- a/framework/inc/framework/interaction.hxx
+++ b/framework/inc/framework/interaction.hxx
@@ -67,10 +67,10 @@ class FWE_DLLPUBLIC RequestFilterSelect
RequestFilterSelect_Impl* pImp;
public:
- RequestFilterSelect( const ::rtl::OUString& sURL );
+ RequestFilterSelect( const OUString& sURL );
~RequestFilterSelect();
sal_Bool isAbort () const;
- ::rtl::OUString getFilter() const;
+ OUString getFilter() const;
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
};
diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index 2104537ad61f..6d3a6761e38e 100644
--- a/framework/inc/framework/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -25,8 +25,8 @@
struct FWE_DLLPUBLIC MenuExtensionItem
{
- rtl::OUString aLabel;
- rtl::OUString aURL;
+ OUString aLabel;
+ OUString aURL;
};
typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
diff --git a/framework/inc/framework/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx
index 9d638f53e6e1..ce2b604f5e5e 100644
--- a/framework/inc/framework/sfxhelperfunctions.hxx
+++ b/framework/inc/framework/sfxhelperfunctions.hxx
@@ -32,28 +32,28 @@ typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolbox,
unsigned short nID,
- const ::rtl::OUString& aCommandURL );
+ const OUString& aCommandURL );
typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)(
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 void ( *pfunc_getRefreshToolbars)(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
typedef void ( *pfunc_createDockingWindow)(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& rResourceURL );
+ const OUString& rResourceURL );
typedef bool ( *pfunc_isDockingWindowVisible)(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& rResourceURL );
+ const OUString& rResourceURL );
typedef void ( *pfunc_activateToolPanel)(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
- const ::rtl::OUString& i_rPanelURL );
+ const OUString& i_rPanelURL );
namespace framework
@@ -63,14 +63,14 @@ FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolbox,
unsigned short nID,
- const ::rtl::OUString& aCommandURL );
+ const OUString& aCommandURL );
FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
StatusBar* pStatusBar,
unsigned short nID,
- const ::rtl::OUString& aCommandURL );
+ const OUString& aCommandURL );
FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
FWE_DLLPUBLIC void SAL_CALL RefreshToolbars(
@@ -79,17 +79,17 @@ FWE_DLLPUBLIC void SAL_CALL RefreshToolbars(
FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& rResourceURL );
+ const OUString& rResourceURL );
FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& rResourceURL );
+ const OUString& rResourceURL );
FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
- const ::rtl::OUString& i_rPanelURL );
+ const OUString& i_rPanelURL );
}
#endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index 92fff24df7c3..c4cdc31a6329 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -102,12 +102,12 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
//---------------------------------------
/** @see XTitle */
- virtual ::rtl::OUString SAL_CALL getTitle()
+ virtual OUString SAL_CALL getTitle()
throw (css::uno::RuntimeException);
//---------------------------------------
/** @see XTitle */
- virtual void SAL_CALL setTitle(const ::rtl::OUString& sTitle)
+ virtual void SAL_CALL setTitle(const OUString& sTitle)
throw (css::uno::RuntimeException);
//---------------------------------------
@@ -156,16 +156,16 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
void impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame);
void impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame);
- void impl_appendComponentTitle ( ::rtl::OUStringBuffer& sTitle ,
+ void impl_appendComponentTitle ( OUStringBuffer& sTitle ,
const css::uno::Reference< css::uno::XInterface >& xComponent);
- void impl_appendProductName (::rtl::OUStringBuffer& sTitle);
- void impl_appendProductExtension (::rtl::OUStringBuffer& sTitle);
- void impl_appendModuleName (::rtl::OUStringBuffer& sTitle);
- void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle);
+ void impl_appendProductName (OUStringBuffer& sTitle);
+ void impl_appendProductExtension (OUStringBuffer& sTitle);
+ void impl_appendModuleName (OUStringBuffer& sTitle);
+ void impl_appendDebugVersion (OUStringBuffer& sTitle);
void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
- ::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL);
+ OUString impl_convertURL2Title(const OUString& sURL);
//-------------------------------------------
// member
@@ -190,7 +190,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
::sal_Bool m_bExternalTitle;
/** the actual title value */
- ::rtl::OUString m_sTitle;
+ OUString m_sTitle;
/** knows the leased number which must be used for untitled components. */
::sal_Int32 m_nLeasedNumber;
diff --git a/framework/inc/framework/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx
index f0c3307846cd..ae91db981553 100644
--- a/framework/inc/framework/undomanagerhelper.hxx
+++ b/framework/inc/framework/undomanagerhelper.hxx
@@ -117,7 +117,7 @@ namespace framework
void disposing();
// XUndoManager equivalents
- void enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock );
+ void enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock );
void enterHiddenUndoContext( IMutexGuard& i_instanceLock );
void leaveUndoContext( IMutexGuard& i_instanceLock );
void addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock );
@@ -125,11 +125,11 @@ namespace framework
void redo( IMutexGuard& i_instanceLock );
::sal_Bool isUndoPossible() const;
::sal_Bool isRedoPossible() const;
- ::rtl::OUString getCurrentUndoActionTitle() const;
- ::rtl::OUString getCurrentRedoActionTitle() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ OUString getCurrentUndoActionTitle() const;
+ OUString getCurrentRedoActionTitle() const;
+ ::com::sun::star::uno::Sequence< OUString >
getAllUndoActionTitles() const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
getAllRedoActionTitles() const;
void clear( IMutexGuard& i_instanceLock );
void clearRedo( IMutexGuard& i_instanceLock );
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 2db48ff6d9b9..0b26720bfd20 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -100,22 +100,22 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetGuesser() const;
};
-FWI_DLLPUBLIC ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
+FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext
,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels
,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
- ,::rtl::OUString& _rModuleIdentifier
+ ,OUString& _rModuleIdentifier
,sal_Bool& _rIni
,const sal_Char* _pName);
-FWI_DLLPUBLIC void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
+FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
const SvtLanguageTable &rLanguageTable,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
const LanguageGuessingHelper & rLangGuessHelper,
sal_Int16 nScriptType,
- const ::rtl::OUString & rCurLang,
- const ::rtl::OUString & rKeyboardLang,
- const ::rtl::OUString & rGuessedTextLang );
+ const OUString & rCurLang,
+ const OUString & rKeyboardLang,
+ const OUString & rGuessedTextLang );
//It's common for an object to want to create and own a Broadcaster and set
//itself as a Listener on its own Broadcaster member.
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index b9a1f3c4080d..037fbc83190e 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -29,8 +29,8 @@ namespace framework
class FWI_DLLPUBLIC NetworkDomain
{
public:
- static rtl::OUString GetNTDomainName();
- static rtl::OUString GetYPDomainName();
+ static OUString GetNTDomainName();
+ static OUString GetYPDomainName();
};
}
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 6e037d3a90ea..a2f680ca5e93 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -126,7 +126,7 @@ class PersistentWindowState : // interfaces
@return [string]
a module identifier for the current frame component.
*/
- static ::rtl::OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ static OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame);
//____________________________
@@ -142,8 +142,8 @@ class PersistentWindowState : // interfaces
@return [string]
contains the information about position and size.
*/
- static ::rtl::OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
- const ::rtl::OUString& sModuleName);
+ static OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
+ const OUString& sModuleName);
//____________________________
/** @short retrieve the window state from the container window.
@@ -156,7 +156,7 @@ class PersistentWindowState : // interfaces
@return [string]
contains the information about position and size.
*/
- static ::rtl::OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow);
+ static OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow);
//____________________________
/** @short restore the position and size on the container window.
@@ -172,8 +172,8 @@ class PersistentWindowState : // interfaces
contains the information about position and size.
*/
static void implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sModuleName ,
- const ::rtl::OUString& sWindowState );
+ const OUString& sModuleName ,
+ const OUString& sWindowState );
//____________________________
/** @short restore the position and size on the container window.
@@ -187,7 +187,7 @@ class PersistentWindowState : // interfaces
contains the information about position and size.
*/
static void implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow ,
- const ::rtl::OUString& sWindowState);
+ const OUString& sWindowState);
}; // class PersistentWindowState
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index 3a9fb451ced0..1f99c8e56ddb 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -107,7 +107,7 @@ class StatusIndicator : public css::lang::XTypeProvider
//---------------------------------------
// 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);
@@ -117,7 +117,7 @@ class StatusIndicator : public css::lang::XTypeProvider
virtual void SAL_CALL reset()
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)
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index c7d30a69f97a..a5cfa5e61d39 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -79,7 +79,7 @@ struct IndicatorInfo
css::uno::Reference< css::task::XStatusIndicator > m_xIndicator;
/** @short the last set text for this indicator */
- ::rtl::OUString m_sText;
+ OUString m_sText;
/** @short the max range for this indicator. */
sal_Int32 m_nRange;
@@ -104,7 +104,7 @@ struct IndicatorInfo
the max range for this indicator.
*/
IndicatorInfo(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator,
- const ::rtl::OUString& sText ,
+ const OUString& sText ,
sal_Int32 nRange )
{
m_xIndicator = xIndicator;
@@ -240,7 +240,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider
//---------------------------------------
// similar (XStatusIndicator)
virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
- const ::rtl::OUString& sText ,
+ const OUString& sText ,
sal_Int32 nRange);
virtual void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild);
@@ -248,7 +248,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider
virtual void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild);
virtual void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
- const ::rtl::OUString& sText );
+ const OUString& sText );
virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
sal_Int32 nValue);
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index cc323f66fa90..47e96470f7a4 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -75,9 +75,9 @@ class TitleBarUpdate : // interfaces
struct TModuleInfo
{
/// internal id of this module
- ::rtl::OUString sID;
+ OUString sID;
/// localized name for this module
- ::rtl::OUString sUIName;
+ OUString sUIName;
/// configured icon for this module
::sal_Int32 nIcon;
};
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 2351e65fa8ba..a97aea5acbef 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -87,7 +87,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
// 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) = 0;
@@ -132,7 +132,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
m_bConfigListening : 1,
m_bDisposed : 1,
m_bNoClose : 1;
- rtl::OUString m_aResourceURL;
+ OUString m_aResourceURL;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory;
com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xConfigSource;
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xConfigData;
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index c610fcefac06..785c2849648e 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -78,7 +78,7 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
// 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) = 0;
@@ -103,7 +103,7 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
- rtl::OUString m_aResourceURL;
+ OUString m_aResourceURL;
com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame > m_xWeakFrame;
sal_Int16 m_nType;
sal_Bool m_bInitialized : 1,
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 83fc64654dbe..1827174444ab 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -63,7 +63,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator
StatusBar* m_pStatusBar;
/** knows the current info text of the progress. */
- ::rtl::OUString m_sText;
+ OUString m_sText;
/** knows the current range of the progress. */
sal_Int32 m_nRange;
@@ -86,7 +86,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator
virtual ~VCLStatusIndicator();
/// 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);
@@ -96,7 +96,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator
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)
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index dd9386a19630..f4bced46bf43 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -72,7 +72,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
css::uno::Reference< css::uno::XInterface > m_xConfig;
/** knows the root of the opened config access point */
- ::rtl::OUString m_sRoot;
+ OUString m_sRoot;
/** represent the current open mode */
EOpenMode m_eMode;
@@ -83,7 +83,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
public:
ConfigAccess( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sRoot );
+ const OUString& sRoot );
virtual ~ConfigAccess();
virtual void open ( EOpenMode eMode );
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 09f949aae37b..6f728067da53 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -72,13 +72,13 @@ class HelpOnStartup : private ThreadHelpBase
/** @short knows the current locale of this office session,
which is needed to build complete help URLs.
*/
- ::rtl::OUString m_sLocale;
+ OUString m_sLocale;
//.......................................
/** @short knows the current operating system of this office session,
which is needed to build complete help URLs.
*/
- ::rtl::OUString m_sSystem;
+ OUString m_sSystem;
//-------------------------------------------
// native interface
@@ -138,7 +138,7 @@ class HelpOnStartup : private ThreadHelpBase
a module identifier ... or an empty value if no model could be located ...
or if it could not be classified successfully.
*/
- ::rtl::OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments);
+ OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments);
//---------------------------------------
/** @short tries to locate the open help module and return
@@ -150,7 +150,7 @@ class HelpOnStartup : private ThreadHelpBase
@return The URL of the current shown help content;
or an empty value if the help isnt still open.
*/
- ::rtl::OUString its_getCurrentHelpURL();
+ OUString its_getCurrentHelpURL();
//---------------------------------------
/** @short checks if the given help url match to a default help url
@@ -163,7 +163,7 @@ class HelpOnStartup : private ThreadHelpBase
sal_True if the given URL is any default one ...
sal_False otherwise.
*/
- ::sal_Bool its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL);
+ ::sal_Bool its_isHelpUrlADefaultOne(const OUString& sHelpURL);
//---------------------------------------
/** @short checks, if the help module should be shown automaticly for the
@@ -180,7 +180,7 @@ class HelpOnStartup : private ThreadHelpBase
A valid help URL in case the help content should be shown;
an empty value if such automatism was disabled for the specified office module.
*/
- ::rtl::OUString its_checkIfHelpEnabledAndGetURL(const ::rtl::OUString& sModule);
+ OUString its_checkIfHelpEnabledAndGetURL(const OUString& sModule);
//---------------------------------------
/** @short create a help URL for the given parameters.
@@ -203,9 +203,9 @@ class HelpOnStartup : private ThreadHelpBase
e.g. "vnd.sun.star.help://swriter/?Language=en-US&System=WIN"
or "vnd.sun.star.help://swriter/67351?Language=en-US&System=WIN"
*/
- static ::rtl::OUString ist_createHelpURL(const ::rtl::OUString& sBaseURL,
- const ::rtl::OUString& sLocale ,
- const ::rtl::OUString& sSystem );
+ static OUString ist_createHelpURL(const OUString& sBaseURL,
+ const OUString& sLocale ,
+ const OUString& sSystem );
};
} // namespace framework
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index dc7bab828433..f515f75913e6 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -43,9 +43,9 @@ namespace framework{
class FWI_DLLPUBLIC JobConst
{
public:
- static const ::rtl::OUString ANSWER_DEACTIVATE_JOB();
- static const ::rtl::OUString ANSWER_SAVE_ARGUMENTS();
- static const ::rtl::OUString ANSWER_SEND_DISPATCHRESULT();
+ static const OUString ANSWER_DEACTIVATE_JOB();
+ static const OUString ANSWER_SAVE_ARGUMENTS();
+ static const OUString ANSWER_SEND_DISPATCHRESULT();
};
} // namespace framework
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index ec7f300711d2..a3510650acc9 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -133,11 +133,11 @@ class JobData : private ThreadHelpBase
*/
struct TJob2DocEventBinding
{
- ::rtl::OUString m_sJobName;
- ::rtl::OUString m_sDocEvent;
+ OUString m_sJobName;
+ OUString m_sDocEvent;
- TJob2DocEventBinding(const ::rtl::OUString& sJobName ,
- const ::rtl::OUString& sDocEvent)
+ TJob2DocEventBinding(const OUString& sJobName ,
+ const OUString& sDocEvent)
: m_sJobName (sJobName )
, m_sDocEvent(sDocEvent)
{}
@@ -180,19 +180,19 @@ class JobData : private ThreadHelpBase
Is used as entry of configuration set for job registration, to find all
neccessary properties of it..
*/
- ::rtl::OUString m_sAlias;
+ OUString m_sAlias;
/**
the uno implementation name of this job.
It's readed from the configuration. Don't set it from outside!
*/
- ::rtl::OUString m_sService;
+ OUString m_sService;
/**
the module context list of this job.
It's readed from the configuration. Don't set it from outside!
*/
- ::rtl::OUString m_sContext;
+ OUString m_sContext;
/**
a job can be registered for an event.
@@ -203,7 +203,7 @@ class JobData : private ThreadHelpBase
arguments. A job can be called so, with a) it's onw config data and b) some dynamic
environment data.
*/
- ::rtl::OUString m_sEvent;
+ OUString m_sEvent;
/**
job specific configuration items ... unknown for us!
@@ -233,29 +233,29 @@ class JobData : private ThreadHelpBase
EMode getMode () const;
EEnvironment getEnvironment () const;
- ::rtl::OUString getEnvironmentDescriptor() const;
- ::rtl::OUString getService () const;
- ::rtl::OUString getEvent () const;
+ OUString getEnvironmentDescriptor() const;
+ OUString getService () const;
+ OUString getEvent () const;
css::uno::Sequence< css::beans::NamedValue > getConfig () const;
css::uno::Sequence< css::beans::NamedValue > getJobConfig () const;
sal_Bool hasConfig () const;
- sal_Bool hasCorrectContext ( const ::rtl::OUString& rModuleIdent ) const;
+ sal_Bool hasCorrectContext ( const OUString& rModuleIdent ) const;
void setEnvironment ( EEnvironment eEnvironment );
- void setAlias ( const ::rtl::OUString& sAlias );
- void setService ( const ::rtl::OUString& sService );
- void setEvent ( const ::rtl::OUString& sEvent ,
- const ::rtl::OUString& sAlias );
+ void setAlias ( const OUString& sAlias );
+ void setService ( const OUString& sService );
+ void setEvent ( const OUString& sEvent ,
+ const OUString& sAlias );
void setJobConfig ( const css::uno::Sequence< css::beans::NamedValue >& lArguments );
void setResult ( const JobResult& aResult );
void disableJob ( );
- static css::uno::Sequence< ::rtl::OUString > getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sEvent );
+ static css::uno::Sequence< OUString > getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const OUString& sEvent );
static void appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sEvent ,
+ const OUString& sEvent ,
::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs );
//___________________________________
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index b3cc0143f062..47f2c62b17b8 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -83,7 +83,7 @@ class JobDispatch : public css::lang::XTypeProvider
css::uno::Reference< css::frame::XFrame > m_xFrame;
/** name of module (writer, impress etc.) the frame is for */
- ::rtl::OUString m_sModuleIdentifier;
+ OUString m_sModuleIdentifier;
//___________________________________
// native interface methods
@@ -93,13 +93,13 @@ class JobDispatch : public css::lang::XTypeProvider
JobDispatch( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
virtual ~JobDispatch( );
- void impl_dispatchEvent ( const ::rtl::OUString& sEvent ,
+ void impl_dispatchEvent ( const OUString& sEvent ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener );
- void impl_dispatchService( const ::rtl::OUString& sService ,
+ void impl_dispatchService( const OUString& sService ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener );
- void impl_dispatchAlias ( const ::rtl::OUString& sAlias ,
+ void impl_dispatchAlias ( const OUString& sAlias ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener );
@@ -119,7 +119,7 @@ class JobDispatch : public css::lang::XTypeProvider
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ 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 >& lDescriptor ) throw(css::uno::RuntimeException);
diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index 9e2c91af6921..931fb071af80 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -98,7 +98,7 @@ class JobExecutor : public css::lang::XTypeProvider
DECLARE_XSERVICEINFO
// task.XJobExecutor
- virtual void SAL_CALL trigger( const ::rtl::OUString& sEvent ) throw(css::uno::RuntimeException);
+ virtual void SAL_CALL trigger( const OUString& sEvent ) throw(css::uno::RuntimeException);
// document.XEventListener
virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException);
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 6849f408528e..f6e06837c417 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -87,44 +87,44 @@ class JobURL : private ThreadHelpBase
sal_uInt32 m_eRequest;
/** holds the event part of a job URL */
- ::rtl::OUString m_sEvent;
+ OUString m_sEvent;
/** holds the alias part of a job URL */
- ::rtl::OUString m_sAlias;
+ OUString m_sAlias;
/** holds the service part of a job URL */
- ::rtl::OUString m_sService;
+ OUString m_sService;
/** holds the event arguments */
- ::rtl::OUString m_sEventArgs;
+ OUString m_sEventArgs;
/** holds the alias arguments */
- ::rtl::OUString m_sAliasArgs;
+ OUString m_sAliasArgs;
/** holds the service arguments */
- ::rtl::OUString m_sServiceArgs;
+ OUString m_sServiceArgs;
//___________________________________
// native interface
public:
- JobURL ( const ::rtl::OUString& sURL );
+ JobURL ( const OUString& sURL );
sal_Bool isValid ( ) const;
- sal_Bool getEvent ( ::rtl::OUString& sEvent ) const;
- sal_Bool getAlias ( ::rtl::OUString& sAlias ) const;
- sal_Bool getService ( ::rtl::OUString& sService ) const;
+ sal_Bool getEvent ( OUString& sEvent ) const;
+ sal_Bool getAlias ( OUString& sAlias ) const;
+ sal_Bool getService ( OUString& sService ) const;
//___________________________________
// private helper
private:
- static sal_Bool implst_split( const ::rtl::OUString& sPart ,
+ static sal_Bool implst_split( const OUString& sPart ,
const sal_Char* pPartIdentifier ,
sal_Int32 nPartLength ,
- ::rtl::OUString& rPartValue ,
- ::rtl::OUString& rPartArguments );
+ OUString& rPartValue ,
+ OUString& rPartArguments );
//___________________________________
// debug methods!
@@ -143,11 +143,11 @@ class JobURL : private ThreadHelpBase
const sal_Char* pExpectedEventArgs ,
const sal_Char* pExpectedAliasArgs ,
const sal_Char* pExpectedServiceArgs );
- ::rtl::OUString impldbg_toString() const;
+ OUString impldbg_toString() const;
- sal_Bool getServiceArgs( ::rtl::OUString& sServiceArgs ) const;
- sal_Bool getEventArgs ( ::rtl::OUString& sEventArgs ) const;
- sal_Bool getAliasArgs ( ::rtl::OUString& sAliasArgs ) const;
+ sal_Bool getServiceArgs( OUString& sServiceArgs ) const;
+ sal_Bool getEventArgs ( OUString& sEventArgs ) const;
+ sal_Bool getAliasArgs ( OUString& sAliasArgs ) const;
#endif // ENABLE_COMPONENT_SELF_CHECK
};
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 3024aa4c2958..ed8d71ff800a 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -122,7 +122,7 @@ class ShellJob : private ThreadHelpBase
@return the substituted command.
*/
- ::rtl::OUString impl_substituteCommandVariables(const ::rtl::OUString& sCommand);
+ OUString impl_substituteCommandVariables(const OUString& sCommand);
//---------------------------------------
/** executes the command.
@@ -140,8 +140,8 @@ class ShellJob : private ThreadHelpBase
@return sal_True if command was executed successfully; sal_False otherwise.
*/
- ::sal_Bool impl_execute(const ::rtl::OUString& sCommand ,
- const css::uno::Sequence< ::rtl::OUString >& lArguments ,
+ ::sal_Bool impl_execute(const OUString& sCommand ,
+ const css::uno::Sequence< OUString >& lArguments ,
::sal_Bool bCheckExitCode);
};
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index 9e890070d4fe..e650288fa956 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -73,7 +73,7 @@
#define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \
if ( ( BCONDITION ) == sal_True ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer( 256 ); \
+ OStringBuffer _sAssertBuffer( 256 ); \
_sAssertBuffer.append( "ASSERT:\n\t" ); \
_sAssertBuffer.append( SMETHOD ); \
_sAssertBuffer.append( "\n\t\"" ); \
@@ -104,7 +104,7 @@
#define LOG_ASSERT2( BCONDITION, SMETHODE, STEXT ) \
if ( ( BCONDITION ) == sal_True ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer( 256 ); \
+ OStringBuffer _sAssertBuffer( 256 ); \
_sAssertBuffer.append( "ASSERT:\n\t" ); \
_sAssertBuffer.append( SMETHOD ); \
_sAssertBuffer.append( "\n\t\"" ); \
@@ -131,7 +131,7 @@
#define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer( 256 ); \
+ OStringBuffer _sAssertBuffer( 256 ); \
_sAssertBuffer.append( "ASSERT:\n\t" ); \
_sAssertBuffer.append( SMETHOD ); \
_sAssertBuffer.append( "\n\t\"" ); \
@@ -183,7 +183,7 @@
#define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer2( 256 ); \
+ OStringBuffer _sAssertBuffer2( 256 ); \
_sAssertBuffer2.append( SOWNMESSAGE ); \
_sAssertBuffer2.append( "\n" ); \
_sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE) ); \
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index 4a7a05f05508..ea79afee426b 100644
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/event.hxx
@@ -48,7 +48,7 @@
#define LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "[ " ); \
sBuffer.append( SFRAMETYPE ); \
sBuffer.append( " ] \"" ); \
@@ -90,7 +90,7 @@
#define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "[ " ); \
sBuffer.append( SFRAMETYPE ); \
sBuffer.append( " ] \"" ); \
diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index 05790dba03ba..064cefca1ace 100644
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
@@ -48,7 +48,7 @@
#define LOG_FILTERDBG( SOPERATION, SMESSAGE ) \
{ \
- ::rtl::OStringBuffer _sBuffer( 256 ); \
+ OStringBuffer _sBuffer( 256 ); \
_sBuffer.append( SOPERATION ); \
_sBuffer.append( "\t" ); \
_sBuffer.append( SMESSAGE ); \
@@ -64,7 +64,7 @@
#define LOG_FILTERDBG_1_PARAM( SOPERATION, SPARAM, SMESSAGE ) \
{ \
- ::rtl::OStringBuffer _sBuffer( 256 ); \
+ OStringBuffer _sBuffer( 256 ); \
_sBuffer.append( SOPERATION ); \
_sBuffer.append( "\t\"" ); \
_sBuffer.append( SPARAM ); \
diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index dd3be0f1a596..b6ad279942cc 100644
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
@@ -43,8 +43,8 @@
#define WRITE_LOGFILE( SFILENAME, STEXT ) \
{ \
- ::rtl::OString _swriteLogfileFileName ( SFILENAME ); \
- ::rtl::OString _swriteLogfileText ( STEXT ); \
+ OString _swriteLogfileFileName ( SFILENAME ); \
+ OString _swriteLogfileText ( STEXT ); \
FILE* pFile = fopen( _swriteLogfileFileName.getStr(), "a" ); \
fprintf( pFile, "%s", _swriteLogfileText.getStr() ); \
fclose ( pFile ); \
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index b7c1b7d5409e..ddaf33283f89 100644
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/mutex.hxx
@@ -47,7 +47,7 @@
#define LOG_LOCKTYPE( _EFALLBACK, _ECURRENT ) \
/* new scope to prevent us against multiple definitions of variables ... */ \
{ \
- ::rtl::OStringBuffer _sBuffer( 256 ); \
+ OStringBuffer _sBuffer( 256 ); \
_sBuffer.append( "Set framework lock type to fallback: \"" ); \
switch( _EFALLBACK ) \
{ \
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index f4cfb0a5e833..ffebf741378d 100644
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
@@ -51,7 +51,7 @@
#define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( SFRAMENAME ); \
sBuffer.append( "\" ] send " ); \
@@ -77,7 +77,7 @@
#define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( U2B( SFRAMENAME ) ); \
sBuffer.append( "\" ] receive " ); \
@@ -99,7 +99,7 @@
#define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, sFILTER, AANY ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( U2B( SFRAMENAME ) ); \
sBuffer.append( "\" ] called with newURL( \"" ); \
@@ -130,7 +130,7 @@
#define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( U2B( SFRAMENAME ) ); \
sBuffer.append( "\" ] called with newStream( \""); \
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index 1d6fc24cd815..84b71c0260e1 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -41,7 +41,7 @@
#define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \
{ \
- ::rtl::OStringBuffer sOut( 1024 ); \
+ OStringBuffer sOut( 1024 ); \
sOut.append( "fw?_component_getFactory():" ); \
sOut.append( SINFOTEXT ); \
WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 576221a9fda0..bfdc18c8db13 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -44,7 +44,7 @@ ________________________________________________________________________________
#define IFFACTORY( CLASS ) \
/* If searched name found ... */ \
/* You can't add some statements before follow line ... Here can be an ELSE-statement! */ \
- if ( CLASS::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) ) \
+ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
LOG_REGISTRATION_GETFACTORY( "\t\tImplementationname found - try to create factory! ...\n" ) \
/* ... then create right factory for this service. */ \
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 653fd67ed89c..6bf913af1e14 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -60,7 +60,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* XServiceInfo */ \
/*===========================================================================================================*/ \
- ::rtl::OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \
+ OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticImplementationName(); \
} \
@@ -68,7 +68,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* XServiceInfo */ \
/*===========================================================================================================*/ \
- sal_Bool SAL_CALL CLASS::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \
+ sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \
{ \
return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0; \
} \
@@ -76,7 +76,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* XServiceInfo */ \
/*===========================================================================================================*/ \
- css::uno::Sequence< ::rtl::OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \
+ css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticSupportedServiceNames(); \
} \
@@ -84,9 +84,9 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* Helper for XServiceInfo */ \
/*===========================================================================================================*/ \
- css::uno::Sequence< ::rtl::OUString > CLASS::impl_getStaticSupportedServiceNames() \
+ css::uno::Sequence< OUString > CLASS::impl_getStaticSupportedServiceNames() \
{ \
- css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); \
+ css::uno::Sequence< OUString > seqServiceNames( 1 ); \
seqServiceNames.getArray() [0] = SERVICENAME ; \
return seqServiceNames; \
} \
@@ -94,7 +94,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* Helper for XServiceInfo */ \
/*===========================================================================================================*/ \
- ::rtl::OUString CLASS::impl_getStaticImplementationName() \
+ OUString CLASS::impl_getStaticImplementationName() \
{ \
return IMPLEMENTATIONNAME ; \
}
@@ -185,12 +185,12 @@ ________________________________________________________________________________
#define DECLARE_XSERVICEINFO_NOFACTORY \
/* interface 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 > SAL_CALL impl_getStaticSupportedServiceNames( ); \
- static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); \
+ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
+ static OUString SAL_CALL impl_getStaticImplementationName ( ); \
/* Helper for initialization of service by using own reference! */ \
virtual void SAL_CALL impl_initService ( ); \
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index 9b97a6972395..ee393b44789e 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -83,7 +83,7 @@ class ProtocolCheck
It returns the right enum value.
Protocols are defined above ...
*/
- static EProtocol specifyProtocol( const ::rtl::OUString& sURL )
+ static EProtocol specifyProtocol( const OUString& sURL )
{
// because "private:" is part of e.g. "private:object" too ...
// we must check it before all other ones!!!
@@ -126,7 +126,7 @@ class ProtocolCheck
It should be used instead of specifyProtocol() if only this question
is interesting to perform the code. We must not check for all possible protocols here...
*/
- static sal_Bool isProtocol( const ::rtl::OUString& sURL, EProtocol eRequired )
+ static sal_Bool isProtocol( const OUString& sURL, EProtocol eRequired )
{
sal_Bool bRet = sal_False;
switch(eRequired)
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 2a5023e1bc4f..e88893a97a93 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -79,7 +79,7 @@ class DispatchRecorder
virtual void SAL_CALL recordDispatch ( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
virtual void SAL_CALL recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
virtual void SAL_CALL endRecording () throw( css::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getRecordedMacro () throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getRecordedMacro () throw( css::uno::RuntimeException );
virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException);
@@ -93,10 +93,10 @@ class DispatchRecorder
// private functions
private:
- void SAL_CALL implts_recordMacro( const ::rtl::OUString& aURL,
+ void SAL_CALL implts_recordMacro( const OUString& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
- sal_Bool bAsComment, ::rtl::OUStringBuffer& );
- void SAL_CALL AppendToBuffer( css::uno::Any aValue, ::rtl::OUStringBuffer& aArgumentBuffer );
+ sal_Bool bAsComment, OUStringBuffer& );
+ void SAL_CALL AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer );
}; // class DispatcRecorder
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 5632da9a39f9..d7981ec4e032 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -91,7 +91,7 @@ struct DispatchParams
//---------------------------------------
/** TODO document me */
- ::rtl::OUString m_sSavePath;
+ OUString m_sSavePath;
//---------------------------------------
/** @short define the current cache entry, which should be used for current
@@ -275,20 +275,20 @@ class AutoRecovery : public css::lang::XTypeProvider
//-------------------------------
/** TODO: document me */
- ::rtl::OUString OrgURL;
- ::rtl::OUString FactoryURL;
- ::rtl::OUString TemplateURL;
-
- ::rtl::OUString OldTempURL;
- ::rtl::OUString NewTempURL;
-
- ::rtl::OUString AppModule; // e.g. com.sun.star.text.TextDocument - used to identify app module
- ::rtl::OUString FactoryService; // the service to create a document of the module
- ::rtl::OUString RealFilter; // real filter, which was used at loading time
- ::rtl::OUString DefaultFilter; // supports saving of the default format without loosing data
- ::rtl::OUString Extension; // file extension of the default filter
- ::rtl::OUString Title; // can be used as "DisplayName" on every recovery UI!
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ OUString OrgURL;
+ OUString FactoryURL;
+ OUString TemplateURL;
+
+ OUString OldTempURL;
+ OUString NewTempURL;
+
+ OUString AppModule; // e.g. com.sun.star.text.TextDocument - used to identify app module
+ OUString FactoryService; // the service to create a document of the module
+ OUString RealFilter; // real filter, which was used at loading time
+ OUString DefaultFilter; // supports saving of the default format without loosing data
+ OUString Extension; // file extension of the default filter
+ OUString Title; // can be used as "DisplayName" on every recovery UI!
+ ::com::sun::star::uno::Sequence< OUString >
ViewNames; // names of the view which were active at emergency-save time
sal_Int32 ID;
@@ -774,7 +774,7 @@ class AutoRecovery : public css::lang::XTypeProvider
@threadsafe
*/
- void implts_saveOneDoc(const ::rtl::OUString& sBackupPath ,
+ void implts_saveOneDoc(const OUString& sBackupPath ,
AutoRecovery::TDocumentInfo& rInfo ,
const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress);
@@ -790,13 +790,13 @@ class AutoRecovery : public css::lang::XTypeProvider
//---------------------------------------
// TODO document me
- void implts_openOneDoc(const ::rtl::OUString& sURL ,
+ void implts_openOneDoc(const OUString& sURL ,
::comphelper::MediaDescriptor& lDescriptor,
AutoRecovery::TDocumentInfo& rInfo );
//---------------------------------------
// TODO document me
- void implts_generateNewTempURL(const ::rtl::OUString& sBackupPath ,
+ void implts_generateNewTempURL(const OUString& sBackupPath ,
::comphelper::MediaDescriptor& rMediaDescriptor,
AutoRecovery::TDocumentInfo& rInfo );
@@ -840,7 +840,7 @@ class AutoRecovery : public css::lang::XTypeProvider
the event structure for sending.
*/
static css::frame::FeatureStateEvent implst_createFeatureStateEvent( sal_Int32 eJob ,
- const ::rtl::OUString& sEventType,
+ const OUString& sEventType,
AutoRecovery::TDocumentInfo* pInfo );
@@ -931,9 +931,9 @@ class AutoRecovery : public css::lang::XTypeProvider
//---------------------------------------
// TODO document me
- AutoRecovery::EFailureSafeResult implts_copyFile(const ::rtl::OUString& sSource ,
- const ::rtl::OUString& sTargetPath,
- const ::rtl::OUString& sTargetName);
+ AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource ,
+ const OUString& sTargetPath,
+ const OUString& sTargetName);
//---------------------------------------
/** @short converts m_eJob into a job description, which
@@ -948,7 +948,7 @@ class AutoRecovery : public css::lang::XTypeProvider
a suitable job description of form:
vnd.sun.star.autorecovery:/do...
*/
- static ::rtl::OUString implst_getJobDescription(sal_Int32 eJob);
+ static OUString implst_getJobDescription(sal_Int32 eJob);
//---------------------------------------
/** @short mape the given URL to an internal int representation.
@@ -1020,7 +1020,7 @@ class AutoRecovery : public css::lang::XTypeProvider
@param sURL
the url of the file, which should be removed.
*/
- void st_impl_removeFile(const ::rtl::OUString& sURL);
+ void st_impl_removeFile(const OUString& sURL);
//---------------------------------------
/** try to remove ".lock" file from disc if office will be terminated
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index bf1dd84533e3..17517c326b06 100644
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.hxx
@@ -103,9 +103,9 @@ class BackingComp : public css::lang::XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException);
// 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);
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException);
@@ -136,8 +136,8 @@ class BackingComp : public css::lang::XTypeProvider
public:
- static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( );
- static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( );
+ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( );
+ static OUString SAL_CALL impl_getStaticImplementationName ( );
static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ) throw( css::uno::Exception );
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
};
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index 31f280a11182..0bb9bda3c6bf 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -104,28 +104,28 @@ class ContentHandlerFactory : // interfaces
//---------------------------------------------------------------------------------------------------------
// XMultiServiceFactory
//---------------------------------------------------------------------------------------------------------
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance ( const ::rtl::OUString& sTypeName ) throw( css::uno::Exception ,
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance ( const OUString& sTypeName ) throw( css::uno::Exception ,
css::uno::RuntimeException );
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& sTypeName ,
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& sTypeName ,
const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception, css::uno::RuntimeException );
- 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 );
//---------------------------------------------------------------------------------------------------------
// XNameContainer
//---------------------------------------------------------------------------------------------------------
- virtual void SAL_CALL insertByName( const ::rtl::OUString& sHandlerName ,
+ virtual void SAL_CALL insertByName( const OUString& sHandlerName ,
const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException ,
css::container::ElementExistException ,
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
- virtual void SAL_CALL removeByName( const ::rtl::OUString& sHandlerName ) throw( css::container::NoSuchElementException ,
+ virtual void SAL_CALL removeByName( const OUString& sHandlerName ) throw( css::container::NoSuchElementException ,
css::lang::WrappedTargetException ,
css::uno::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XNameReplace
//---------------------------------------------------------------------------------------------------------
- virtual void SAL_CALL replaceByName( const ::rtl::OUString& sHandlerName ,
+ virtual void SAL_CALL replaceByName( const OUString& sHandlerName ,
const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException ,
css::container::NoSuchElementException ,
css::lang::WrappedTargetException ,
@@ -134,11 +134,11 @@ class ContentHandlerFactory : // interfaces
//---------------------------------------------------------------------------------------------------------
// XNameAccess
//---------------------------------------------------------------------------------------------------------
- virtual css::uno::Any SAL_CALL getByName ( const ::rtl::OUString& sName ) throw( css::container::NoSuchElementException ,
+ virtual css::uno::Any SAL_CALL getByName ( const OUString& sName ) 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& sName ) throw( css::uno::RuntimeException );
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL hasByName ( const OUString& sName ) throw( css::uno::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XElementAccess
@@ -183,11 +183,11 @@ class ContentHandlerFactory : // interfaces
private:
static sal_Bool implcp_ContentHandlerFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
- static sal_Bool implcp_createInstanceWithArguments ( const ::rtl::OUString& sTypeName ,
+ static sal_Bool implcp_createInstanceWithArguments ( const OUString& sTypeName ,
const css::uno::Sequence< css::uno::Any >& lArguments );
- static sal_Bool implcp_getByName ( const ::rtl::OUString& sName );
- static sal_Bool implcp_hasByName ( const ::rtl::OUString& sName );
- static sal_Bool implcp_removeByName ( const ::rtl::OUString& sHandlerName );
+ static sal_Bool implcp_getByName ( const OUString& sName );
+ static sal_Bool implcp_hasByName ( const OUString& sName );
+ static sal_Bool implcp_removeByName ( const OUString& sHandlerName );
#endif // #ifdef ENABLE_ASSERTIONS
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 24f77b8b4b68..da9f143eec9b 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -220,8 +220,8 @@ class Desktop : // interfaces
virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getCurrentFrame ( ) throw( css::uno::RuntimeException );
// XComponentLoader
- virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const OUString& sURL ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException ,
css::lang::IllegalArgumentException ,
@@ -233,7 +233,7 @@ class Desktop : // interfaces
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ 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 >& lQueries ) throw( css::uno::RuntimeException );
@@ -248,14 +248,14 @@ class Desktop : // interfaces
// XFrame
// Attention: findFrame() is implemented only! Other methods make no sense for our desktop!
- virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const ::rtl::OUString& sTargetFrameName ,
+ virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException );
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException );
virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException );
virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException );
- 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 sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException );
virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException );
virtual void SAL_CALL deactivate ( ) throw( css::uno::RuntimeException );
@@ -299,7 +299,7 @@ class Desktop : // interfaces
css::uno::RuntimeException );
// css.frame.XUntitledNumbers
- virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
+ virtual OUString SAL_CALL getUntitledPrefix()
throw (css::uno::RuntimeException);
// we need this wrapped terminate()-call to terminate even the QuickStarter
@@ -428,8 +428,8 @@ class Desktop : // interfaces
css::uno::Any m_aInteractionRequest ;
sal_Bool m_bSuspendQuickstartVeto ; /// don't ask quickstart for a veto
SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file
- ::rtl::OUString m_sName ;
- ::rtl::OUString m_sTitle ;
+ OUString m_sName ;
+ OUString m_sTitle ;
css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ;
//---------------------------------------------------------------------
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 7887ecea436e..a2a89d194fd5 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -87,8 +87,8 @@ class DispatchHelper : public ThreadHelpBase // must be the
// XDispatchHelper
virtual css::uno::Any SAL_CALL executeDispatch(
const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
- const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sURL ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
throw(css::uno::RuntimeException);
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 2dadf9115d8a..cc050cff67c1 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -153,8 +153,8 @@ class Frame : // interfaces
//---------------------------------------------------------------------------------------------------------
// XComponentLoader
//---------------------------------------------------------------------------------------------------------
- virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const OUString& sURL ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException ,
css::lang::IllegalArgumentException ,
@@ -175,9 +175,9 @@ class Frame : // interfaces
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException );
virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException );
virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException );
- virtual void SAL_CALL setName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException );
- virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const ::rtl::OUString& sTargetFrameName ,
+ 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< css::frame::XFrame > SAL_CALL findFrame ( const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException );
virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException );
@@ -207,7 +207,7 @@ class Frame : // interfaces
// XDispatchProvider
//---------------------------------------------------------------------------------------------------------
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ 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 >& lDescriptor ) throw( css::uno::RuntimeException );
@@ -281,8 +281,8 @@ class Frame : // interfaces
//---------------------------------------------------------------------------------------------------------
// 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);
//---------------------------------------------------------------------------------------------------------
// XTitleChangeBroadcaster
@@ -297,11 +297,11 @@ class Frame : // interfaces
void impl_initializePropInfo();
- virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ,
const css::uno::Any& aValue );
- virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty,
+ virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
sal_Int32 nHandle );
//-------------------------------------------------------------------------------------------------------------
@@ -395,7 +395,7 @@ class Frame : // interfaces
css::uno::Reference< css::frame::XController > m_xController ; /// controller of the actual frame
css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > m_xDropTargetListener ; /// listen to drag & drop
EActiveState m_eActiveState ; /// state, if i'am a member of active path in tree or i have the focus or ...
- ::rtl::OUString m_sName ; /// name of this frame
+ OUString m_sName ; /// name of this frame
sal_Bool m_bIsFrameTop ; /// frame has no parent or the parent is a taskor the desktop
sal_Bool m_bConnected ; /// due to FrameActionEvent
sal_Int16 m_nExternalLockCount ;
@@ -420,7 +420,7 @@ class Frame : // interfaces
return m_xFactory;
}
- inline ::rtl::OUString impl_getName()
+ inline OUString impl_getName()
{
ReadGuard aReadLock( m_aLock );
return m_sName;
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index adef138c4b0b..74d866eeaee8 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -113,27 +113,27 @@ namespace framework
virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDockingAreaAcceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL createElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL destroyElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL requestElement( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL getElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL createElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL destroyElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > SAL_CALL getElements( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL showElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hideElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL dockWindow( const ::rtl::OUString& aName, ::com::sun::star::ui::DockingArea DockingArea, const ::com::sun::star::awt::Point& Pos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL showElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hideElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL dockWindow( const OUString& aName, ::com::sun::star::ui::DockingArea DockingArea, const ::com::sun::star::awt::Point& Pos ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL dockAllWindows( ::sal_Int16 nElementType ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL floatWindow( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL lockWindow( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL unlockWindow( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setElementSize( const ::rtl::OUString& aName, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setElementPos( const ::rtl::OUString& aName, const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setElementPosSize( const ::rtl::OUString& aName, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isElementVisible( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isElementFloating( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isElementDocked( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL isElementLocked( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Size SAL_CALL getElementSize( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getElementPos( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL floatWindow( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL lockWindow( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL unlockWindow( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setElementSize( const OUString& aName, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setElementPos( const OUString& aName, const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setElementPosSize( const OUString& aName, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isElementVisible( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isElementFloating( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isElementDocked( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isElementLocked( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::awt::Size SAL_CALL getElementSize( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::awt::Point SAL_CALL getElementPos( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL doLayout( ) throw (::com::sun::star::uno::RuntimeException);
@@ -212,22 +212,22 @@ namespace framework
//---------------------------------------------------------------------------------------------------------
// query
//---------------------------------------------------------------------------------------------------------
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const rtl::OUString& aName );
+ ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName );
- void implts_writeNewStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
- sal_Bool implts_readWindowStateData( const rtl::OUString& rName, UIElement& rElementData );
- void implts_writeWindowStateData( const rtl::OUString& rName, const UIElement& rElementData );
+ void implts_writeNewStateData( const OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
+ sal_Bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData );
+ void implts_writeWindowStateData( const OUString& rName, const UIElement& rElementData );
void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
void implts_sortUIElements();
void implts_destroyElements();
void implts_toggleFloatingUIElementsVisibility( sal_Bool bActive );
void implts_reparentChildWindows();
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const ::rtl::OUString& aElementName );
+ ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const OUString& aElementName );
sal_Bool implts_isEmbeddedLayoutManager() const;
sal_Int16 implts_getCurrentSymbolsSize();
sal_Int16 implts_getCurrentSymbolsStyle();
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const rtl::OUString& aName );
+ ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const OUString& aName );
// layouting methods
sal_Bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos );
@@ -242,13 +242,13 @@ namespace framework
// internal methods to control status/progress bar
::Size implts_getStatusBarSize();
void implts_destroyStatusBar();
- void implts_createStatusBar( const rtl::OUString& rStatusBarName );
+ void implts_createStatusBar( const OUString& rStatusBarName );
void implts_createProgressBar();
void implts_destroyProgressBar();
void implts_setStatusBarPosSize( const ::Point& rPos, const ::Size& rSize );
sal_Bool implts_showStatusBar( sal_Bool bStoreState=sal_False );
sal_Bool implts_hideStatusBar( sal_Bool bStoreState=sal_False );
- void implts_readStatusBarState( const rtl::OUString& rStatusBarName );
+ void implts_readStatusBarState( const OUString& rStatusBarName );
sal_Bool implts_showProgressBar();
sal_Bool implts_hideProgressBar();
void implts_backupProgressBarWrapper();
@@ -320,19 +320,19 @@ namespace framework
css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState;
css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowStateSupplier;
GlobalSettings* m_pGlobalSettings;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aStatusBarAlias;
- rtl::OUString m_aProgressBarAlias;
- rtl::OUString m_aPropDocked;
- rtl::OUString m_aPropVisible;
- rtl::OUString m_aPropDockingArea;
- rtl::OUString m_aPropDockPos;
- rtl::OUString m_aPropPos;
- rtl::OUString m_aPropSize;
- rtl::OUString m_aPropUIName;
- rtl::OUString m_aPropStyle;
- rtl::OUString m_aPropLocked;
- rtl::OUString m_aCustomizeCmd;
+ OUString m_aModuleIdentifier;
+ OUString m_aStatusBarAlias;
+ OUString m_aProgressBarAlias;
+ OUString m_aPropDocked;
+ OUString m_aPropVisible;
+ OUString m_aPropDockingArea;
+ OUString m_aPropDockPos;
+ OUString m_aPropPos;
+ OUString m_aPropSize;
+ OUString m_aPropUIName;
+ OUString m_aPropStyle;
+ OUString m_aPropLocked;
+ OUString m_aCustomizeCmd;
sal_Int16 m_eSymbolsSize;
sal_Int16 m_eSymbolsStyle;
Timer m_aAsyncLayoutTimer;
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 9d6318818925..a60acee76359 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -88,7 +88,7 @@ class LicenseDialog : public ModalDialog
DECL_LINK(DeclineBtnHdl, void *);
public:
- LicenseDialog(const rtl::OUString& aLicense, ResMgr *pResMgr);
+ LicenseDialog(const OUString& aLicense, ResMgr *pResMgr);
virtual ~LicenseDialog();
};
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 1a45c6b6c127..57ef2ea31c7f 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -82,34 +82,34 @@ namespace framework{
struct tIMPL_DialogData
{
- ::rtl::OUString sUserName ;
- ::rtl::OUString sPassword ;
- css::uno::Sequence< ::rtl::OUString > seqServerList;
+ OUString sUserName ;
+ OUString sPassword ;
+ css::uno::Sequence< OUString > seqServerList;
sal_Int32 nActiveServer ;
- ::rtl::OUString sConnectionType ;
+ OUString sConnectionType ;
css::lang::Locale aLanguage ;
sal_Int32 nPortHttp ;
sal_Int32 nPortHttps ;
css::uno::Any aParentWindow ;
- ::rtl::OUString sSecurityProxy ;
- ::rtl::OUString sUseProxy ;
- ::rtl::OUString sDialog ;
+ OUString sSecurityProxy ;
+ OUString sUseProxy ;
+ OUString sDialog ;
sal_Bool bProxyChanged ;
// default ctor to initialize empty structure.
tIMPL_DialogData()
- : sUserName ( ::rtl::OUString() )
- , sPassword ( ::rtl::OUString() )
- , seqServerList ( css::uno::Sequence< ::rtl::OUString >() )
+ : sUserName ( OUString() )
+ , sPassword ( OUString() )
+ , seqServerList ( css::uno::Sequence< OUString >() )
, nActiveServer ( 1 )
- , sConnectionType ( ::rtl::OUString() )
- , aLanguage ( ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString() )
+ , sConnectionType ( OUString() )
+ , aLanguage ( OUString(), OUString(), OUString() )
, nPortHttp ( 0 )
, nPortHttps ( 0 )
, aParentWindow ( )
- , sSecurityProxy ( ::rtl::OUString() )
- , sUseProxy ( ::rtl::OUString() )
- , sDialog ( ::rtl::OUString() )
+ , sSecurityProxy ( OUString() )
+ , sUseProxy ( OUString() )
+ , sDialog ( OUString() )
, bProxyChanged ( sal_False )
{
}
@@ -256,7 +256,7 @@ class cIMPL_Dialog : public ModalDialog
@onerror -
*//*-*****************************************************************************************************/
- void getProxyHostPort( const ::rtl::OUString& aProxyHostPort, ::rtl::OUString& aHost, ::rtl::OUString& aPort );
+ void getProxyHostPort( const OUString& aProxyHostPort, OUString& aHost, OUString& aPort );
/*-****************************************************************************************************//**
@short get a resource for given id from right resource file
@@ -313,8 +313,8 @@ class cIMPL_Dialog : public ModalDialog
Point m_colOKButtonPos ;
Point m_colCancelButtonPos ;
Point m_colAdditionalButtonPos ;
- ::rtl::OUString m_colButtonAddText ;
- ::rtl::OUString m_expButtonAddText ;
+ OUString m_colButtonAddText ;
+ OUString m_expButtonAddText ;
tIMPL_DialogData m_aDataSet ;
};
@@ -425,7 +425,7 @@ class LoginDialog : public css::lang::XTypeProvider ,
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw( css::uno::RuntimeException );
+ virtual void SAL_CALL setTitle( const OUString& sTitle ) throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@short return the current title of this dialog
@@ -439,7 +439,7 @@ class LoginDialog : public css::lang::XTypeProvider ,
@onerror -
*//*-*****************************************************************************************************/
- virtual ::rtl::OUString SAL_CALL getTitle() throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getTitle() throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@short show the dialog and return user reaction
@@ -609,12 +609,12 @@ class LoginDialog : public css::lang::XTypeProvider ,
@onerror -
*//*-*****************************************************************************************************/
- sal_Bool impl_tryToChangeProperty( const ::rtl::OUString& sProperty ,
+ sal_Bool impl_tryToChangeProperty( const OUString& sProperty ,
const css::uno::Any& aValue ,
css::uno::Any& aOldValue ,
css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
- sal_Bool impl_tryToChangeProperty( const css::uno::Sequence< ::rtl::OUString >& seqProperty,
+ sal_Bool impl_tryToChangeProperty( const css::uno::Sequence< OUString >& seqProperty,
const css::uno::Any& aValue ,
css::uno::Any& aOldValue ,
css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
@@ -688,9 +688,9 @@ class LoginDialog : public css::lang::XTypeProvider ,
@onerror -
*//*-*****************************************************************************************************/
- void impl_addServerToHistory( css::uno::Sequence< ::rtl::OUString >& seqHistory,
+ void impl_addServerToHistory( css::uno::Sequence< OUString >& seqHistory,
sal_Int32& nActiveServer ,
- const ::rtl::OUString& sServer );
+ const OUString& sServer );
/*-****************************************************************************************************//**
@short helper methods to read/write properties from/to ini file
@@ -706,27 +706,27 @@ class LoginDialog : public css::lang::XTypeProvider ,
@onerror Assertions are shown.
*//*-*****************************************************************************************************/
- void impl_writeUserName ( const ::rtl::OUString& sUserName );
+ void impl_writeUserName ( const OUString& sUserName );
void impl_writeActiveServer ( sal_Int32 nActiveServer );
- void impl_writeServerHistory ( const css::uno::Sequence< ::rtl::OUString >& lHistory );
- void impl_writeConnectionType ( const ::rtl::OUString& sConnectionType );
+ void impl_writeServerHistory ( const css::uno::Sequence< OUString >& lHistory );
+ void impl_writeConnectionType ( const OUString& sConnectionType );
void impl_writeLanguage ( const css::lang::Locale& aLanguage );
void impl_writePortHttp ( sal_Int32 nPort );
void impl_writePortHttps ( sal_Int32 nPort );
- void impl_writeSecurityProxy ( const ::rtl::OUString& sSecurityProxy );
- void impl_writeUseProxy ( const ::rtl::OUString& sUseProxy );
- void impl_writeDialog ( const ::rtl::OUString& sDialog );
+ void impl_writeSecurityProxy ( const OUString& sSecurityProxy );
+ void impl_writeUseProxy ( const OUString& sUseProxy );
+ void impl_writeDialog ( const OUString& sDialog );
- ::rtl::OUString impl_readUserName ( );
+ OUString impl_readUserName ( );
sal_Int32 impl_readActiveServer ( );
- css::uno::Sequence< ::rtl::OUString > impl_readServerHistory ( );
- ::rtl::OUString impl_readConnectionType ( );
+ css::uno::Sequence< OUString > impl_readServerHistory ( );
+ OUString impl_readConnectionType ( );
css::lang::Locale impl_readLanguage ( );
sal_Int32 impl_readPortHttp ( );
sal_Int32 impl_readPortHttps ( );
- ::rtl::OUString impl_readSecurityProxy ( );
- ::rtl::OUString impl_readUseProxy ( );
- ::rtl::OUString impl_readDialog ( );
+ OUString impl_readSecurityProxy ( );
+ OUString impl_readUseProxy ( );
+ OUString impl_readDialog ( );
//-------------------------------------------------------------------------------------------------------------
// debug methods
@@ -752,7 +752,7 @@ class LoginDialog : public css::lang::XTypeProvider ,
private:
sal_Bool impldbg_checkParameter_LoginDialog ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
- sal_Bool impldbg_checkParameter_setTitle ( const ::rtl::OUString& sTitle );
+ sal_Bool impldbg_checkParameter_setTitle ( const OUString& sTitle );
#endif // #ifdef ENABLE_ASSERTIONS
@@ -764,7 +764,7 @@ class LoginDialog : public css::lang::XTypeProvider ,
private:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has created this instance
- ::rtl::OUString m_sININame ; /// full qualified path to profile UNC-notation
+ OUString m_sININame ; /// full qualified path to profile UNC-notation
Config* m_pINIManager ; /// manager for full access to ini file
sal_Bool m_bInExecuteMode ; /// protection against setting of properties during showing of dialog
cIMPL_Dialog* m_pDialog ; /// VCL dialog
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 99b8d46efdef..67656f52a9b8 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -111,7 +111,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::
@onerror -
*//*-*****************************************************************************************************/
- virtual sal_Bool SAL_CALL mapStrings( css::uno::Sequence< ::rtl::OUString >& seqParameter ) throw( css::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL mapStrings( css::uno::Sequence< OUString >& seqParameter ) throw( css::uno::RuntimeException );
//-------------------------------------------------------------------------------------------------------------
// variables
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index 849d5500b969..68dc4d8d83c2 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -76,7 +76,7 @@ class ModuleManager:
public:
- static rtl::OUString SAL_CALL impl_getStaticImplementationName();
+ static OUString SAL_CALL impl_getStaticImplementationName();
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
impl_createFactory(
@@ -85,7 +85,7 @@ class ModuleManager:
private:
- static css::uno::Sequence< rtl::OUString >
+ static css::uno::Sequence< OUString >
impl_getSupportedServiceNames();
static css::uno::Reference< css::uno::XInterface > SAL_CALL
@@ -98,24 +98,24 @@ class ModuleManager:
virtual ~ModuleManager( );
// 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)
+ 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);
// XModuleManager
- virtual ::rtl::OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule)
+ virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule)
throw(css::lang::IllegalArgumentException,
css::frame::UnknownModuleException,
css::uno::RuntimeException );
// XNameReplace
- virtual void SAL_CALL replaceByName(const ::rtl::OUString& sName ,
+ virtual void SAL_CALL replaceByName(const OUString& sName ,
const css::uno::Any& aValue)
throw (css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
@@ -123,15 +123,15 @@ class ModuleManager:
css::uno::RuntimeException );
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName(const ::rtl::OUString& sName)
+ virtual css::uno::Any SAL_CALL getByName(const OUString& sName)
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& sName)
+ virtual sal_Bool SAL_CALL hasByName(const OUString& sName)
throw(css::uno::RuntimeException);
// XElementAccess
@@ -142,7 +142,7 @@ class ModuleManager:
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);
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
@@ -198,7 +198,7 @@ class ModuleManager:
@threadsafe
*/
- ::rtl::OUString implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent);
+ OUString implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent);
};
} // namespace framework
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index ea474fb2f7b4..4dffe13a91ae 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -86,7 +86,7 @@ class PathSettings : public css::lang::XTypeProvider ,
}
/// an internal name describing this path
- ::rtl::OUString sPathName;
+ OUString sPathName;
/// contains all paths, which are used internaly - but are not visible for the user.
OUStringList lInternalPaths;
@@ -95,7 +95,7 @@ class PathSettings : public css::lang::XTypeProvider ,
OUStringList lUserPaths;
/// this special path is used to generate feature depending content there
- ::rtl::OUString sWritePath;
+ OUString sWritePath;
/// indicates real single paths, which uses WritePath property only
sal_Bool bIsSinglePath;
@@ -184,10 +184,10 @@ class PathSettings : public css::lang::XTypeProvider ,
/** read a path info using the old cfg schema.
This is needed for "migration on demand" reasons only.
Can be removed for next major release .-) */
- OUStringList impl_readOldFormat(const ::rtl::OUString& sPath);
+ OUStringList impl_readOldFormat(const OUString& sPath);
/** read a path info using the new cfg schema. */
- PathSettings::PathInfo impl_readNewFormat(const ::rtl::OUString& sPath);
+ PathSettings::PathInfo impl_readNewFormat(const OUString& sPath);
/** filter "real user defined paths" from the old configuration schema
and set it as UserPaths on the new schema.
@@ -198,7 +198,7 @@ class PathSettings : public css::lang::XTypeProvider ,
/** reload one path directly from the new configuration schema (because
it was updated by any external code) */
- PathSettings::EChangeOp impl_updatePath(const ::rtl::OUString& sPath ,
+ PathSettings::EChangeOp impl_updatePath(const OUString& sPath ,
sal_Bool bNotifyListener);
/** replace all might existing placeholder variables inside the given path ...
@@ -214,8 +214,8 @@ class PathSettings : public css::lang::XTypeProvider ,
/** converts our new string list schema to the old ";" separated schema ... */
- ::rtl::OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const;
- OUStringList impl_convertOldStyle2Path(const ::rtl::OUString& sOldStylePath) const;
+ OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const;
+ OUStringList impl_convertOldStyle2Path(const OUString& sOldStylePath) const;
/** remove still known paths from the given lList argument.
So real user defined paths can be extracted from the list of
@@ -240,15 +240,15 @@ class PathSettings : public css::lang::XTypeProvider ,
const PathSettings::PathInfo* impl_getPathAccessConst(sal_Int32 nHandle) const;
/** it checks, if the given path value seams to be a valid URL or system path. */
- sal_Bool impl_isValidPath(const ::rtl::OUString& sPath) const;
+ sal_Bool impl_isValidPath(const OUString& sPath) const;
sal_Bool impl_isValidPath(const OUStringList& lPath) const;
void impl_storePath(const PathSettings::PathInfo& aPath);
- css::uno::Sequence< sal_Int32 > impl_mapPathName2IDList(const ::rtl::OUString& sPath);
+ css::uno::Sequence< sal_Int32 > impl_mapPathName2IDList(const OUString& sPath);
void impl_notifyPropListener( PathSettings::EChangeOp eOp ,
- const ::rtl::OUString& sPath ,
+ const OUString& sPath ,
const PathSettings::PathInfo* pPathOld,
const PathSettings::PathInfo* pPathNew);
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 65ebcc30039d..e9853e1dad79 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -74,14 +74,14 @@ enum OperatingSystem
struct SubstituteRule
{
SubstituteRule() {}
- SubstituteRule( const rtl::OUString& aVarName,
- const rtl::OUString& aValue,
+ SubstituteRule( const OUString& aVarName,
+ const OUString& aValue,
const com::sun::star::uno::Any& aVal,
EnvironmentType aType ) :
aSubstVariable( aVarName ), aSubstValue( aValue ), aEnvValue( aVal ), aEnvType( aType ) {}
- rtl::OUString aSubstVariable;
- rtl::OUString aSubstValue;
+ OUString aSubstVariable;
+ OUString aSubstValue;
com::sun::star::uno::Any aEnvValue;
EnvironmentType aEnvType;
};
@@ -90,13 +90,13 @@ struct SubstitutePathNotify
{
SubstitutePathNotify() {};
- const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames;
+ const com::sun::star::uno::Sequence<OUString> aPropertyNames;
};
-class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString,
+class SubstituteVariables : public ::boost::unordered_map< OUString,
SubstituteRule,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
public:
inline void free()
@@ -112,48 +112,48 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
SubstitutePathVariables_Impl( const Link& aNotifyLink );
virtual ~SubstitutePathVariables_Impl();
- static OperatingSystem GetOperatingSystemFromString( const rtl::OUString& );
- static EnvironmentType GetEnvTypeFromString( const rtl::OUString& );
+ static OperatingSystem GetOperatingSystemFromString( const OUString& );
+ static EnvironmentType GetEnvTypeFromString( const OUString& );
void GetSharePointsRules( SubstituteVariables& aSubstVarMap );
/** is called from the ConfigManager before application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. */
- 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();
private:
// Wrapper methods for low-level functions
OperatingSystem GetOperatingSystem();
- const rtl::OUString& GetYPDomainName();
- const rtl::OUString& GetDNSDomainName();
- const rtl::OUString& GetNTDomainName();
- const rtl::OUString& GetHostName();
+ const OUString& GetYPDomainName();
+ const OUString& GetDNSDomainName();
+ const OUString& GetNTDomainName();
+ const OUString& GetHostName();
bool FilterRuleSet( const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule );
- void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< rtl::OUString >& aSharePointsSeq );
- void ReadSharePointRuleSetFromConfiguration( const rtl::OUString& aSharePointName,
- const rtl::OUString& aSharePointNodeName,
+ void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< OUString >& aSharePointsSeq );
+ void ReadSharePointRuleSetFromConfiguration( const OUString& aSharePointName,
+ const OUString& aSharePointNodeName,
SubstituteRuleVector& aRuleSet );
// Stored values for domains and host
bool m_bYPDomainRetrieved;
- rtl::OUString m_aYPDomain;
+ OUString m_aYPDomain;
bool m_bDNSDomainRetrieved;
- rtl::OUString m_aDNSDomain;
+ OUString m_aDNSDomain;
bool m_bNTDomainRetrieved;
- rtl::OUString m_aNTDomain;
+ OUString m_aNTDomain;
bool m_bHostRetrieved;
- rtl::OUString m_aHost;
+ OUString m_aHost;
bool m_bOSRetrieved;
OperatingSystem m_eOSType;
Link m_aListenerNotify;
- const rtl::OUString m_aSharePointsNodeName;
- const rtl::OUString m_aDirPropertyName;
- const rtl::OUString m_aEnvPropertyName;
- const rtl::OUString m_aLevelSep;
+ const OUString m_aSharePointsNodeName;
+ const OUString m_aDirPropertyName;
+ const OUString m_aEnvPropertyName;
+ const OUString m_aLevelSep;
};
enum PreDefVariable
@@ -186,8 +186,8 @@ struct PredefinedPathVariables
{
// Predefined variables supported by substitute variables
LanguageType m_eLanguageType; // Lanuage type of Office
- rtl::OUString m_FixedVar[ PREDEFVAR_COUNT ]; // Variable value access by PreDefVariable
- rtl::OUString m_FixedVarNames[ PREDEFVAR_COUNT ]; // Variable name access by PreDefVariable
+ OUString m_FixedVar[ PREDEFVAR_COUNT ]; // Variable value access by PreDefVariable
+ OUString m_FixedVarNames[ PREDEFVAR_COUNT ]; // Variable name access by PreDefVariable
};
struct ReSubstFixedVarOrder
@@ -205,7 +205,7 @@ struct ReSubstFixedVarOrder
struct ReSubstUserVarOrder
{
sal_Int32 nVarValueLength;
- rtl::OUString aVarName;
+ OUString aVarName;
bool operator< ( const ReSubstUserVarOrder& aUserVarOrder ) const
{
@@ -230,40 +230,40 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
DECLARE_XSERVICEINFO
// XStringSubstitution
- virtual rtl::OUString SAL_CALL substituteVariables( const ::rtl::OUString& aText, sal_Bool bSubstRequired )
+ virtual OUString SAL_CALL substituteVariables( const 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 )
+ virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSubstituteVariableValue( const ::rtl::OUString& variable )
+ virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
protected:
DECL_LINK(implts_ConfigurationNotify, void *);
void SetPredefinedPathVariables( PredefinedPathVariables& );
- rtl::OUString ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const;
+ OUString ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const;
// Special case (transient) values can change during runtime!
// Don't store them in the pre defined struct
- rtl::OUString GetWorkPath() const;
- rtl::OUString GetWorkVariableValue() const;
- rtl::OUString GetPathVariableValue() const;
+ OUString GetWorkPath() const;
+ OUString GetWorkVariableValue() const;
+ OUString GetPathVariableValue() const;
- rtl::OUString GetHomeVariableValue() const;
+ OUString GetHomeVariableValue() const;
// XStringSubstitution implementation methods
- rtl::OUString impl_substituteVariable( const ::rtl::OUString& aText, bool bSustRequired )
+ OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- rtl::OUString impl_reSubstituteVariables( const ::rtl::OUString& aText )
+ OUString impl_reSubstituteVariables( const OUString& aText )
throw (::com::sun::star::uno::RuntimeException);
- ::rtl::OUString impl_getSubstituteVariableValue( const ::rtl::OUString& variable )
+ OUString impl_getSubstituteVariableValue( const OUString& variable )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
- class VarNameToIndexMap : public boost::unordered_map< ::rtl::OUString,
+ class VarNameToIndexMap : public boost::unordered_map< OUString,
PreDefVariable,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
inline void free()
{
@@ -272,8 +272,8 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
};
// heavy used string
- const rtl::OUString m_aVarStart;
- const rtl::OUString m_aVarEnd;
+ const OUString m_aVarStart;
+ const OUString m_aVarEnd;
VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access
SubstituteVariables m_aSubstVarMap; // Active rule set map indexed by variable name!
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 905c142b8130..b7ab2d0e5dcd 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -144,10 +144,10 @@ class TabWindowService : public css::lang::XTypeProvider
private:
void impl_initializePropInfo();
- virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty,
+ virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ,
const css::uno::Any& aValue );
- virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty,
+ virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
sal_Int32 nHandle );
DECL_DLLPRIVATE_LINK( EventListener, VclSimpleEvent * );
@@ -184,7 +184,7 @@ class TabWindowService : public css::lang::XTypeProvider
::sal_Int32 m_nCurrentPageIndex;
/// title of the tabcontrolled window
- ::rtl::OUString m_sTitle;
+ OUString m_sTitle;
}; // class TabWindowService
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index 54d961dedcf5..2d80f43163dd 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -134,14 +134,14 @@ class TaskCreatorService : public css::lang::XTypeProvider
css::uno::Reference< css::frame::XFrame > implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame ,
const css::uno::Reference< css::awt::XWindow >& xContainerWindow ,
- const ::rtl::OUString& sName );
+ const OUString& sName );
void implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame >& xFrame );
void implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame >& xFrame );
void implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame >& xFrame );
- ::rtl::OUString impl_filterNames( const ::rtl::OUString& sName );
+ OUString impl_filterNames( const OUString& sName );
};
} // namespace framework
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index bce15cf6e141..e5c838228c3c 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -42,7 +42,7 @@ public:
DECLARE_XSERVICEINFO
// ::com::sun::star::util::XStringAbbreviation:
- virtual ::rtl::OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const ::rtl::OUString & aString) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (::com::sun::star::uno::RuntimeException);
private:
UriAbbreviation(UriAbbreviation &); // not defined
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index 884b96aef630..29d1c79b8b97 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -126,7 +126,7 @@ class URLTransformer : public ::cppu::WeakImplHelper2< ::com::sun::star::ut
*//*-*****************************************************************************************************/
virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL ,
- const ::rtl::OUString& sSmartProtocol ) throw( css::uno::RuntimeException );
+ const OUString& sSmartProtocol ) throw( css::uno::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -154,7 +154,7 @@ class URLTransformer : public ::cppu::WeakImplHelper2< ::com::sun::star::ut
@onerror -
*//*-*****************************************************************************************************/
- virtual ::rtl::OUString SAL_CALL getPresentation( const css::util::URL& aURL ,
+ virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL ,
sal_Bool bWithPassword ) throw( css::uno::RuntimeException );
//-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index c73f0ebb7031..fe227a8a118a 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -86,23 +86,23 @@ struct KeyEventEqualsFunc
It implements some additional funtionality which can be useful but
is missing at the normal vector implementation.
*/
-class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString >
+class OUStringList : public ::comphelper::SequenceAsVector< OUString >
{
public:
// insert given element as the first one into the vector
- void push_front( const ::rtl::OUString& sElement )
+ void push_front( const OUString& sElement )
{
insert( begin(), sElement );
}
// search for given element
- iterator find( const ::rtl::OUString& sElement )
+ iterator find( const OUString& sElement )
{
return ::std::find(begin(), end(), sElement);
}
- const_iterator findConst( const ::rtl::OUString& sElement ) const
+ const_iterator findConst( const OUString& sElement ) const
{
return ::std::find(begin(), end(), sElement);
}
@@ -121,7 +121,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString >
It implements some additional funtionality which can be useful but
is missing at the normal std implementation.
*/
-typedef ::std::queue< ::rtl::OUString > OUStringQueue;
+typedef ::std::queue< OUString > OUStringQueue;
//_________________________________________________________________________________________________________________
@@ -131,10 +131,10 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue;
is missing at the normal hash implementation.
*/
template< class TType >
-class BaseHash : public ::boost::unordered_map< ::rtl::OUString ,
+class BaseHash : public ::boost::unordered_map< OUString ,
TType ,
- rtl::OUStringHash ,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash ,
+ ::std::equal_to< OUString > >
{
public:
@@ -151,7 +151,7 @@ class BaseHash : public ::boost::unordered_map< ::rtl::OUString
Basic OUString hash.
Key and values are OUStrings.
*/
-typedef BaseHash< ::rtl::OUString > OUStringHashMap;
+typedef BaseHash< OUString > OUStringHashMap;
//_________________________________________________________________________________________________________________
@@ -169,9 +169,9 @@ typedef BaseHash< sal_Int32 > NameToHandleHash;
and we need it at different positions ...
So it's better to declare it one times only!
*/
-typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString ,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > ListenerHash;
+typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
+ OUStringHash,
+ ::std::equal_to< OUString > > ListenerHash;
} // namespace framework
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index dd784b3f8848..e2bf729a153b 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -154,7 +154,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider ,
sal_Int32 impl_GetPageIdFromIndex( ::sal_Int32 nIndex ) const;
sal_Bool impl_CheckIndex( ::sal_Int32 nIndex ) const;
void implts_LayoutWindows() const;
- void impl_SetTitle( const ::rtl::OUString& rTitle );
+ void impl_SetTitle( const OUString& rTitle );
TabControl* impl_GetTabControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xTabControlWindow ) const;
void implts_SendNotification( Notification eNotify, sal_Int32 ID ) const;
void implts_SendNotification( Notification eNotify, sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rSeq ) const;
@@ -164,8 +164,8 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider ,
sal_Bool m_bInitialized : 1,
m_bDisposed : 1;
sal_Int32 m_nNextTabID;
- ::rtl::OUString m_aTitlePropName;
- ::rtl::OUString m_aPosPropName;
+ OUString m_aTitlePropName;
+ OUString m_aPosPropName;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow > m_xTopWindow;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xContainerWindow;
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index ebcc847f83b6..49044c420ab2 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -34,15 +34,15 @@ namespace framework
GraphicNameAccess();
virtual ~GraphicNameAccess();
- void addElement( const rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement );
+ void addElement( const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement );
// 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
@@ -54,7 +54,7 @@ namespace framework
private:
typedef BaseHash< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > NameGraphicHashMap;
NameGraphicHashMap m_aNameToElementMap;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeq;
+ ::com::sun::star::uno::Sequence< OUString > m_aSeq;
};
}
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 8993456ceecd..82c52d56d17b 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -78,12 +78,12 @@ namespace framework
// XImageManager
virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
// XUIConfiguration
virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 4ddd79a26d9c..f1f9c86945d8 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -33,14 +33,14 @@ enum ImageType
ImageType_COUNT
};
-typedef boost::unordered_map< rtl::OUString,
- rtl::OUString,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap;
-typedef boost::unordered_map< rtl::OUString,
+typedef boost::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ ::std::equal_to< OUString > > CommandToImageNameMap;
+typedef boost::unordered_map< OUString,
bool,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > CommandMap;
+ OUStringHash,
+ ::std::equal_to< OUString > > CommandMap;
}
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 23d9c3f13e25..0a8be679a7bd 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -76,12 +76,12 @@ namespace framework
// XImageManager
virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
// XUIConfiguration
virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 6d8f564fdeb0..1ca6d2383df2 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -76,11 +76,11 @@ namespace framework
throw (::com::sun::star::uno::RuntimeException);
// XModuleUIConfigurationManagerSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const ::rtl::OUString& ModuleIdentifier )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
- typedef ::boost::unordered_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
+ typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHash, ::std::equal_to< OUString > > ModuleToModuleCfgMgr;
//TODO_AS void impl_initStorages();
@@ -88,8 +88,8 @@ namespace framework
ModuleToModuleCfgMgr m_aModuleToModuleUICfgMgrMap;
bool m_bDisposed;
// TODO_AS bool m_bInit;
- rtl::OUString m_aDefaultConfigURL;
- rtl::OUString m_aUserConfigURL;
+ OUString m_aDefaultConfigURL;
+ OUString m_aUserConfigURL;
com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xDefaultCfgRootStorage;
com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserCfgRootStorage;
com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit;
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 2712e6ad7910..a41438673e21 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -93,18 +93,18 @@ namespace framework
virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL createSettings( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL replaceSettings( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertSettings( const ::rtl::OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getImageManager() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getShortCutManager() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getEventsManager() throw (::com::sun::star::uno::RuntimeException);
// XModuleUIConfigurationManager
- virtual sal_Bool SAL_CALL isDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XUIConfigurationPersistence
virtual void SAL_CALL reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
@@ -131,18 +131,18 @@ namespace framework
struct UIElementInfo
{
- UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) :
+ UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) :
aResourceURL( rResourceURL), aUIName( rUIName ) {}
- rtl::OUString aResourceURL;
- rtl::OUString aUIName;
+ OUString aResourceURL;
+ OUString aUIName;
};
struct UIElementData
{
UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {};
- rtl::OUString aResourceURL;
- rtl::OUString aName;
+ OUString aResourceURL;
+ OUString aName;
bool bModified; // has been changed since last storing
bool bDefault; // default settings
bool bDefaultNode; // this is a default layer element data
@@ -151,7 +151,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::boost::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -171,14 +171,14 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
void impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType );
- UIElementData* impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
+ UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
void impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData );
void impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState = true );
void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
@@ -193,11 +193,11 @@ namespace framework
bool m_bModified;
bool m_bConfigRead;
bool m_bDisposed;
- rtl::OUString m_aXMLPostfix;
- rtl::OUString m_aPropUIName;
- rtl::OUString m_aPropResourceURL;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aModuleShortName;
+ OUString m_aXMLPostfix;
+ OUString m_aPropUIName;
+ OUString m_aPropResourceURL;
+ OUString m_aModuleIdentifier;
+ OUString m_aModuleShortName;
com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit;
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index bb3e73660f5b..4c5b5d05eccd 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -48,7 +48,7 @@ class UICategoryDescription : public UICommandDescription
DECLARE_XSERVICEINFO
private:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const ::rtl::OUString& _sName);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const OUString& _sName);
};
} // namespace framework
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 36bd51eb1d69..6e3ec29a0fc7 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -79,11 +79,11 @@ namespace framework
virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL createSettings( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL replaceSettings( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertSettings( const ::rtl::OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getImageManager() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getShortCutManager() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getEventsManager() throw (::com::sun::star::uno::RuntimeException);
@@ -110,18 +110,18 @@ namespace framework
struct UIElementInfo
{
- UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) :
+ UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) :
aResourceURL( rResourceURL), aUIName( rUIName ) {}
- rtl::OUString aResourceURL;
- rtl::OUString aUIName;
+ OUString aResourceURL;
+ OUString aUIName;
};
struct UIElementData
{
UIElementData() : bModified( false ), bDefault( true ) {};
- rtl::OUString aResourceURL;
- rtl::OUString aName;
+ OUString aResourceURL;
+ OUString aName;
bool bModified; // has been changed since last storing
bool bDefault; // default settings
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings;
@@ -129,7 +129,7 @@ namespace framework
struct UIElementType;
friend struct UIElementType;
- typedef ::boost::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+ typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -149,14 +149,14 @@ namespace framework
typedef ::std::vector< UIElementType > UIElementTypesVector;
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+ typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
// private methods
void impl_Initialize();
void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
void impl_preloadUIElementTypeList( sal_Int16 nElementType );
- UIElementData* impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
+ UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
void impl_requestUIElementData( sal_Int16 nElementType, UIElementData& aUIElementData );
void impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState = true );
void impl_resetElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer );
@@ -168,10 +168,10 @@ namespace framework
bool m_bModified;
bool m_bConfigRead;
bool m_bDisposed;
- rtl::OUString m_aXMLPostfix;
- rtl::OUString m_aPropUIName;
- rtl::OUString m_aPropResourceURL;
- rtl::OUString m_aModuleIdentifier;
+ OUString m_aXMLPostfix;
+ OUString m_aPropUIName;
+ OUString m_aPropResourceURL;
+ OUString m_aModuleIdentifier;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xImageManager;
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 363497eacde4..afb760ad3599 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -75,13 +75,13 @@ class WindowStateConfiguration : private ThreadHelpBase
DECLARE_XSERVICEINFO
// 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
@@ -90,15 +90,15 @@ class WindowStateConfiguration : private ThreadHelpBase
virtual sal_Bool SAL_CALL hasElements()
throw (::com::sun::star::uno::RuntimeException);
- typedef ::boost::unordered_map< ::rtl::OUString,
- ::rtl::OUString,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap;
+ typedef ::boost::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ ::std::equal_to< OUString > > ModuleToWindowStateFileMap;
- typedef ::boost::unordered_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< OUString,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap;
+ OUStringHash,
+ ::std::equal_to< OUString > > ModuleToWindowStateConfigHashMap;
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext;
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 83e33c666887..26c2ac60df01 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -50,7 +50,7 @@ class AddonsToolBarManager : public ToolBarManager
public:
AddonsToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
- const rtl::OUString& rResourceName,
+ const OUString& rResourceName,
ToolBar* pToolBar );
virtual ~AddonsToolBarManager();
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 4ad55af1d3d4..3c285506d077 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -51,7 +51,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener,
public:
ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
ToolBox* pToolBar,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~ButtonToolbarController();
// XInterface
@@ -86,7 +86,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener,
private:
sal_Bool m_bInitialized : 1,
m_bDisposed : 1;
- rtl::OUString m_aCommandURL;
+ OUString m_aCommandURL;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index e5ea87f7343e..3288916ef4e3 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -57,7 +57,7 @@ class ComboboxToolbarController : public IComboBoxListener,
ToolBox* pToolBar,
sal_uInt16 nID,
sal_Int32 nWidth,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~ComboboxToolbarController();
// XComponent
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index badf136e1cc2..f792c6466228 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -42,7 +42,7 @@ struct ExecuteInfo
struct NotifyInfo
{
- ::rtl::OUString aEventName;
+ OUString aEventName;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XControlNotificationListener > xNotifyListener;
::com::sun::star::util::URL aSourceURL;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aInfoSeq;
@@ -58,7 +58,7 @@ class ComplexToolbarController : public svt::ToolboxController
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolBar,
sal_uInt16 nID,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~ComplexToolbarController();
// XComponent
@@ -75,8 +75,8 @@ class ComplexToolbarController : public svt::ToolboxController
protected:
static sal_Int32 getFontSizePixel( const Window* pWindow );
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const rtl::OUString& aCommand ) const;
- void addNotifyInfo( const ::rtl::OUString& aEventName,
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const;
+ void addNotifyInfo( const OUString& aEventName,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rInfo );
@@ -85,7 +85,7 @@ class ComplexToolbarController : public svt::ToolboxController
const ::com::sun::star::util::URL& getInitializedURL();
void notifyFocusGet();
void notifyFocusLost();
- void notifyTextChanged( const ::rtl::OUString& aText );
+ void notifyTextChanged( const OUString& aText );
ToolBox* m_pToolbar;
sal_uInt16 m_nID;
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 30998ffd2333..2742a63a4f5a 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -91,12 +91,12 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType
// 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);
@@ -111,7 +111,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer );
std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector;
- rtl::OUString m_aUIName;
+ OUString m_aUIName;
};
}
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index e0228522a64f..68d93517f08d 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -72,10 +72,10 @@ namespace framework
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);
- class UrlToDispatchMap : public ::boost::unordered_map< ::rtl::OUString,
+ class UrlToDispatchMap : public ::boost::unordered_map< OUString,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
public:
inline void free()
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 0f09a931d910..0bc9c3874695 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -56,7 +56,7 @@ class DropdownToolbarController : public IListBoxListener,
ToolBox* pToolBar,
sal_uInt16 nID,
sal_Int32 nWidth,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~DropdownToolbarController();
// XComponent
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 35911188984c..ac06db819a66 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -57,7 +57,7 @@ class EditToolbarController : public IEditListener,
ToolBox* pToolBar,
sal_uInt16 nID,
sal_Int32 nWidth,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~EditToolbarController();
// XComponent
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 472839422c3b..255fc519751a 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -65,9 +65,9 @@ namespace framework
private:
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);
- void fillPopupMenu( const com::sun::star::uno::Sequence< ::rtl::OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( const com::sun::star::uno::Sequence< OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
- rtl::OUString m_aFontFamilyName;
+ OUString m_aFontFamilyName;
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xFontListDispatch;
};
}
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 86e73b54fdd6..32a2244838be 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -65,7 +65,7 @@ namespace framework
virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
void setCurHeight( long nHeight, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
- rtl::OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+ OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
long* m_pHeightArray;
com::sun::star::awt::FontDescriptor m_aFontDescriptor;
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index bfc935f644c0..996543ce2b0b 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -31,12 +31,12 @@ namespace framework
virtual ~FooterMenuController();
// 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 > SAL_CALL impl_getStaticSupportedServiceNames( );
- static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( );
+ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( );
+ static OUString SAL_CALL 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 );
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index ba4177bfa9c6..f2c2b03efad2 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -38,7 +38,7 @@ class GenericToolbarController : public svt::ToolboxController
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolBar,
sal_uInt16 nID,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~GenericToolbarController();
// XComponent
@@ -57,7 +57,7 @@ class GenericToolbarController : public svt::ToolboxController
sal_uInt16 m_nID;
sal_Bool m_bEnumCommand : 1,
m_bMadeInvisible : 1;
- rtl::OUString m_aEnumCommand;
+ OUString m_aEnumCommand;
};
class MenuToolbarController : public GenericToolbarController
@@ -65,14 +65,14 @@ class MenuToolbarController : public GenericToolbarController
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc;
PopupMenu* pMenu;
com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager;
- rtl::OUString m_aModuleIdentifier;
+ OUString m_aModuleIdentifier;
public:
MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolBar,
sal_uInt16 nID,
- const rtl::OUString& aCommand,
- const rtl::OUString& aModuleIdentifier,
+ const OUString& aCommand,
+ const OUString& aModuleIdentifier,
const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
~MenuToolbarController();
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index 2d9dd37b489d..e30d1cecdfe1 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -40,7 +40,7 @@ class ImageButtonToolbarController : public ComplexToolbarController
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolBar,
sal_uInt16 nID,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~ImageButtonToolbarController();
// XComponent
@@ -50,7 +50,7 @@ class ImageButtonToolbarController : public ComplexToolbarController
virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand );
private:
- sal_Bool ReadImageFromURL( sal_Bool bBigImage, const rtl::OUString& aImageURL, Image& aImage );
+ sal_Bool ReadImageFromURL( sal_Bool bBigImage, const OUString& aImageURL, Image& aImage );
};
}
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index e6eb10133847..84c43ad09d23 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -76,18 +76,18 @@ namespace framework
};
sal_Bool m_bShowMenu;
- ::rtl::OUString m_aLangStatusCommandURL;
+ OUString m_aLangStatusCommandURL;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xLanguageDispatch;
- ::rtl::OUString m_aMenuCommandURL_Lang;
+ OUString m_aMenuCommandURL_Lang;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Lang;
- ::rtl::OUString m_aMenuCommandURL_Font;
+ OUString m_aMenuCommandURL_Font;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Font;
- ::rtl::OUString m_aMenuCommandURL_CharDlgForParagraph;
+ OUString m_aMenuCommandURL_CharDlgForParagraph;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph;
- ::rtl::OUString m_aCurLang;
+ OUString m_aCurLang;
sal_Int16 m_nScriptType;
- ::rtl::OUString m_aKeyboardLang;
- ::rtl::OUString m_aGuessedTextLang;
+ OUString m_aKeyboardLang;
+ OUString m_aGuessedTextLang;
LanguageGuessingHelper m_aLangGuessHelper;
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode );
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index 9027f99da564..560e627c8e8e 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -86,9 +86,9 @@ class LangSelectionStatusbarController : public svt::StatusbarController
sal_Bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text)
sal_Int16 m_nScriptType; // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004
- ::rtl::OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages
- ::rtl::OUString m_aKeyboardLang; // the keyboard language
- ::rtl::OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed
+ OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages
+ OUString m_aKeyboardLang; // the keyboard language
+ OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed
LanguageGuessingHelper m_aLangGuessHelper;
void LangMenu() throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx
index 7b6aab1aa282..4b52656448dd 100644
--- a/framework/inc/uielement/logotextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx
@@ -72,7 +72,7 @@ class LogoTextStatusbarController : public svt::StatusbarController
virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
private:
- rtl::OUString m_aLogoText;
+ OUString m_aLogoText;
};
}
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 2483b08d1eee..72e360aab968 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -53,7 +53,7 @@ namespace framework
DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* );
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
- ::rtl::OUString m_aModuleIdentifier;
+ OUString m_aModuleIdentifier;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels;
public:
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index e7a6688d0d78..6198f71182ed 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -66,7 +66,7 @@ struct PopupControllerEntry
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
};
-typedef boost::unordered_map< rtl::OUString, PopupControllerEntry, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > PopupControllerCache;
+typedef boost::unordered_map< OUString, PopupControllerEntry, OUStringHash, ::std::equal_to< OUString > > PopupControllerCache;
class BmkMenu;
class AddonMenu;
@@ -102,7 +102,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
- const rtl::OUString& aModuleIdentifier,
+ const OUString& aModuleIdentifier,
Menu* pMenu,
sal_Bool bDelete,
sal_Bool bDeleteChildren );
@@ -144,19 +144,19 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
// Configuration methods
static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer );
static void FillMenu( sal_uInt16& nId,
Menu* pMenu,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider );
void FillMenuManager( Menu* pMenu,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
- const rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
sal_Bool bDelete,
sal_Bool bDeleteChildren );
void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer );
@@ -192,11 +192,11 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
sal_uInt16 nItemId;
sal_Bool bCheckHide;
- ::rtl::OUString aTargetFrame;
- ::rtl::OUString aMenuItemURL;
- ::rtl::OUString aFilter;
- ::rtl::OUString aPassword;
- ::rtl::OUString aTitle;
+ OUString aTargetFrame;
+ OUString aMenuItemURL;
+ OUString aFilter;
+ OUString aPassword;
+ OUString aTitle;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xSubMenuManager;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xMenuItemDispatch;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > xPopupMenuController;
@@ -210,14 +210,14 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
const MenuItemHandler* );
void CheckAndAddMenuExtension( Menu* pMenu );
static void impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
- const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands,
+ const ::com::sun::star::uno::Sequence< OUString >& rCommands,
std::vector< MenuItemHandler* >& aMenuShortCuts );
- static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier );
+ static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const OUString& aModuleIdentifier );
MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler );
- void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId);
- sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
+ void AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId);
+ sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false);
void SetHdl();
@@ -231,8 +231,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
sal_Bool m_bRetrieveImages : 1,
m_bAcceleratorCfg : 1;
sal_Bool m_bModuleIdentified;
- ::rtl::OUString m_aMenuItemCommand;
- ::rtl::OUString m_aModuleIdentifier;
+ OUString m_aMenuItemCommand;
+ OUString m_aModuleIdentifier;
Menu* m_pVCLMenu;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels;
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 57586e71c763..de352898771b 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -33,11 +33,11 @@ typedef ::std::vector< AddonMenuItem > AddonMenuContainer;
struct AddonMenuItem
{
- ::rtl::OUString aTitle;
- ::rtl::OUString aURL;
- ::rtl::OUString aTarget;
- ::rtl::OUString aImageId;
- ::rtl::OUString aContext;
+ OUString aTitle;
+ OUString aURL;
+ OUString aTarget;
+ OUString aImageId;
+ OUString aContext;
AddonMenuContainer aSubMenu;
};
@@ -60,12 +60,12 @@ struct ReferencePathInfo
class MenuBarMerger
{
public:
- static bool IsCorrectContext( const ::rtl::OUString& aContext, const ::rtl::OUString& aModuleIdentifier );
+ static bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier );
- static void RetrieveReferencePath( const ::rtl::OUString&,
- std::vector< ::rtl::OUString >& aReferencePath );
- static ReferencePathInfo FindReferencePath( const std::vector< ::rtl::OUString >& aReferencePath, Menu* pMenu );
- static sal_uInt16 FindMenuItem( const ::rtl::OUString& rCmd,
+ static void RetrieveReferencePath( const OUString&,
+ std::vector< OUString >& aReferencePath );
+ static ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu );
+ static sal_uInt16 FindMenuItem( const OUString& rCmd,
Menu* pMenu );
static void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry,
AddonMenuItem& aAddonMenu );
@@ -74,35 +74,35 @@ class MenuBarMerger
static bool ProcessMergeOperation( Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
static bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
- const ::std::vector< ::rtl::OUString >& rReferencePath,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,
+ const ::std::vector< OUString >& rReferencePath,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
static bool ProcessFallbackOperation();
static bool MergeMenuItems( Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16 nModIndex,
sal_uInt16& rItemId,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
static bool ReplaceMenuItem( Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16& rItemId,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems );
static bool RemoveMenuItems( Menu* pMenu,
sal_uInt16 nPos,
- const ::rtl::OUString& rMergeCommandParameter );
+ const OUString& rMergeCommandParameter );
static bool CreateSubMenu( Menu* pSubMenu,
sal_uInt16& nItemId,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonSubMenu );
private:
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 47bfcce26d02..1bdeca3b726c 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -69,9 +69,9 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
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);
private:
virtual void impl_fillNewData();
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index ff9b2beed4f1..b86242ef0534 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -82,15 +82,15 @@ namespace framework
virtual void impl_setPopupMenu();
struct AddInfo
{
- rtl::OUString aTargetFrame;
- rtl::OUString aImageId;
+ OUString aTargetFrame;
+ OUString aImageId;
};
typedef ::boost::unordered_map< int, AddInfo > AddInfoForId;
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
- const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands,
+ const ::com::sun::star::uno::Sequence< OUString >& rCommands,
std::vector< KeyCode >& aMenuShortCuts );
void setAccelerators( PopupMenu* pPopupMenu );
void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode );
@@ -103,9 +103,9 @@ namespace framework
m_bModuleIdentified : 1,
m_bAcceleratorCfg : 1;
AddInfoForId m_aAddInfoForItem;
- rtl::OUString m_aTargetFrame;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aEmptyDocURL;
+ OUString m_aTargetFrame;
+ OUString m_aModuleIdentifier;
+ OUString m_aEmptyDocURL;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager;
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 88c48325cbce..39179ee582c9 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -49,9 +49,9 @@ class ProgressBarWrapper : public UIElementWrapperBase
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getStatusBar() const;
// wrapped methods of ::com::sun::star::task::XStatusIndicator
- void start( const ::rtl::OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException);
+ void start( const OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException);
void end() throw (::com::sun::star::uno::RuntimeException);
- void setText( const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
+ void setText( const OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
void setValue( ::sal_Int32 Value ) throw (::com::sun::star::uno::RuntimeException);
void reset() throw (::com::sun::star::uno::RuntimeException);
@@ -78,7 +78,7 @@ class ProgressBarWrapper : public UIElementWrapperBase
sal_Bool m_bOwnsInstance; // Indicator that we are owner of the XWindow
sal_Int32 m_nRange;
sal_Int32 m_nValue;
- rtl::OUString m_aText;
+ OUString m_aText;
}; // class ProgressBarWrapper
} // namespace framework
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 2b07c41a1b21..afad9561e787 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -52,7 +52,7 @@ namespace framework
virtual void SAL_CALL activate( 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 );
// XDispatch
virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException );
@@ -66,9 +66,9 @@ namespace framework
virtual void impl_setPopupMenu();
struct RecentFile
{
- rtl::OUString aURL;
- rtl::OUString aTitle;
- rtl::OUString aPassword;
+ OUString aURL;
+ OUString aTitle;
+ OUString aPassword;
};
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 940232a7c089..e4c489b98269 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -127,7 +127,7 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider
mutable ShareableMutex m_aShareMutex;
std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector;
- rtl::OUString m_aUIName;
+ OUString m_aUIName;
};
}
diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index 65651917949a..a40d1229d06c 100644
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
@@ -74,7 +74,7 @@ class SimpleTextStatusbarController : public svt::StatusbarController
virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
private:
- rtl::OUString m_aText;
+ OUString m_aText;
};
}
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 6be90b3aefc6..e2a3b8cca16a 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -63,7 +63,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
ToolBox* pToolBar,
sal_uInt16 nID,
sal_Int32 nWidth,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~SpinfieldToolbarController();
// XComponent
@@ -88,7 +88,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
private:
bool impl_getValue( const ::com::sun::star::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat );
- rtl::OUString impl_formatOutputString( double fValue );
+ OUString impl_formatOutputString( double fValue );
bool m_bFloat,
m_bMaxSet,
@@ -98,7 +98,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
double m_nValue;
double m_nStep;
SpinfieldControl* m_pSpinfieldControl;
- rtl::OUString m_aOutFormat;
+ OUString m_aOutFormat;
};
}
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 86e05133fa4d..4c88c968bea0 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -56,7 +56,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
public:
StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
- const rtl::OUString& rResourceName,
+ const OUString& rResourceName,
StatusBar* pStatusBar );
virtual ~StatusBarManager();
@@ -96,7 +96,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
DECL_LINK(DoubleClick, void *);
void RemoveControllers();
- rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL );
+ OUString RetrieveLabelFromCommand( const OUString& aCmdURL );
void CreateControllers();
void UpdateControllers();
void AddFrameActionListener();
@@ -110,8 +110,8 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
m_bUpdateControllers : 1;
sal_Bool m_bModuleIdentified;
StatusBar* m_pStatusBar;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aResourceName;
+ OUString m_aModuleIdentifier;
+ OUString m_aResourceName;
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame;
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels;
StatusBarControllerVector m_aControllerVector;
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index c19254a4ad5f..28aa0f4cc187 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -46,11 +46,11 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1< ::com:
//---------------------------------------------------------------------------------------------------------
// XStatusIndicator
//---------------------------------------------------------------------------------------------------------
- virtual void SAL_CALL start ( const ::rtl::OUString& sText ,
+ virtual void SAL_CALL start ( const OUString& sText ,
sal_Int32 nRange ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL end ( ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL reset ( ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setText ( const ::rtl::OUString& sText ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setText ( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException );
private:
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 0f1bf8703838..afa924555271 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -48,7 +48,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController
ToolBox* pToolBar,
sal_uInt16 nID,
Style eStyle,
- const rtl::OUString& aCommand );
+ const OUString& aCommand );
virtual ~ToggleButtonToolbarController();
// XComponent
@@ -65,8 +65,8 @@ class ToggleButtonToolbarController : public ComplexToolbarController
DECL_LINK( MenuSelectHdl, Menu *);
Style m_eStyle;
- rtl::OUString m_aCurrentSelection;
- std::vector< rtl::OUString > m_aDropdownMenuList;
+ OUString m_aCurrentSelection;
+ std::vector< OUString > m_aDropdownMenuList;
};
}
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 0592e0c78605..d02c42db04ce 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -80,7 +80,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
public:
ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
- const rtl::OUString& rResourceName,
+ const OUString& rResourceName,
ToolBar* pToolBar );
virtual ~ToolBarManager();
@@ -112,7 +112,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
void CheckAndUpdateImages();
virtual void RefreshImages();
void FillToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolBarData );
- void notifyRegisteredControllers( const rtl::OUString& aUIElementName, const rtl::OUString& aCommand );
+ void notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand );
void Destroy();
enum ExecuteCommand
@@ -126,7 +126,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
struct ExecuteInfo
{
- rtl::OUString aToolbarResName;
+ OUString aToolbarResName;
ExecuteCommand nCmd;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow;
@@ -159,9 +159,9 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
virtual bool MenuItemAllowed( sal_uInt16 ) const;
void RemoveControllers();
- rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL );
- sal_Int32 RetrievePropertiesFromCommand( const rtl::OUString& aCmdURL );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL );
+ OUString RetrieveLabelFromCommand( const OUString& aCmdURL );
+ sal_Int32 RetrievePropertiesFromCommand( const OUString& aCmdURL );
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const OUString& rCmdURL );
void CreateControllers();
void UpdateControllers();
//for update controller via Support Visiable
@@ -175,13 +175,13 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const;
sal_Bool IsPluginMode() const;
- Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages );
+ Image QueryAddonsImage( const OUString& aCommandURL, bool bBigImages );
long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( ));
void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event );
- static bool impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const rtl::OUString& rCommand, rtl::OUString& rShortCut );
- bool RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut );
+ static bool impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const OUString& rCommand, OUString& rShortCut );
+ bool RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut );
protected:
typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
@@ -200,8 +200,8 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
m_bImageMirrored : 1;
long m_lImageRotation;
ToolBar* m_pToolBar;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aResourceName;
+ OUString m_aModuleIdentifier;
+ OUString m_aResourceName;
com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame;
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels;
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index a57a142d7ff0..f174e66758bb 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -41,19 +41,19 @@ namespace framework
struct AddonsParams
{
- ::rtl::OUString aImageId;
- ::rtl::OUString aTarget;
- ::rtl::OUString aControlType;
+ OUString aImageId;
+ OUString aTarget;
+ OUString aControlType;
};
struct AddonToolbarItem
{
- ::rtl::OUString aCommandURL;
- ::rtl::OUString aLabel;
- ::rtl::OUString aImageIdentifier;
- ::rtl::OUString aTarget;
- ::rtl::OUString aContext;
- ::rtl::OUString aControlType;
+ OUString aCommandURL;
+ OUString aLabel;
+ OUString aImageIdentifier;
+ OUString aTarget;
+ OUString aContext;
+ OUString aControlType;
sal_uInt16 nWidth;
};
@@ -69,31 +69,31 @@ struct ReferenceToolbarPathInfo
class ToolBarMerger
{
public:
- static bool IsCorrectContext( const ::rtl::OUString& aContext, const ::rtl::OUString& aModuleIdentifier );
+ static bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier );
static bool ConvertSeqSeqToVector( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > rSequence,
AddonToolbarItemContainer& rContainer );
static void ConvertSequenceToValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rSequence,
- ::rtl::OUString& rCommandURL,
- ::rtl::OUString& rLabel,
- ::rtl::OUString& rImageIdentifier,
- ::rtl::OUString& rTarget,
- ::rtl::OUString& rContext,
- ::rtl::OUString& rControlType,
+ OUString& rCommandURL,
+ OUString& rLabel,
+ OUString& rImageIdentifier,
+ OUString& rTarget,
+ OUString& rContext,
+ OUString& rControlType,
sal_uInt16& rWidth );
static ReferenceToolbarPathInfo FindReferencePoint( ToolBox* pToolbar,
- const ::rtl::OUString& rReferencePoint );
+ const OUString& rReferencePoint );
static bool ProcessMergeOperation( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
ToolBox* pToolbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
+ const OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
const AddonToolbarItemContainer& rItems );
static bool ProcessMergeFallback( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
@@ -101,9 +101,9 @@ class ToolBarMerger
sal_uInt16 nPos,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
+ const OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,
const AddonToolbarItemContainer& rItems );
static bool MergeItems( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
@@ -112,7 +112,7 @@ class ToolBarMerger
sal_uInt16 nModIndex,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonToolbarItemContainer& rAddonToolbarItems );
static bool ReplaceItem( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
@@ -120,21 +120,21 @@ class ToolBarMerger
sal_uInt16 nPos,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonToolbarItemContainer& rAddonToolbarItems );
static bool RemoveItems( ToolBox* pToolbar,
sal_uInt16 nPos,
- const ::rtl::OUString& rMergeCommandParameter );
+ const OUString& rMergeCommandParameter );
static ::cppu::OWeakObject* CreateController(
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame,
ToolBox* pToolbar,
- const ::rtl::OUString& rCommandURL,
+ const OUString& rCommandURL,
sal_uInt16 nId,
sal_uInt16 nWidth,
- const ::rtl::OUString& rControlType );
+ const OUString& rControlType );
static void CreateToolbarItem( ToolBox* pToolbox,
CommandToInfoMap& rCommandMap,
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 52370f6cb681..e5ba4bf74458 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -85,21 +85,21 @@ namespace framework
private:
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager );
- rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL );
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL );
- void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& aLabel );
+ OUString getUINameFromCommand( const OUString& rCommandURL );
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL );
+ void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
sal_Bool isContextSensitiveToolbarNonVisible();
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandDescription;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aPropUIName;
- rtl::OUString m_aPropResourceURL;
+ OUString m_aModuleIdentifier;
+ OUString m_aPropUIName;
+ OUString m_aPropResourceURL;
sal_Bool m_bModuleIdentified;
sal_Bool m_bResetActive;
- std::vector< rtl::OUString > m_aCommandVector;
+ std::vector< OUString > m_aCommandVector;
IntlWrapper m_aIntlWrapper;
};
}
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index a777ca642b67..57611c6585ad 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -59,7 +59,7 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException);
// XUIFunctionListener
- virtual void SAL_CALL functionExecute( const ::rtl::OUString& aUIElementName, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL functionExecute( const OUString& aUIElementName, const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
using cppu::OPropertySetHelper::disposing;
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 987a1d85e97b..eb49683d05d6 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -57,13 +57,13 @@ class UICommandDescription : private ThreadHelpBase ,
DECLARE_XSERVICEINFO
private:
// 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
@@ -73,22 +73,22 @@ private:
throw (::com::sun::star::uno::RuntimeException);
public:
- typedef ::boost::unordered_map< ::rtl::OUString,
- ::rtl::OUString,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap;
+ typedef ::boost::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ ::std::equal_to< OUString > > ModuleToCommandFileMap;
- typedef ::boost::unordered_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< OUString,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > UICommandsHashMap;
+ OUStringHash,
+ ::std::equal_to< OUString > > UICommandsHashMap;
protected:
UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const ::rtl::OUString& _sName);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const OUString& _sName);
void impl_fillElements(const sal_Char* _pName);
sal_Bool m_bConfigRead;
- rtl::OUString m_aPrivateResourceURL;
+ OUString m_aPrivateResourceURL;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
ModuleToCommandFileMap m_aModuleToCommandFileMap;
UICommandsHashMap m_aUICommandsHashMap;
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
index b9aca8453b69..8b8d7be08d39 100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -71,8 +71,8 @@ struct UIElement
m_nStyle( BUTTON_SYMBOL )
{}
- UIElement( const rtl::OUString& rName,
- const rtl::OUString& rType,
+ UIElement( const OUString& rName,
+ const OUString& rType,
const com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement,
bool bFloating = false
) : m_aType( rType ),
@@ -94,9 +94,9 @@ struct UIElement
bool operator< ( const UIElement& aUIElement ) const;
UIElement& operator=( const UIElement& rUIElement );
- rtl::OUString m_aType;
- rtl::OUString m_aName;
- rtl::OUString m_aUIName;
+ OUString m_aType;
+ OUString m_aName;
+ OUString m_aUIName;
com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xUIElement;
bool m_bFloating,
m_bVisible,
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index d05f11c17c5f..7f0c377494ff 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -55,7 +55,7 @@ class AddonsToolBoxFactory : protected ThreadHelpBase
DECLARE_XSERVICEINFO
// XUIElementFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) 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& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
sal_Bool hasButtonsInContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rPropSeq,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 6e04ca814c6e..82a9943b6926 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -51,16 +51,16 @@ class ConfigurationAccess_ControllerFactory : // interfaces
public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
{
public:
- ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::rtl::OUString& _sRoot,bool _bAskValue = false );
+ ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue = false );
virtual ~ConfigurationAccess_ControllerFactory();
void readConfigurationData();
void updateConfigurationData();
- rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
- rtl::OUString getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const;
- void addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier );
- void removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule );
+ OUString getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const;
+ OUString getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const;
+ void addServiceToCommandModule( const OUString& rCommandURL, const OUString& rModule, const OUString& rServiceSpecifier );
+ void removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule );
inline bool hasValue() const { return m_bAskValue; }
// container.XContainerListener
@@ -74,15 +74,15 @@ public:
private:
struct ControllerInfo
{
- rtl::OUString m_aImplementationName;
- rtl::OUString m_aValue;
- ControllerInfo(const ::rtl::OUString& _aImplementationName,const ::rtl::OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
+ OUString m_aImplementationName;
+ OUString m_aValue;
+ ControllerInfo(const OUString& _aImplementationName,const OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
ControllerInfo(){}
};
- class MenuControllerMap : public boost::unordered_map< rtl::OUString,
+ class MenuControllerMap : public boost::unordered_map< OUString,
ControllerInfo,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
inline void free()
{
@@ -90,13 +90,13 @@ private:
}
};
- sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier,rtl::OUString& aValue ) const;
+ sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const;
- rtl::OUString m_aPropCommand;
- rtl::OUString m_aPropModule;
- rtl::OUString m_aPropController;
- rtl::OUString m_aPropValue;
- rtl::OUString m_sRoot;
+ OUString m_aPropCommand;
+ OUString m_aPropModule;
+ OUString m_aPropController;
+ OUString m_aPropValue;
+ OUString m_sRoot;
MenuControllerMap m_aMenuControllerMap;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess;
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index 0ce2e71e6060..ea58ce908ce3 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -52,9 +52,9 @@ namespace framework
DECLARE_XSERVICEINFO
// XUIElementFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) 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& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- static void CreateUIElement(const ::rtl::OUString& ResourceURL
+ static void CreateUIElement(const OUString& ResourceURL
, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args
,const char* _pExtraMode
,const char* _pAsciiName
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index c3233b2db2b3..2e0e0cd956a8 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -40,7 +40,7 @@ class StatusBarFactory : public MenuBarFactory
DECLARE_XSERVICEINFO
// XUIElementFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) 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& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
};
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
index c750a44fb9d2..f72c6e6979fa 100644
--- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
@@ -50,14 +50,14 @@ class ToolbarControllerFactory : protected ThreadHelpBase
DECLARE_XSERVICEINFO
// XMultiComponentFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::rtl::OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) 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 createInstanceWithContext( const OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) 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);
// XUIControllerRegistration
- virtual sal_Bool SAL_CALL hasController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL registerController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName, const ::rtl::OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deregisterController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
protected:
ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool );
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index ea62fced95d5..43384bebec02 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -40,7 +40,7 @@ class ToolBoxFactory : public MenuBarFactory
DECLARE_XSERVICEINFO
// XUIElementFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) 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& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
};
}
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index 001988f32158..d9fddc4cbc95 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -53,14 +53,14 @@ namespace framework
public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
{
public:
- ConfigurationAccess_FactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::rtl::OUString& _sRoot );
+ ConfigurationAccess_FactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const OUString& _sRoot );
virtual ~ConfigurationAccess_FactoryManager();
void readConfigurationData();
- rtl::OUString getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const;
- void addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& aServiceSpecifier );
- void removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule );
+ OUString getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const;
+ void addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& aServiceSpecifier );
+ void removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule );
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > getFactoriesDescription() const;
// container.XContainerListener
@@ -72,10 +72,10 @@ namespace framework
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
private:
- class FactoryManagerMap : public boost::unordered_map< rtl::OUString,
- rtl::OUString,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ class FactoryManagerMap : public boost::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
inline void free()
{
@@ -83,13 +83,13 @@ namespace framework
}
};
- sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const;
+ sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const;
- rtl::OUString m_aPropType;
- rtl::OUString m_aPropName;
- rtl::OUString m_aPropModule;
- rtl::OUString m_aPropFactory;
- ::rtl::OUString m_sRoot;
+ OUString m_aPropType;
+ OUString m_aPropName;
+ OUString m_aPropModule;
+ OUString m_aPropFactory;
+ OUString m_sRoot;
FactoryManagerMap m_aFactoryManagerMap;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess;
@@ -110,13 +110,13 @@ class UIElementFactoryManager : private ThreadHelpBase
DECLARE_XSERVICEINFO
// XUIElementFactory
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) 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& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XUIElementFactoryRegistration
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getRegisteredFactories( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory > SAL_CALL getFactory( const ::rtl::OUString& ResourceURL, const ::rtl::OUString& ModuleIdentifier ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier, const ::rtl::OUString& aFactoryImplementationName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index c189218a32a3..c4aca5aaf7b3 100644
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
@@ -59,7 +59,7 @@ class WindowContentFactoryManager : private ThreadHelpBase
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- static void RetrieveTypeNameFromResourceURL( const ::rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName );
+ static void RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUString& aType, OUString& aName );
private:
sal_Bool m_bConfigRead;
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 5a5496a892d9..886a519def6b 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -148,25 +148,25 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler
throw(css::xml::sax::SAXException,
css::uno::RuntimeException );
- virtual void SAL_CALL startElement(const ::rtl::OUString& sElement ,
+ virtual void SAL_CALL startElement(const OUString& sElement ,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException );
- virtual void SAL_CALL endElement(const ::rtl::OUString& sElement)
+ virtual void SAL_CALL endElement(const OUString& sElement)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException );
- virtual void SAL_CALL characters(const ::rtl::OUString& sChars)
+ virtual void SAL_CALL characters(const OUString& sChars)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException );
- virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& sWhitespaces)
+ virtual void SAL_CALL ignorableWhitespace(const OUString& sWhitespaces)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException );
- virtual void SAL_CALL processingInstruction(const ::rtl::OUString& sTarget,
- const ::rtl::OUString& sData )
+ virtual void SAL_CALL processingInstruction(const OUString& sTarget,
+ const OUString& sData )
throw(css::xml::sax::SAXException,
css::uno::RuntimeException );
@@ -181,15 +181,15 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler
//---------------------------------------
/** TODO document me */
- static EXMLElement implst_classifyElement(const ::rtl::OUString& sElement);
+ static EXMLElement implst_classifyElement(const OUString& sElement);
//---------------------------------------
/** TODO document me */
- static EXMLAttribute implst_classifyAttribute(const ::rtl::OUString& sAttribute);
+ static EXMLAttribute implst_classifyAttribute(const OUString& sAttribute);
//---------------------------------------
/** TODO document me */
- ::rtl::OUString implts_getErrorLineString();
+ OUString implts_getErrorLineString();
};
} // namespace framework
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index fe40f9aa3c2d..ac51454b213c 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -92,7 +92,7 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase
//---------------------------------------
/** @short TODO */
void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey ,
- const ::rtl::OUString& sCommand,
+ const OUString& sCommand,
const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig );
};
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 4f17ff4fa466..fdc9f4cca025 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -79,25 +79,25 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right
::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 );
@@ -107,12 +107,12 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right
::com::sun::star::uno::RuntimeException );
private:
- ::rtl::OUString getErrorLineString();
+ OUString getErrorLineString();
- class ImageHashMap : public ::boost::unordered_map< ::rtl::OUString ,
+ class ImageHashMap : public ::boost::unordered_map< OUString ,
Image_XML_Entry ,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
public:
inline void free()
@@ -170,11 +170,11 @@ class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right i
const ImageListsDescriptor& m_aImageListsItems;
::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_aXMLXlinkNS;
- ::rtl::OUString m_aXMLImageNS;
- ::rtl::OUString m_aAttributeType;
- ::rtl::OUString m_aAttributeXlinkType;
- ::rtl::OUString m_aAttributeValueSimple;
+ OUString m_aXMLXlinkNS;
+ OUString m_aXMLImageNS;
+ OUString m_aAttributeType;
+ OUString m_aAttributeXlinkType;
+ OUString m_aAttributeValueSimple;
};
} // namespace framework
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index b3f3ddd54095..a35634eb36d9 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -52,25 +52,25 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // S
::com::sun::star::uno::RuntimeException ) = 0;
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 ) = 0;
- 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 ) = 0;
- 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 ) = 0;
- 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 );
@@ -80,20 +80,20 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // S
::com::sun::star::uno::RuntimeException );
protected:
- ::rtl::OUString getErrorLineString();
+ OUString getErrorLineString();
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader;
void initPropertyCommon( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &rProps,
- const rtl::OUString &rCommandURL, const rtl::OUString &rHelpId,
- const rtl::OUString &rLabel, sal_Int16 nItemStyleBits );
+ const OUString &rCommandURL, const OUString &rHelpId,
+ const OUString &rLabel, sal_Int16 nItemStyleBits );
private:
- rtl::OUString m_aType;
- rtl::OUString m_aLabel;
- rtl::OUString m_aContainer;
- rtl::OUString m_aHelpURL;
- rtl::OUString m_aCommandURL;
- rtl::OUString m_aStyle;
+ OUString m_aType;
+ OUString m_aLabel;
+ OUString m_aContainer;
+ OUString m_aHelpURL;
+ OUString m_aCommandURL;
+ OUString m_aStyle;
::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp;
};
@@ -115,16 +115,16 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
::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 );
@@ -154,16 +154,16 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
::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 );
@@ -192,16 +192,16 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
::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 );
@@ -230,17 +230,17 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
::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 );
@@ -270,13 +270,13 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler
virtual void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw
( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
- virtual void WriteMenuItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, sal_Int16 nStyle = 0 );
+ virtual void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 );
virtual void WriteMenuSeparator();
com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer;
::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;
};
} // namespace framework
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index f0a688dcd792..1ceb01bfd4ec 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -50,25 +50,25 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for ri
::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 );
@@ -80,15 +80,15 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for ri
protected:
typedef ::std::stack< XMLNamespaces > NamespaceStack;
- ::rtl::OUString getErrorLineString();
+ OUString getErrorLineString();
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler;
NamespaceStack m_aNamespaceStack;
sal_Int32 m_nDepth;
- rtl::OUString m_aXMLAttributeNamespace;
- rtl::OUString m_aXMLAttributeType;
+ OUString m_aXMLAttributeNamespace;
+ OUString m_aXMLAttributeType;
};
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 4fecf775384b..e1ac3b919915 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -76,25 +76,25 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S
::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 );
@@ -104,12 +104,12 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S
::com::sun::star::uno::RuntimeException );
private:
- ::rtl::OUString getErrorLineString();
+ OUString getErrorLineString();
- class StatusBarHashMap : public ::boost::unordered_map< ::rtl::OUString ,
+ class StatusBarHashMap : public ::boost::unordered_map< OUString ,
StatusBar_XML_Entry ,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
public:
inline void free()
@@ -140,8 +140,8 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // S
protected:
virtual void WriteStatusBarItem(
- const rtl::OUString& rCommandURL,
- const rtl::OUString& rHelpURL,
+ const OUString& rCommandURL,
+ const OUString& rHelpURL,
sal_Int16 nOffset,
sal_Int16 nStyle,
sal_Int16 nWidth ) throw
@@ -151,10 +151,10 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // S
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_aStatusBarItems;
::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_aXMLStatusBarNS;
- ::rtl::OUString m_aXMLXlinkNS;
- ::rtl::OUString m_aAttributeType;
- ::rtl::OUString m_aAttributeURL;
+ OUString m_aXMLStatusBarNS;
+ OUString m_aXMLXlinkNS;
+ OUString m_aAttributeType;
+ OUString m_aAttributeURL;
};
} // namespace framework
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 9cb2564a872e..3e7364f471e6 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -81,25 +81,25 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S
::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 );
@@ -109,12 +109,12 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S
::com::sun::star::uno::RuntimeException );
private:
- ::rtl::OUString getErrorLineString();
+ OUString getErrorLineString();
- class ToolBoxHashMap : public ::boost::unordered_map< ::rtl::OUString ,
+ class ToolBoxHashMap : public ::boost::unordered_map< OUString ,
ToolBox_XML_Entry ,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > >
+ OUStringHash,
+ ::std::equal_to< OUString > >
{
public:
inline void free()
@@ -142,13 +142,13 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S
sal_Int32 m_nHashCode_Style_DropDownOnly;
sal_Int32 m_nHashCode_Style_Text;
sal_Int32 m_nHashCode_Style_Image;
- rtl::OUString m_aType;
- rtl::OUString m_aLabel;
- rtl::OUString m_aStyle;
- rtl::OUString m_aHelpURL;
- rtl::OUString m_aTooltip;
- rtl::OUString m_aIsVisible;
- rtl::OUString m_aCommandURL;
+ OUString m_aType;
+ OUString m_aLabel;
+ OUString m_aStyle;
+ OUString m_aHelpURL;
+ OUString m_aTooltip;
+ OUString m_aIsVisible;
+ OUString m_aCommandURL;
};
@@ -165,7 +165,7 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // S
::com::sun::star::uno::RuntimeException );
protected:
- virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, const rtl::OUString& aTooltip, sal_Int16 nStyle,
+ virtual void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle,
sal_Int16 nWidth, sal_Bool bVisible ) throw
( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException );
@@ -185,10 +185,10 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // S
::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;
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_rItemAccess;
- ::rtl::OUString m_aXMLToolbarNS;
- ::rtl::OUString m_aXMLXlinkNS;
- ::rtl::OUString m_aAttributeType;
- ::rtl::OUString m_aAttributeURL;
+ OUString m_aXMLToolbarNS;
+ OUString m_aXMLXlinkNS;
+ OUString m_aAttributeType;
+ OUString m_aAttributeURL;
};
} // namespace framework
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index ae75bec6ac17..8d19790507d4 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -35,22 +35,22 @@ class FWE_DLLPUBLIC XMLNamespaces
XMLNamespaces( const XMLNamespaces& );
virtual ~XMLNamespaces();
- void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue )
+ void addNamespace( const OUString& aName, const OUString& aValue )
throw( ::com::sun::star::xml::sax::SAXException );
- ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const
+ OUString applyNSToAttributeName( const OUString& ) const
throw( ::com::sun::star::xml::sax::SAXException );
- ::rtl::OUString applyNSToElementName( const ::rtl::OUString& ) const
+ OUString applyNSToElementName( const OUString& ) const
throw( ::com::sun::star::xml::sax::SAXException );
private:
- typedef ::std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap;
+ typedef ::std::map< OUString, OUString > NamespaceMap;
- ::rtl::OUString getNamespaceValue( const ::rtl::OUString& aNamespace ) const
+ OUString getNamespaceValue( const OUString& aNamespace ) const
throw( ::com::sun::star::xml::sax::SAXException );
- ::rtl::OUString m_aDefaultNamespace;
- ::rtl::OUString m_aXMLAttributeNamespace;
+ OUString m_aDefaultNamespace;
+ OUString m_aXMLAttributeNamespace;
NamespaceMap m_aNamespaceMap;
};
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index 179d63963d19..2c1d8d555a6b 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -84,7 +84,7 @@ sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const
}
//-----------------------------------------------
-sal_Bool AcceleratorCache::hasCommand(const ::rtl::OUString& sCommand) const
+sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const
{
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
@@ -119,7 +119,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
//-----------------------------------------------
void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey ,
- const ::rtl::OUString& sCommand)
+ const OUString& sCommand)
{
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
@@ -136,7 +136,7 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey ,
}
//-----------------------------------------------
-AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUString& sCommand) const
+AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const
{
TKeyList lKeys;
@@ -146,7 +146,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr
TCommand2Keys::const_iterator pCommand = m_lCommand2Keys.find(sCommand);
if (pCommand == m_lCommand2Keys.end())
throw css::container::NoSuchElementException(
- ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >());
+ OUString(), css::uno::Reference< css::uno::XInterface >());
lKeys = pCommand->second;
aReadLock.unlock();
@@ -156,9 +156,9 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr
}
//-----------------------------------------------
-::rtl::OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
+OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
{
- ::rtl::OUString sCommand;
+ OUString sCommand;
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
@@ -166,7 +166,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr
TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey);
if (pKey == m_lKey2Commands.end())
throw css::container::NoSuchElementException(
- ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >());
+ OUString(), css::uno::Reference< css::uno::XInterface >());
sCommand = pKey->second;
aReadLock.unlock();
@@ -189,7 +189,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
// get its registered command
// Because we must know its place inside the optimized
// structure, which bind keys to commands, too!
- ::rtl::OUString sCommand = pKey->second;
+ OUString sCommand = pKey->second;
pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-)
// remove key from primary list
@@ -203,7 +203,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
}
//-----------------------------------------------
-void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand)
+void AcceleratorCache::removeCommand(const OUString& sCommand)
{
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2a0330d30a58..c2cd26cd33f8 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -67,10 +67,10 @@ namespace framework
namespace fpc = ::framework::pattern::configuration;
#endif
- ::rtl::OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent)
+ OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent)
{
const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier...
- ::rtl::OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex));
+ OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex));
if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT )
sKeyBuffer.appendAscii("_SHIFT");
@@ -133,7 +133,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException )
{
@@ -143,7 +143,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
AcceleratorCache& rCache = impl_getCFG();
if (!rCache.hasKey(aKeyEvent))
throw css::container::NoSuchElementException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::cppu::OWeakObject* >(this));
return rCache.getCommandByKey(aKeyEvent);
@@ -152,7 +152,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
//-----------------------------------------------
void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
- const ::rtl::OUString& sCommand )
+ const OUString& sCommand )
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
@@ -163,13 +163,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
(aKeyEvent.Modifiers == 0)
)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Such key event seams not to be supported by any operating system."),
+ OUString("Such key event seams not to be supported by any operating system."),
static_cast< ::cppu::OWeakObject* >(this),
0);
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -194,7 +194,7 @@ throw(css::container::NoSuchElementException,
AcceleratorCache& rCache = impl_getCFG(sal_True); // true => force using of a writeable cache
if (!rCache.hasKey(aKeyEvent))
throw css::container::NoSuchElementException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::cppu::OWeakObject* >(this));
rCache.removeKey(aKeyEvent);
@@ -202,14 +202,14 @@ throw(css::container::NoSuchElementException,
}
//-----------------------------------------------
-css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -219,7 +219,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
AcceleratorCache& rCache = impl_getCFG();
if (!rCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::cppu::OWeakObject* >(this));
AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(sCommand);
@@ -229,7 +229,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
}
//-----------------------------------------------
-css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
throw(css::lang::IllegalArgumentException ,
css::uno::RuntimeException )
{
@@ -243,10 +243,10 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
for (i=0; i<c; ++i)
{
- const ::rtl::OUString& rCommand = lCommandList[i];
+ const OUString& rCommand = lCommandList[i];
if (rCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
(sal_Int16)i);
@@ -268,14 +268,14 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
}
//-----------------------------------------------
-void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
0);
@@ -285,7 +285,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
if (!rCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString("Command does not exists inside this container."),
+ OUString("Command does not exists inside this container."),
static_cast< ::cppu::OWeakObject* >(this));
rCache.removeCommand(sCommand);
@@ -316,7 +316,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
xIn = xStream->getInputStream();
if (!xIn.is())
throw css::io::IOException(
- ::rtl::OUString("Could not open accelerator configuration for reading."),
+ OUString("Could not open accelerator configuration for reading."),
static_cast< ::cppu::OWeakObject* >(this));
// impl_ts_load() does not clear the cache
@@ -355,7 +355,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString("Could not open accelerator configuration for saving."),
+ OUString("Could not open accelerator configuration for saving."),
static_cast< ::cppu::OWeakObject* >(this));
impl_ts_save(xOut);
@@ -382,7 +382,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString("Could not open accelerator configuration for saving."),
+ OUString("Could not open accelerator configuration for saving."),
static_cast< ::cppu::OWeakObject* >(this));
impl_ts_save(xOut);
@@ -474,7 +474,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u
//-----------------------------------------------
// IStorageListener
-void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/)
+void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/)
{
reload();
}
@@ -618,7 +618,7 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
css::uno::Reference< css::uno::XInterface > xCFG = fpc::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR),
"/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
css::uno::Reference< css::beans::XPropertySet > xProp (xCFG, css::uno::UNO_QUERY_THROW);
- ::rtl::OUString sISOLocale;
+ OUString sISOLocale;
xProp->getPropertyValue("ooLocale") >>= sISOLocale;
if (sISOLocale.isEmpty())
@@ -660,7 +660,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
, m_pPrimaryWriteCache(0 )
, m_pSecondaryWriteCache(0 )
{
- const ::rtl::OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
+ const OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(m_xSMGR), CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
css::uno::UNO_QUERY );
@@ -693,7 +693,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException )
{
@@ -705,7 +705,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent))
throw css::container::NoSuchElementException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::cppu::OWeakObject* >(this));
if (rPrimaryCache.hasKey(aKeyEvent))
@@ -718,7 +718,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
//-----------------------------------------------
void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
- const ::rtl::OUString& sCommand )
+ const OUString& sCommand )
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
@@ -731,13 +731,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
(aKeyEvent.Modifiers == 0)
)
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Such key event seams not to be supported by any operating system."),
+ OUString("Such key event seams not to be supported by any operating system."),
static_cast< ::cppu::OWeakObject* >(this),
0);
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -749,7 +749,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
if ( rPrimaryCache.hasKey(aKeyEvent) )
{
- ::rtl::OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+ OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
if ( sCommand != sOriginalCommand )
{
if (rSecondaryCache.hasCommand(sOriginalCommand))
@@ -772,7 +772,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
else if ( rSecondaryCache.hasKey(aKeyEvent) )
{
- ::rtl::OUString sOriginalCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
+ OUString sOriginalCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
if (sCommand != sOriginalCommand)
{
if (rPrimaryCache.hasCommand(sCommand))
@@ -816,15 +816,15 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent))
throw css::container::NoSuchElementException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::cppu::OWeakObject* >(this));
if (rPrimaryCache.hasKey(aKeyEvent))
{
- ::rtl::OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+ OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
if (!sDelCommand.isEmpty())
{
- ::rtl::OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+ OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
if (rSecondaryCache.hasCommand(sOriginalCommand))
{
AcceleratorCache::TKeyList lSecondaryKeys = rSecondaryCache.getKeysByCommand(sOriginalCommand);
@@ -838,7 +838,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
}
else
{
- ::rtl::OUString sDelCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
+ OUString sDelCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
if (!sDelCommand.isEmpty())
rSecondaryCache.removeKey(aKeyEvent);
}
@@ -847,14 +847,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
}
//-----------------------------------------------
-css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
1);
@@ -866,7 +866,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString(),
+ OUString(),
static_cast< ::cppu::OWeakObject* >(this));
AcceleratorCache::TKeyList lKeys = rPrimaryCache.getKeysByCommand(sCommand);
@@ -901,7 +901,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
}
//-----------------------------------------------
-css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
throw(css::lang::IllegalArgumentException ,
css::uno::RuntimeException )
{
@@ -915,10 +915,10 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
for (i=0; i<c; ++i)
{
- const ::rtl::OUString& rCommand = lCommandList[i];
+ const OUString& rCommand = lCommandList[i];
if (rCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
(sal_Int16)i);
@@ -944,14 +944,14 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
}
//-----------------------------------------------
-void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Empty command strings are not allowed here."),
+ OUString("Empty command strings are not allowed here."),
static_cast< ::cppu::OWeakObject* >(this),
0);
@@ -963,7 +963,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
throw css::container::NoSuchElementException(
- ::rtl::OUString("Command does not exists inside this container."),
+ OUString("Command does not exists inside this container."),
static_cast< ::cppu::OWeakObject* >(this));
if (rPrimaryCache.hasCommand(sCommand))
@@ -1055,17 +1055,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
return;
long nOpenModes = css::embed::ElementModes::READWRITE;
- css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString("accelerator"), nOpenModes);
+ css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(OUString("accelerator"), nOpenModes);
if (!xAcceleratorTypeStorage.is())
return;
- css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString("current"), nOpenModes);
+ css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(OUString("current"), nOpenModes);
css::uno::Reference< css::io::XOutputStream > xOut;
if (xStream.is())
xOut = xStream->getOutputStream();
if (!xOut.is())
throw css::io::IOException(
- ::rtl::OUString("Could not open accelerator configuration for saving."),
+ OUString("Could not open accelerator configuration for saving."),
static_cast< ::cppu::OWeakObject* >(this));
// the original m_aCache has been split into primay cache and secondary cache...
@@ -1160,7 +1160,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
throw(css::uno::RuntimeException)
{
css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
- ::rtl::OUString sConfig = xNamed->getName();
+ OUString sConfig = xNamed->getName();
if ( sConfig == "Global" )
{
m_xCfg = css::uno::Reference< css::container::XNameAccess > (
@@ -1214,25 +1214,25 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
// So we try to split the path into 3 parts (module isnt important here, because we already know it ... because
// these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all.
- ::rtl::OUString sOrgPath ;
- ::rtl::OUString sPath ;
- ::rtl::OUString sKey;
+ OUString sOrgPath ;
+ OUString sPath ;
+ OUString sKey;
aChange.Accessor >>= sOrgPath;
sPath = sOrgPath;
- ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
- ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
+ OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
+ OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
if ( sGlobalModules == CFG_ENTRY_GLOBAL )
{
- ::rtl::OUString sModule;
+ OUString sModule;
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
if ( !sKey.isEmpty() && !sPath.isEmpty() )
reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
}
else if ( sGlobalModules == CFG_ENTRY_MODULES )
{
- ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
+ OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
if ( !sKey.isEmpty() && !sPath.isEmpty() )
@@ -1263,28 +1263,28 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
xModules->getByName(m_sModuleCFG) >>= xAccess;
}
- const ::rtl::OUString sIsoLang = impl_ts_getLocale();
- const ::rtl::OUString sDefaultLocale("en-US");
+ const OUString sIsoLang = impl_ts_getLocale();
+ const OUString sDefaultLocale("en-US");
css::uno::Reference< css::container::XNameAccess > xKey;
css::uno::Reference< css::container::XNameAccess > xCommand;
if (xAccess.is())
{
- css::uno::Sequence< ::rtl::OUString > lKeys = xAccess->getElementNames();
+ css::uno::Sequence< OUString > lKeys = xAccess->getElementNames();
sal_Int32 nKeys = lKeys.getLength();
for ( sal_Int32 i=0; i<nKeys; ++i )
{
- ::rtl::OUString sKey = lKeys[i];
+ OUString sKey = lKeys[i];
xAccess->getByName(sKey) >>= xKey;
xKey->getByName(CFG_PROP_COMMAND) >>= xCommand;
- css::uno::Sequence< ::rtl::OUString > lLocales = xCommand->getElementNames();
+ css::uno::Sequence< OUString > lLocales = xCommand->getElementNames();
sal_Int32 nLocales = lLocales.getLength();
- ::std::vector< ::rtl::OUString > aLocales;
+ ::std::vector< OUString > aLocales;
for ( sal_Int32 j=0; j<nLocales; ++j )
aLocales.push_back(lLocales[j]);
- ::std::vector< ::rtl::OUString >::const_iterator pFound;
+ ::std::vector< OUString >::const_iterator pFound;
for ( pFound = aLocales.begin(); pFound != aLocales.end(); ++pFound )
{
if ( *pFound == sIsoLang )
@@ -1303,8 +1303,8 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
continue;
}
- ::rtl::OUString sLocale = *pFound;
- ::rtl::OUString sCommand;
+ OUString sLocale = *pFound;
+ OUString sCommand;
xCommand->getByName(sLocale) >>= sCommand;
if (sCommand.isEmpty())
continue;
@@ -1312,11 +1312,11 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
css::awt::KeyEvent aKeyEvent;
sal_Int32 nIndex = 0;
- ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
- ::rtl::OUString sPrefix("KEY_");
+ OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
+ OUString sPrefix("KEY_");
aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
- css::uno::Sequence< ::rtl::OUString > sToken(4);
+ css::uno::Sequence< OUString > sToken(4);
const sal_Int32 nToken = 4;
sal_Bool bValid = sal_True;
sal_Int32 k;
@@ -1375,14 +1375,14 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
for ( pIt = lPrimaryWriteKeys.begin(); pIt != lPrimaryWriteKeys.end(); ++pIt )
{
- ::rtl::OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt);
+ OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt);
if (!m_aPrimaryReadCache.hasKey(*pIt))
{
insertKeyToConfiguration(*pIt, sCommand, sal_True);
}
else
{
- ::rtl::OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt);
+ OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt);
if (sReadCommand != sCommand)
insertKeyToConfiguration(*pIt, sCommand, sal_True);
}
@@ -1419,14 +1419,14 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
for ( pIt = lSecondaryWriteKeys.begin(); pIt != lSecondaryWriteKeys.end(); ++pIt )
{
- ::rtl::OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt);
+ OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt);
if (!m_aSecondaryReadCache.hasKey(*pIt))
{
insertKeyToConfiguration(*pIt, sCommand, sal_False);
}
else
{
- ::rtl::OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt);
+ OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt);
if (sReadCommand != sCommand)
insertKeyToConfiguration(*pIt, sCommand, sal_False);
}
@@ -1452,7 +1452,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
}
//-----------------------------------------------
-void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred )
+void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred )
{
css::uno::Reference< css::container::XNameAccess > xAccess;
css::uno::Reference< css::container::XNameContainer > xContainer;
@@ -1479,7 +1479,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
xModules->getByName(m_sModuleCFG) >>= xContainer;
}
- const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
+ const OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
css::uno::Reference< css::container::XNameAccess > xKey;
css::uno::Reference< css::container::XNameContainer > xCommand;
if ( !xContainer->hasByName(sKey) )
@@ -1491,7 +1491,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
xContainer->getByName(sKey) >>= xKey;
xKey->getByName(CFG_PROP_COMMAND) >>= xCommand;
- ::rtl::OUString sLocale = impl_ts_getLocale();
+ OUString sLocale = impl_ts_getLocale();
if ( !xCommand->hasByName(sLocale) )
xCommand->insertByName(sLocale, css::uno::makeAny(sCommand));
else
@@ -1520,12 +1520,12 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
xModules->getByName(m_sModuleCFG) >>= xContainer;
}
- const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
+ const OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
xContainer->removeByName(sKey);
}
//-----------------------------------------------
-void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey )
+void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey )
{
css::uno::Reference< css::container::XNameAccess > xAccess;
css::uno::Reference< css::container::XNameContainer > xContainer;
@@ -1543,13 +1543,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
}
css::awt::KeyEvent aKeyEvent;
- ::rtl::OUString sKeyIdentifier;
+ OUString sKeyIdentifier;
sal_Int32 nIndex = 0;
sKeyIdentifier = sKey.getToken(0, '_', nIndex);
- aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString("KEY_")+sKeyIdentifier);
+ aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(OUString("KEY_")+sKeyIdentifier);
- css::uno::Sequence< ::rtl::OUString > sToken(3);
+ css::uno::Sequence< OUString > sToken(3);
const sal_Int32 nToken = 3;
for (sal_Int32 i=0; i<nToken; ++i)
{
@@ -1569,11 +1569,11 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
css::uno::Reference< css::container::XNameAccess > xKey;
css::uno::Reference< css::container::XNameAccess > xCommand;
- ::rtl::OUString sCommand;
+ OUString sCommand;
if (xContainer->hasByName(sKey))
{
- ::rtl::OUString sLocale = impl_ts_getLocale();
+ OUString sLocale = impl_ts_getLocale();
xContainer->getByName(sKey) >>= xKey;
xKey->getByName(CFG_PROP_COMMAND) >>= xCommand;
xCommand->getByName(sLocale) >>= sCommand;
@@ -1656,7 +1656,7 @@ OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
css::uno::Reference< css::uno::XInterface > xCFG = fpc::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR),
"/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
css::uno::Reference< css::beans::XPropertySet > xProp (xCFG, css::uno::UNO_QUERY_THROW);
- ::rtl::OUString sISOLocale;
+ OUString sISOLocale;
xProp->getPropertyValue("ooLocale") >>= sISOLocale;
if (sISOLocale.isEmpty())
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 82ffbe68c471..7c8cb5e6a8d2 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -101,7 +101,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque
::comphelper::SequenceAsHashMap lArgs(lArguments);
m_xDocumentRoot = lArgs.getUnpackedValueOrDefault(
- ::rtl::OUString("DocumentRoot"),
+ OUString("DocumentRoot"),
css::uno::Reference< css::embed::XStorage >());
aWriteLock.unlock();
@@ -170,7 +170,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
m_aPresetHandler.connectToResource(
PresetHandler::E_DOCUMENT,
PresetHandler::RESOURCETYPE_ACCELERATOR(),
- ::rtl::OUString(),
+ OUString(),
xDocumentRoot,
aLanguageTag);
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index 09ce133eef2c..9e50ff352eae 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -146,7 +146,7 @@ KeyMapping::KeyMapping()
sal_Int32 i = 0;
while(KeyIdentifierMap[i].Code != 0)
{
- ::rtl::OUString sIdentifier = ::rtl::OUString::createFromAscii(KeyIdentifierMap[i].Identifier);
+ OUString sIdentifier = OUString::createFromAscii(KeyIdentifierMap[i].Identifier);
sal_Int16 nCode = KeyIdentifierMap[i].Code;
m_lIdentifierHash[sIdentifier] = nCode ;
@@ -162,7 +162,7 @@ KeyMapping::~KeyMapping()
}
//-----------------------------------------------
-sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier)
+sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
throw(css::lang::IllegalArgumentException)
{
Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier);
@@ -182,18 +182,18 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier)
}
//-----------------------------------------------
-::rtl::OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
+OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
{
Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode);
if (pIt != m_lCodeHash.end())
return pIt->second;
// If we have no well known identifier - use the pure code value!
- return ::rtl::OUString::valueOf((sal_Int32)nCode);
+ return OUString::valueOf((sal_Int32)nCode);
}
//-----------------------------------------------
-sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier,
+sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier,
sal_uInt16& rCode )
{
sal_Int32 nCode = sIdentifier.toInt32();
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 2a675cc36568..4e9357b0796d 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -94,12 +94,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
WriteGuard aWriteLock(m_aLock);
::comphelper::SequenceAsHashMap lArgs(lArguments);
- m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleIdentifier"), ::rtl::OUString());
- m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString("Locale") , ::rtl::OUString("x-default"));
+ m_sModule = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString());
+ m_sLocale = lArgs.getUnpackedValueOrDefault(OUString("Locale") , OUString("x-default"));
if (m_sModule.isEmpty())
throw css::uno::RuntimeException(
- ::rtl::OUString("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
+ OUString("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
static_cast< ::cppu::OWeakObject* >(this));
aWriteLock.unlock();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 39b9773d9c2a..0ba15b8bde76 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -63,39 +63,39 @@ namespace framework
{
//-----------------------------------------------
-::rtl::OUString PresetHandler::PRESET_DEFAULT()
+OUString PresetHandler::PRESET_DEFAULT()
{
- return ::rtl::OUString("default");
+ return OUString("default");
}
//-----------------------------------------------
-::rtl::OUString PresetHandler::TARGET_CURRENT()
+OUString PresetHandler::TARGET_CURRENT()
{
- return ::rtl::OUString("current");
+ return OUString("current");
}
//-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_MENUBAR()
+OUString PresetHandler::RESOURCETYPE_MENUBAR()
{
- return ::rtl::OUString("menubar");
+ return OUString("menubar");
}
//-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_TOOLBAR()
+OUString PresetHandler::RESOURCETYPE_TOOLBAR()
{
- return ::rtl::OUString("toolbar");
+ return OUString("toolbar");
}
//-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
+OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
{
- return ::rtl::OUString("accelerator");
+ return OUString("accelerator");
}
//-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_STATUSBAR()
+OUString PresetHandler::RESOURCETYPE_STATUSBAR()
{
- return ::rtl::OUString("statusbar");
+ return OUString("statusbar");
}
//-----------------------------------------------
@@ -177,23 +177,23 @@ void PresetHandler::forgetCachedStorages()
namespace {
-::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
+OUString lcl_getLocalizedMessage(::sal_Int32 nID)
{
- ::rtl::OUString sMessage("Unknown error.");
+ OUString sMessage("Unknown error.");
switch(nID)
{
case ID_CORRUPT_UICONFIG_SHARE :
- sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE )));
+ sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE )));
break;
case ID_CORRUPT_UICONFIG_USER :
- sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_USER )));
+ sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_USER )));
break;
case ID_CORRUPT_UICONFIG_GENERAL :
- sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL )));
+ sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL )));
break;
}
@@ -210,8 +210,8 @@ void lcl_throwCorruptedUIConfigurationException(
lcl_getLocalizedMessage(id),
css::uno::Reference< css::uno::XInterface >(),
(exception.getValueTypeName() +
- rtl::OUString(": \"") + e.Message +
- rtl::OUString("\"")));
+ OUString(": \"") + e.Message +
+ OUString("\"")));
}
}
@@ -232,7 +232,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
xSMGR->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!
@@ -243,7 +243,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
// Note: May be an user uses URLs without a final slash! Check it ...
nPos = sShareLayer.lastIndexOf('/');
if (nPos != sShareLayer.getLength()-1)
- sShareLayer += ::rtl::OUString("/");
+ sShareLayer += OUString("/");
sShareLayer += RELPATH_SHARE_LAYER; // folder
/*
@@ -292,13 +292,13 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
xSMGR->createInstance(SERVICENAME_PATHSETTINGS),
css::uno::UNO_QUERY_THROW);
- ::rtl::OUString sUserLayer;
+ OUString sUserLayer;
xPathSettings->getPropertyValue(BASEPATH_USER_LAYER) >>= sUserLayer ;
// Note: May be an user uses URLs without a final slash! Check it ...
sal_Int32 nPos = sUserLayer.lastIndexOf('/');
if (nPos != sUserLayer.getLength()-1)
- sUserLayer += ::rtl::OUString("/");
+ sUserLayer += OUString("/");
sUserLayer += RELPATH_USER_LAYER; // storage file
@@ -369,8 +369,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(
//-----------------------------------------------
void PresetHandler::connectToResource( PresetHandler::EConfigType eConfigType ,
- const ::rtl::OUString& sResource ,
- const ::rtl::OUString& sModule ,
+ const OUString& sResource ,
+ const OUString& sModule ,
const css::uno::Reference< css::embed::XStorage >& xDocumentRoot,
const LanguageTag& rLanguageTag )
{
@@ -397,7 +397,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
{
if (!xDocumentRoot.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("There is valid root storage, where the UI configuration can work on."),
+ OUString("There is valid root storage, where the UI configuration can work on."),
css::uno::Reference< css::uno::XInterface >());
m_lDocumentStorages.setRootStorage(xDocumentRoot);
xShare = xDocumentRoot;
@@ -420,10 +420,10 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE);
sal_Int32 eUserMode = (css::embed::ElementModes::READWRITE );
- ::rtl::OUStringBuffer sRelPathBuf(1024);
- ::rtl::OUString sRelPathShare;
- ::rtl::OUString sRelPathNoLang;
- ::rtl::OUString sRelPathUser;
+ OUStringBuffer sRelPathBuf(1024);
+ OUString sRelPathShare;
+ OUString sRelPathNoLang;
+ OUString sRelPathUser;
switch(eConfigType)
{
case E_GLOBAL :
@@ -489,7 +489,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
// First try to find the right localized set inside share layer.
// Fallbacks are allowed there.
OUString aShareLocale( rLanguageTag.getBcp47());
- ::rtl::OUString sLocalizedSharePath(sRelPathShare);
+ OUString sLocalizedSharePath(sRelPathShare);
sal_Bool bAllowFallbacks = sal_True ;
xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks);
@@ -497,7 +497,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
// Normaly the corresponding sub dir should be created matching the specified locale.
// Because we allow creation of storages inside user layer by default.
OUString aUserLocale( rLanguageTag.getBcp47());
- ::rtl::OUString sLocalizedUserPath(sRelPathUser);
+ OUString sLocalizedUserPath(sRelPathUser);
bAllowFallbacks = sal_False ;
xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks);
@@ -507,8 +507,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
// read content of level 3 (presets, targets)
css::uno::Reference< css::container::XNameAccess > xAccess ;
- css::uno::Sequence< ::rtl::OUString > lNames ;
- const ::rtl::OUString* pNames ;
+ css::uno::Sequence< OUString > lNames ;
+ const OUString* pNames ;
sal_Int32 c ;
sal_Int32 i ;
OUStringList lPresets;
@@ -524,7 +524,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
for (i=0; i<c; ++i)
{
- ::rtl::OUString sTemp = pNames[i];
+ OUString sTemp = pNames[i];
sal_Int32 nPos = sTemp.indexOf(FILE_EXTENSION);
if (nPos > -1)
sTemp = sTemp.copy(0,nPos);
@@ -542,7 +542,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
for (i=0; i<c; ++i)
{
- ::rtl::OUString sTemp = pNames[i];
+ OUString sTemp = pNames[i];
sal_Int32 nPos = sTemp.indexOf(FILE_EXTENSION);
if (nPos > -1)
sTemp = sTemp.copy(0,nPos);
@@ -575,8 +575,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
}
//-----------------------------------------------
-void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset,
- const ::rtl::OUString& sTarget)
+void PresetHandler::copyPresetToTarget(const OUString& sPreset,
+ const OUString& sTarget)
{
// dont check our preset list, if element exists
// We try to open it and forward all errors to the user!
@@ -598,10 +598,10 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset,
return;
}
- ::rtl::OUString sPresetFile(sPreset);
+ OUString sPresetFile(sPreset);
sPresetFile += FILE_EXTENSION;
- ::rtl::OUString sTargetFile(sTarget);
+ OUString sTargetFile(sTarget);
sTargetFile += FILE_EXTENSION;
// remove existing elements before you try to copy the preset to that location ...
@@ -618,7 +618,7 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset,
}
//-----------------------------------------------
-css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::OUString& sPreset,
+css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset,
sal_Bool bUseNoLangGlobal)
{
// SAFE -> ----------------------------------
@@ -631,7 +631,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O
if (!xFolder.is())
return css::uno::Reference< css::io::XStream >();
- ::rtl::OUString sFile(sPreset);
+ OUString sFile(sPreset);
sFile += FILE_EXTENSION;
// inform user about errors (use original exceptions!)
@@ -640,7 +640,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O
}
//-----------------------------------------------
-css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::OUString& sTarget ,
+css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget ,
sal_Bool bCreateIfMissing)
{
// SAFE -> ----------------------------------
@@ -653,7 +653,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O
if (!xFolder.is())
return css::uno::Reference< css::io::XStream >();
- ::rtl::OUString sFile(sTarget);
+ OUString sFile(sTarget);
sFile += FILE_EXTENSION;
sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE;
@@ -694,7 +694,7 @@ void PresetHandler::commitUserChanges()
if (!xWorking.is())
return;
- ::rtl::OUString sPath;
+ OUString sPath;
switch(eCfgType)
{
@@ -722,7 +722,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener)
{
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
- ::rtl::OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
+ OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
EConfigType eCfgType = m_eConfigType;
aReadLock.unlock();
// <- SAFE ----------------------------------
@@ -752,7 +752,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener)
{
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
- ::rtl::OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
+ OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
EConfigType eCfgType = m_eConfigType;
aReadLock.unlock();
// <- SAFE ----------------------------------
@@ -778,7 +778,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener)
}
//-----------------------------------------------
-css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const ::rtl::OUString& sPath ,
+css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath ,
sal_Int32 eMode ,
sal_Bool bShare)
{
@@ -798,12 +798,12 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
}
//-----------------------------------------------
-::std::vector< ::rtl::OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue(
- const ::std::vector< ::rtl::OUString >& lLocalizedValues,
+::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue(
+ const ::std::vector< OUString >& lLocalizedValues,
OUString& rLanguageTag,
sal_Bool bAllowFallbacks )
{
- ::std::vector< ::rtl::OUString >::const_iterator pFound = lLocalizedValues.end();
+ ::std::vector< OUString >::const_iterator pFound = lLocalizedValues.end();
if (bAllowFallbacks)
{
pFound = LanguageTag::getFallback(lLocalizedValues, rLanguageTag);
@@ -830,15 +830,15 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
//-----------------------------------------------
css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors(
- ::rtl::OUString& sPath ,
+ OUString& sPath ,
sal_Int32 eMode ,
sal_Bool bShare ,
OUString& rLanguageTag ,
sal_Bool bAllowFallback)
{
css::uno::Reference< css::embed::XStorage > xPath = impl_openPathIgnoringErrors(sPath, eMode, bShare);
- ::std::vector< ::rtl::OUString > lSubFolders = impl_getSubFolderNames(xPath);
- ::std::vector< ::rtl::OUString >::const_iterator pLocaleFolder = impl_findMatchingLocalizedValue(lSubFolders, rLanguageTag, bAllowFallback);
+ ::std::vector< OUString > lSubFolders = impl_getSubFolderNames(xPath);
+ ::std::vector< OUString >::const_iterator pLocaleFolder = impl_findMatchingLocalizedValue(lSubFolders, rLanguageTag, bAllowFallback);
// no fallback ... creation not allowed => no storage
if (
@@ -850,7 +850,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
// it doesnt matter, if there is a locale fallback or not
// If creation of storages is allowed, we do it anyway.
// Otherwhise we have no acc config at all, which can make other trouble.
- ::rtl::OUString sLocalizedPath;
+ OUString sLocalizedPath;
sLocalizedPath = sPath;
sLocalizedPath += PATH_SEPERATOR;
if (pLocaleFolder != lSubFolders.end())
@@ -863,21 +863,21 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
if (xLocalePath.is())
sPath = sLocalizedPath;
else
- sPath = ::rtl::OUString();
+ sPath = OUString();
return xLocalePath;
}
//-----------------------------------------------
-::std::vector< ::rtl::OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder)
+::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder)
{
css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY);
if (!xAccess.is())
- return ::std::vector< ::rtl::OUString >();
+ return ::std::vector< OUString >();
- ::std::vector< ::rtl::OUString > lSubFolders;
- const css::uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames();
- const ::rtl::OUString* pNames = lNames.getConstArray();
+ ::std::vector< OUString > lSubFolders;
+ const css::uno::Sequence< OUString > lNames = xAccess->getElementNames();
+ const OUString* pNames = lNames.getConstArray();
sal_Int32 c = lNames.getLength();
sal_Int32 i = 0;
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index ed05f6f32a8d..40d875c2b51e 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -42,7 +42,7 @@
#define PATH_SEPERATOR_ASCII "/"
#define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/')
-#define PATH_SEPERATOR ::rtl::OUString(PATH_SEPERATOR_ASCII)
+#define PATH_SEPERATOR OUString(PATH_SEPERATOR_ASCII)
namespace framework
@@ -102,10 +102,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() cons
}
//-----------------------------------------------
-css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl::OUString& sPath ,
+css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath ,
sal_Int32 nOpenMode)
{
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath);
// SAFE -> ----------------------------------
@@ -115,15 +115,15 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
// <- SAFE ----------------------------------
css::uno::Reference< css::embed::XStorage > xChild ;
- ::rtl::OUString sRelPath;
+ OUString sRelPath;
OUStringList::const_iterator pIt ;
for ( pIt = lFolders.begin();
pIt != lFolders.end() ;
++pIt )
{
- const ::rtl::OUString& sChild = *pIt;
- ::rtl::OUString sCheckPath (sRelPath);
+ const OUString& sChild = *pIt;
+ OUString sCheckPath (sRelPath);
sCheckPath += sChild;
sCheckPath += PATH_SEPERATOR;
@@ -187,13 +187,13 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
}
//-----------------------------------------------
-StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUString& sPath)
+StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath)
{
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath);
StorageHolder::TStorageList lStoragesOfPath;
- ::rtl::OUString sRelPath ;
+ OUString sRelPath ;
OUStringList::const_iterator pIt ;
// SAFE -> ----------------------------------
@@ -203,8 +203,8 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr
pIt != lFolders.end() ;
++pIt )
{
- const ::rtl::OUString& sChild = *pIt;
- ::rtl::OUString sCheckPath (sRelPath);
+ const OUString& sChild = *pIt;
+ OUString sCheckPath (sRelPath);
sCheckPath += sChild;
sCheckPath += PATH_SEPERATOR;
@@ -231,7 +231,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr
}
//-----------------------------------------------
-void StorageHolder::commitPath(const ::rtl::OUString& sPath)
+void StorageHolder::commitPath(const OUString& sPath)
{
StorageHolder::TStorageList lStorages = getAllPathStorages(sPath);
@@ -258,9 +258,9 @@ void StorageHolder::commitPath(const ::rtl::OUString& sPath)
}
//-----------------------------------------------
-void StorageHolder::closePath(const ::rtl::OUString& rPath)
+void StorageHolder::closePath(const OUString& rPath)
{
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath);
/* convert list of paths in the following way:
@@ -269,12 +269,12 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath)
[2] = "path_3" => "path_1/path_2/path_3"
*/
OUStringList::iterator pIt1 ;
- ::rtl::OUString sParentPath;
+ OUString sParentPath;
for ( pIt1 = lFolders.begin();
pIt1 != lFolders.end() ;
++pIt1 )
{
- ::rtl::OUString sCurrentRelPath = sParentPath;
+ OUString sCurrentRelPath = sParentPath;
sCurrentRelPath += *pIt1;
sCurrentRelPath += PATH_SEPERATOR;
*pIt1 = sCurrentRelPath;
@@ -289,7 +289,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath)
pIt2 != lFolders.rend() ;
++pIt2 )
{
- ::rtl::OUString sPath = *pIt2;
+ OUString sPath = *pIt2;
TPath2StorageInfo::iterator pPath = m_lStorages.find(sPath);
if (pPath == m_lStorages.end())
continue; // ???
@@ -308,9 +308,9 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath)
}
//-----------------------------------------------
-void StorageHolder::notifyPath(const ::rtl::OUString& sPath)
+void StorageHolder::notifyPath(const OUString& sPath)
{
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
// SAFE -> ------------------------------
ReadGuard aReadLock(m_aLock);
@@ -336,9 +336,9 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath)
//-----------------------------------------------
void StorageHolder::addStorageListener( IStorageListener* pListener,
- const ::rtl::OUString& sPath )
+ const OUString& sPath )
{
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
// SAFE -> ------------------------------
ReadGuard aReadLock(m_aLock);
@@ -358,9 +358,9 @@ void StorageHolder::addStorageListener( IStorageListener* pListener,
//-----------------------------------------------
void StorageHolder::removeStorageListener( IStorageListener* pListener,
- const ::rtl::OUString& sPath )
+ const OUString& sPath )
{
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
// SAFE -> ------------------------------
ReadGuard aReadLock(m_aLock);
@@ -379,7 +379,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener,
}
//-----------------------------------------------
-::rtl::OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
+OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
{
// SAFE -> ------------------------------
ReadGuard aReadLock(m_aLock);
@@ -395,7 +395,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener,
}
if (pIt == m_lStorages.end())
- return ::rtl::OUString();
+ return OUString();
return pIt->first;
@@ -405,15 +405,15 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener,
//-----------------------------------------------
css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild)
{
- ::rtl::OUString sChildPath = getPathOfStorage(xChild);
+ OUString sChildPath = getPathOfStorage(xChild);
return getParentStorage(sChildPath);
}
//-----------------------------------------------
-css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const ::rtl::OUString& sChildPath)
+css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath)
{
// normed path = "a/b/c/" ... we search for "a/b/"
- ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath);
+ OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath);
OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath);
sal_Int32 c = lFolders.size();
@@ -433,7 +433,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
return m_xRoot;
// c)
- ::rtl::OUString sParentPath;
+ OUString sParentPath;
sal_Int32 i = 0;
for (i=0; i<c-1; ++i)
{
@@ -468,7 +468,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy)
//-----------------------------------------------
css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
- const ::rtl::OUString& sSubStorage ,
+ const OUString& sSubStorage ,
sal_Int32 eOpenMode ,
sal_Bool bAllowFallback)
{
@@ -508,7 +508,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal
//-----------------------------------------------
css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
- const ::rtl::OUString& sSubStream ,
+ const OUString& sSubStream ,
sal_Int32 eOpenMode ,
sal_Bool bAllowFallback)
{
@@ -547,11 +547,11 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
}
//-----------------------------------------------
-::rtl::OUString StorageHolder::impl_st_normPath(const ::rtl::OUString& sPath)
+OUString StorageHolder::impl_st_normPath(const OUString& sPath)
{
// path must start without "/" but end with "/"!
- ::rtl::OUString sNormedPath = sPath;
+ OUString sNormedPath = sPath;
// "/bla" => "bla" && "/" => "" (!)
if (sNormedPath.indexOf(PATH_SEPERATOR) == 0)
@@ -559,7 +559,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
// "/" => "" || "" => "" ?
if (sNormedPath.isEmpty())
- return ::rtl::OUString();
+ return OUString();
// "bla" => "bla/"
if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1))
@@ -569,13 +569,13 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
}
//-----------------------------------------------
-OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath)
+OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
{
OUStringList lToken;
sal_Int32 i = 0;
while (true)
{
- ::rtl::OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i);
+ OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i);
if (i < 0)
break;
lToken.push_back(sToken);
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 74c31dc93fbe..66e272b18bef 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -198,7 +198,7 @@ sal_Bool DropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFo
void DropTargetListener::implts_OpenFile( const String& rFilePath )
{
- rtl::OUString aFileURL;
+ OUString aFileURL;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) )
aFileURL = rFilePath;
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 78a9c1783d54..9ca00ea7ae44 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -287,7 +287,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const
@threadsafe yes
*****************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const ::rtl::OUString& sName ) const
+css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const OUString& sName ) const
{
/* SAFE { */
ReadGuard aReadLock( m_aLock );
@@ -325,7 +325,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens(
@threadsafe yes
*****************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const ::rtl::OUString& sName ) const
+css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const OUString& sName ) const
{
/* SAFE { */
ReadGuard aReadLock( m_aLock );
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index a9b2aaa6d6ab..5ca707a083b0 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -70,7 +70,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
// class FwkTabPage ------------------------------------------------
FwkTabPage::FwkTabPage(
- Window* pParent, const rtl::OUString& rPageURL,
+ Window* pParent, const OUString& rPageURL,
const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ) :
@@ -104,7 +104,7 @@ void FwkTabPage::CreateDialog()
uno::Reference< awt::XWindowPeer > xParent( VCLUnoHelper::GetInterface( this ), uno::UNO_QUERY );
m_xPage = uno::Reference < awt::XWindow >(
m_xWinProvider->createContainerWindow(
- m_sPageURL, rtl::OUString(), xParent, xHandler ), uno::UNO_QUERY );
+ m_sPageURL, OUString(), xParent, xHandler ), uno::UNO_QUERY );
uno::Reference< awt::XControl > xPageControl( m_xPage, uno::UNO_QUERY );
if ( xPageControl.is() )
@@ -118,7 +118,7 @@ void FwkTabPage::CreateDialog()
}
}
- CallMethod( rtl::OUString(INITIALIZE_METHOD) );
+ CallMethod( OUString(INITIALIZE_METHOD) );
}
catch ( const lang::IllegalArgumentException& )
{
@@ -132,14 +132,14 @@ void FwkTabPage::CreateDialog()
// -----------------------------------------------------------------------
-sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod )
+sal_Bool FwkTabPage::CallMethod( const OUString& rMethod )
{
sal_Bool bRet = sal_False;
if ( m_xEventHdl.is() )
{
try
{
- bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), rtl::OUString(EXTERNAL_EVENT) );
+ bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), OUString(EXTERNAL_EVENT) );
}
catch ( const uno::Exception& )
{
@@ -317,7 +317,7 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener )
FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
{
- ::rtl::OUString sTitle, sToolTip, sPageURL;
+ OUString sTitle, sToolTip, sPageURL;
uno::Reference< css::awt::XContainerWindowEventHandler > xEventHdl;
uno::Reference< graphic::XGraphic > xImage;
bool bDisabled = false;
@@ -326,7 +326,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
for ( i = 0; i < nLen; ++i )
{
beans::NamedValue aValue = rProperties[i];
- ::rtl::OUString sName = aValue.Name;
+ OUString sName = aValue.Name;
if ( sName == "Title" )
aValue.Value >>= sTitle;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 1d1c8a5a169d..dbbc8d3899f5 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -58,7 +58,7 @@ TaskCreator::~TaskCreator()
/*-****************************************************************************************************//**
TODO document me
*//*-*****************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName ,
+css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName ,
sal_Bool bVisible )
{
/* SAFE { */
@@ -68,7 +68,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
/* } SAFE */
css::uno::Reference< css::lang::XSingleServiceFactory > xCreator;
- ::rtl::OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR;
+ OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR;
try
{
@@ -102,23 +102,23 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
css::uno::Sequence< css::uno::Any > lArgs(5);
css::beans::NamedValue aArg ;
- aArg.Name = rtl::OUString(ARGUMENT_PARENTFRAME);
+ aArg.Name = OUString(ARGUMENT_PARENTFRAME);
aArg.Value <<= css::uno::Reference< css::frame::XFrame >( css::frame::Desktop::create( comphelper::getComponentContext(xSMGR) ), css::uno::UNO_QUERY_THROW);
lArgs[0] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_CREATETOPWINDOW);
+ aArg.Name = OUString(ARGUMENT_CREATETOPWINDOW);
aArg.Value <<= sal_True;
lArgs[1] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_MAKEVISIBLE);
+ aArg.Name = OUString(ARGUMENT_MAKEVISIBLE);
aArg.Value <<= bVisible;
lArgs[2] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE);
+ aArg.Name = OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE);
aArg.Value <<= sal_True;
lArgs[3] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_FRAMENAME);
+ aArg.Name = OUString(ARGUMENT_FRAMENAME);
aArg.Value <<= sName;
lArgs[4] <<= aArg;
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index c4f49c570293..1fa0c575eafc 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -74,7 +74,7 @@ DEFINE_XTYPEPROVIDER_4(CloseDispatcher ,
//-----------------------------------------------
CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sTarget)
+ const OUString& sTarget)
: ThreadHelpBase (&Application::GetSolarMutex() )
, ::cppu::OWeakObject( )
, m_xSMGR (xSMGR )
@@ -128,14 +128,14 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::
a configurable feature ... and further it does not have
a valid UIName entry inside the GenericCommands.xcu ... */
css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1);
- lViewInfos[0].Command = rtl::OUString(URL_CLOSEWIN);
+ lViewInfos[0].Command = OUString(URL_CLOSEWIN);
lViewInfos[0].GroupId = css::frame::CommandGroup::VIEW;
return lViewInfos;
}
else if (nCommandGroup == css::frame::CommandGroup::DOCUMENT)
{
css::uno::Sequence< css::frame::DispatchInformation > lDocInfos(1);
- lDocInfos[0].Command = rtl::OUString(URL_CLOSEDOC);
+ lDocInfos[0].Command = OUString(URL_CLOSEDOC);
lDocInfos[0].GroupId = css::frame::CommandGroup::DOCUMENT;
return lDocInfos;
}
@@ -591,7 +591,7 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css
//-----------------------------------------------
css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sTarget)
+ const OUString& sTarget)
{
if (sTarget.equalsIgnoreAsciiCase("_self"))
return xFrame;
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index b0c6db53d2a4..5e2435a6366e 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -143,7 +143,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide
if (!xFrame.is())
return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >();
- CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
+ CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY);
css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY);
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 90f39948d327..10b382b64610 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -116,7 +116,7 @@ DispatchProvider::~DispatchProvider()
@threadsafe yes
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -184,7 +184,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp
*/
css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDesktopDispatch( const css::uno::Reference< css::frame::XFrame > xDesktop ,
const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -276,7 +276,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame ,
const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -286,7 +286,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
// But they are specified to use her own fix target. Detect such URLs here and use the correct target.
//-----------------------------------------------------------------------------------------------------
- ::rtl::OUString sTargetName = sTargetFrameName;
+ OUString sTargetName = sTargetFrameName;
//-----------------------------------------------------------------------------------------------------
// I) handle special cases which not right for using findFrame() first
@@ -576,7 +576,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
*/
css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreateDispatchHelper( EDispatchHelper eHelper ,
const css::uno::Reference< css::frame::XFrame >& xOwner ,
- const ::rtl::OUString& sTarget ,
+ const OUString& sTarget ,
sal_Int32 nSearchFlags)
{
css::uno::Reference< css::frame::XDispatch > xDispatchHelper;
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index e3cacde821e7..eedfcabf26ad 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -53,7 +53,7 @@ InterceptionHelper::~InterceptionHelper()
}
css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName,
+ const OUString& sTargetFrameName,
sal_Int32 nSearchFlags )
throw(css::uno::RuntimeException)
{
@@ -127,7 +127,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
else
{
aInfo.lURLPattern.realloc(1);
- aInfo.lURLPattern[0] = ::rtl::OUString("*");
+ aInfo.lURLPattern[0] = OUString("*");
}
// SAFE {
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 4d0a12b7c85e..d84d8221629b 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -27,7 +27,7 @@ namespace framework{
LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
const css::uno::Reference< css::frame::XFrame >& xOwnerFrame ,
- const ::rtl::OUString sTargetName ,
+ const OUString sTargetName ,
sal_Int32 nSearchFlags)
: ThreadHelpBase( )
, m_xSMGR (xSMGR )
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 40f6a9102360..c2c15e776fcf 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -104,7 +104,7 @@ MailToDispatcher::~MailToDispatcher()
at the same implementation.
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL ,
- const ::rtl::OUString& /*sTarget*/ ,
+ const OUString& /*sTarget*/ ,
sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -229,7 +229,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
// start mail client
// Because there is no notofocation about success - we use case of
// no detected exception as SUCCESS - FAILED otherwise.
- xSystemShellExecute->execute( aURL.Complete, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
+ xSystemShellExecute->execute( aURL.Complete, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
bSuccess = sal_True;
}
catch (const css::lang::IllegalArgumentException&)
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 956a403327b9..6518d5fed2e4 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star::lang ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::util ;
using namespace ::cppu ;
- using ::rtl::OUString;
const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610;
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 27ac34dc82cb..e4951efacf19 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -139,7 +139,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
// SAFE {
ResetableGuard aLock( m_aLock );
- rtl::OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog";
+ OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog";
css::uno::Sequence< css::uno::Any > lParams(1);
lParams[0] <<= aURL.Main;
@@ -148,7 +148,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
xService = m_xFactory->createInstanceWithArguments( sServiceName, lParams );
css::uno::Reference< css::task::XJobExecutor > xExecuteable( xService, css::uno::UNO_QUERY );
if ( xExecuteable.is() )
- xExecuteable->trigger( rtl::OUString() );
+ xExecuteable->trigger( OUString() );
if ( xListener.is() )
{
@@ -192,15 +192,15 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
@onerror We return nothing.
@threadsafe yes
*//*-*************************************************************************************************************/
-::rtl::OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
+OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
throw( css::uno::RuntimeException )
{
// Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown.
- ::rtl::OUString sTypeName;
+ OUString sTypeName;
// Analyze given descriptor to find filename or input stream or ...
::comphelper::MediaDescriptor aDescriptor( lDescriptor );
- ::rtl::OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() );
+ OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() );
long nLength = sURL.getLength();
if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) )
@@ -210,7 +210,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
// I think we can the following ones:
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
- sTypeName = ::rtl::OUString("oxt_OpenOffice_Extension");
+ sTypeName = OUString("oxt_OpenOffice_Extension");
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index ddd6c681cf39..4abf60aaf0e3 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -106,7 +106,7 @@ ServiceHandler::~ServiceHandler()
at the same implementation.
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL ,
- const ::rtl::OUString& /*sTarget*/ ,
+ const OUString& /*sTarget*/ ,
sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -226,9 +226,9 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
// extract service name and may optional given parameters from given URL
// and use it to create and start the component
- ::rtl::OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH);
- ::rtl::OUString sServiceName;
- ::rtl::OUString sArguments ;
+ OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH);
+ OUString sServiceName;
+ OUString sArguments ;
sal_Int32 nArgStart = sServiceAndArguments.indexOf('?',0);
if (nArgStart!=-1)
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index d5a3d93d697a..56f87f8d498c 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -70,7 +70,7 @@ DEFINE_XTYPEPROVIDER_4(StartModuleDispatcher ,
//-----------------------------------------------
StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
- const ::rtl::OUString& sTarget)
+ const OUString& sTarget)
: ThreadHelpBase (&Application::GetSolarMutex() )
, ::cppu::OWeakObject( )
, m_xContext (rxContext )
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index b06b76498ccf..4d36a0a6ac7b 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -90,7 +90,7 @@ SystemExec::~SystemExec()
//_________________________________________________________________________________________________________________
css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL ,
- const ::rtl::OUString&,
+ const OUString&,
sal_Int32 ) throw( css::uno::RuntimeException )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -136,7 +136,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
impl_notifyResultListener(xListener, css::frame::DispatchResultState::FAILURE);
return;
}
- ::rtl::OUString sSystemURLWithVariables = aURL.Complete.copy(PROTOCOL_LENGTH, c);
+ OUString sSystemURLWithVariables = aURL.Complete.copy(PROTOCOL_LENGTH, c);
// SAFE ->
ReadGuard aReadLock(m_aLock);
@@ -150,11 +150,11 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
{
css::uno::Reference< css::util::XStringSubstitution > xPathSubst( css::util::PathSubstitution::create(xContext) );
- ::rtl::OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists !
+ OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists !
css::uno::Reference< css::system::XSystemShellExecute > xShell = css::system::SystemShellExecute::create( xContext );
- xShell->execute(sSystemURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY);
+ xShell->execute(sSystemURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY);
impl_notifyResultListener(xListener, css::frame::DispatchResultState::SUCCESS);
}
catch(const css::uno::Exception&)
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 620f5449153a..3edef48cd889 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -125,16 +125,16 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
return 0L;
const int nCommand = pData->GetDialogId();
- ::rtl::OUString sCommand;
+ OUString sCommand;
switch (nCommand)
{
case SHOWDIALOG_ID_PREFERENCES :
- sCommand = rtl::OUString(".uno:OptionsTreeDialog");
+ sCommand = OUString(".uno:OptionsTreeDialog");
break;
case SHOWDIALOG_ID_ABOUT :
- sCommand = rtl::OUString(".uno:About");
+ sCommand = OUString(".uno:About");
break;
default :
@@ -147,7 +147,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
}
//-----------------------------------------------
-void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand)
+void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand)
{
// ignore all errors here. It's clicking a menu entry only ...
// The user will try it again, in case nothing happens .-)
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index f5b6a05fec25..c291e42bc81c 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -125,7 +125,7 @@ void FrameListAnalyzer::impl_analyze()
{
css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
css::uno::Reference< css::frame::XModuleManager2 > xModuleMgr = css::frame::ModuleManager::create(xContext);
- ::rtl::OUString sModule = xModuleMgr->identify(m_xReferenceFrame);
+ OUString sModule = xModuleMgr->identify(m_xReferenceFrame);
m_bReferenceIsBacking = sModule.equals("com.sun.star.frame.StartModule");
}
catch(const css::frame::UnknownModuleException&)
@@ -200,7 +200,7 @@ void FrameListAnalyzer::impl_analyze()
{
css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
css::uno::Reference< css::frame::XModuleManager2 > xModuleMgr = css::frame::ModuleManager::create(xContext);
- ::rtl::OUString sModule = xModuleMgr->identify(xFrame);
+ OUString sModule = xModuleMgr->identify(xFrame);
if (sModule.equals("com.sun.star.frame.StartModule"))
{
m_xBackingComponent = xFrame;
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index 73f2c3ec3b7d..9ba7fabf5a1e 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -45,7 +45,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se
return pOldSetToolBoxControllerCreator;
}
-svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL )
+svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
{
pfunc_setToolBoxControllerCreator pFactory = NULL;
{
@@ -67,7 +67,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun
return pOldSetStatusBarControllerCreator;
}
-svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL )
+svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL )
{
pfunc_setStatusBarControllerCreator pFactory = NULL;
{
@@ -111,7 +111,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW
return pOldFunc;
}
-void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL )
+void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
pfunc_createDockingWindow pFactory = NULL;
{
@@ -132,7 +132,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking
return pOldFunc;
}
-bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL )
+bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
pfunc_isDockingWindowVisible pCall = NULL;
{
@@ -154,7 +154,7 @@ pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i
return pOldFunc;
}
-void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL )
+void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL )
{
pfunc_activateToolPanel pActivator = NULL;
{
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 2464439faafb..408464f6c43b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -53,12 +53,12 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st
// uno interface
public:
- virtual void SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException );
// member
private:
- ::rtl::OUString m_sFilter;
+ OUString m_sFilter;
}; // class ContinuationFilterSelect
@@ -67,14 +67,14 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st
// initialize continuation with right start values
//---------------------------------------------------------------------------------------------------------
ContinuationFilterSelect::ContinuationFilterSelect()
- : m_sFilter( ::rtl::OUString() )
+ : m_sFilter( OUString() )
{
}
//---------------------------------------------------------------------------------------------------------
// handler should use it after selection to set user specified filter for transport
//---------------------------------------------------------------------------------------------------------
-void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilter ) throw( css::uno::RuntimeException )
+void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException )
{
m_sFilter = sFilter;
}
@@ -82,7 +82,7 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
//---------------------------------------------------------------------------------------------------------
// read access to transported filter
//---------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException )
+OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException )
{
return m_sFilter;
}
@@ -90,9 +90,9 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
{
public:
- RequestFilterSelect_Impl( const ::rtl::OUString& sURL );
+ RequestFilterSelect_Impl( const OUString& sURL );
sal_Bool isAbort () const;
- ::rtl::OUString getFilter() const;
+ OUString getFilter() const;
public:
virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
@@ -109,9 +109,9 @@ private:
// initialize instance with all necessary informations
// We use it without any further checks on our member then ...!
//---------------------------------------------------------------------------------------------------------
-RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL )
+RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL )
{
- ::rtl::OUString temp;
+ OUString temp;
css::uno::Reference< css::uno::XInterface > temp2;
css::document::NoSuchFilterRequest aFilterRequest( temp ,
temp2 ,
@@ -139,7 +139,7 @@ sal_Bool RequestFilterSelect_Impl::isAbort() const
// return user selected filter
// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
//---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect_Impl::getFilter() const
+OUString RequestFilterSelect_Impl::getFilter() const
{
return m_pFilter->getFilter();
}
@@ -165,7 +165,7 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >
}
-RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+RequestFilterSelect::RequestFilterSelect( const OUString& sURL )
{
pImp = new RequestFilterSelect_Impl( sURL );
pImp->acquire();
@@ -190,7 +190,7 @@ sal_Bool RequestFilterSelect::isAbort() const
// return user selected filter
// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
//---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect::getFilter() const
+OUString RequestFilterSelect::getFilter() const
{
return pImp->getFilter();
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index cb57da289c85..08f01d366d55 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-using ::rtl::OUString;
namespace framework
{
diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 57a98f5134a8..d51650755916 100644
--- a/framework/source/fwe/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -44,11 +44,11 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
{
for ( sal_uInt16 i = 1; i <= 4; i++ )
{
- rtl::OUStringBuffer aCustomTbxName( 20 );
+ OUStringBuffer aCustomTbxName( 20 );
aCustomTbxName.appendAscii( USERDEFTOOLBOX );
aCustomTbxName[14] = aCustomTbxName[14] + i;
- rtl::OUString aTbxStreamName( aCustomTbxName.makeStringAndClear() );
+ OUString aTbxStreamName( aCustomTbxName.makeStringAndClear() );
uno::Reference< io::XStream > xStream = rToolbarStorage->openStreamElement( aTbxStreamName, embed::ElementModes::READ );
if ( xStream.is() )
{
diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index bdc5319ecdb9..4cff53f8ca1a 100644
--- a/framework/source/fwe/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -36,7 +36,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
Image SAL_CALL GetImageFromURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
bool bBig
)
{
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 70d9d28bda66..a93c14f4af2f 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -24,7 +24,6 @@
#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!"
-using ::rtl::OUString;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 0402a9546a90..0f0e894eb69d 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -105,7 +105,7 @@ throw ( WrappedTargetException )
PopupMenu* MenuConfiguration::CreateBookmarkMenu(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& aURL )
+ const OUString& aURL )
throw ( ::com::sun::star::lang::WrappedTargetException )
{
if ( aURL == BOOKMARK_NEWMENU )
diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index 9083a877084b..87c682a1ddf6 100644
--- a/framework/source/fwi/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
@@ -42,7 +42,7 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa
/**
* converts a sequence of unicode strings into a vector of such items
*/
-OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< ::rtl::OUString >& lSource )
+OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource )
{
OUStringList lDestination;
sal_Int32 nCount = lSource.getLength();
@@ -55,9 +55,9 @@ OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequen
return lDestination;
}
-::rtl::OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource )
+OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource )
{
- ::rtl::OUStringBuffer sBuffer(25);
+ OUStringBuffer sBuffer(25);
sal_Int32 nYear = aSource.GetYear();
sal_Int32 nMonth = aSource.GetMonth();
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index c8bed4010278..7c23fc2b5daa 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -76,7 +76,7 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property
}
//-----------------------------------------------------------------------------
-void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const ::rtl::OUString& sProperty)
+void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty)
throw(css::beans::UnknownPropertyException,
css::uno::Exception )
{
@@ -184,7 +184,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::
}
//-----------------------------------------------------------------------------
-void SAL_CALL PropertySetHelper::setPropertyValue(const ::rtl::OUString& sProperty,
+void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
const css::uno::Any& aValue )
throw(css::beans::UnknownPropertyException,
css::beans::PropertyVetoException ,
@@ -250,7 +250,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const ::rtl::OUString& sProper
}
//-----------------------------------------------------------------------------
-css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString& sProperty)
+css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
css::uno::RuntimeException )
@@ -273,7 +273,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString
}
//-----------------------------------------------------------------------------
-void SAL_CALL PropertySetHelper::addPropertyChangeListener(const ::rtl::OUString& sProperty,
+void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
@@ -295,7 +295,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const ::rtl::OUString
}
//-----------------------------------------------------------------------------
-void SAL_CALL PropertySetHelper::removePropertyChangeListener(const ::rtl::OUString& sProperty,
+void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
@@ -317,7 +317,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const ::rtl::OUStr
}
//-----------------------------------------------------------------------------
-void SAL_CALL PropertySetHelper::addVetoableChangeListener(const ::rtl::OUString& sProperty,
+void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
@@ -339,7 +339,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const ::rtl::OUString
}
//-----------------------------------------------------------------------------
-void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const ::rtl::OUString& sProperty,
+void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
throw(css::beans::UnknownPropertyException,
css::lang::WrappedTargetException ,
@@ -385,7 +385,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper
}
//-----------------------------------------------------------------------------
-css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const ::rtl::OUString& sName)
+css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName)
throw(css::beans::UnknownPropertyException,
css::uno::RuntimeException )
{
@@ -403,7 +403,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const ::rtl::
}
//-----------------------------------------------------------------------------
-sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const ::rtl::OUString& sName)
+sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName)
throw(css::uno::RuntimeException)
{
TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS);
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 22440c3690e8..9b5a4517e2cd 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -49,7 +49,7 @@ namespace framework{
@return An iterator which points to the found item inside the hash or PatternHash::end()
if no pattern match this given <var>sURL</var>.
*/
-PatternHash::iterator PatternHash::findPatternKey( const ::rtl::OUString& sURL )
+PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL )
{
PatternHash::iterator pItem = this->begin();
while( pItem!=this->end() )
@@ -139,7 +139,7 @@ HandlerCache::~HandlerCache()
@descr It frees all used memory. In further implementations (may if we support write access too)
it's a good place to flush changes back to the configuration - but not needed yet.
*/
-sal_Bool HandlerCache::search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const
+sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) const
{
sal_Bool bFound = sal_False;
/* SAFE */{
@@ -198,10 +198,10 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern)
@param sPackage
specifies the package name of the configuration data which should be used
*/
-HandlerCFGAccess::HandlerCFGAccess( const ::rtl::OUString& sPackage )
+HandlerCFGAccess::HandlerCFGAccess( const OUString& sPackage )
: ConfigItem( sPackage )
{
- css::uno::Sequence< ::rtl::OUString > lListenPaths(1);
+ css::uno::Sequence< OUString > lListenPaths(1);
lListenPaths[0] = SETNAME_HANDLER;
EnableNotification(lListenPaths);
}
@@ -223,18 +223,18 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
PatternHash** ppPattern )
{
// list of all uno implementation names without encoding
- css::uno::Sequence< ::rtl::OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH );
+ css::uno::Sequence< OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH );
sal_Int32 nSourceCount = lNames.getLength();
sal_Int32 nTargetCount = nSourceCount;
// list of all full qualified path names of configuration entries
- css::uno::Sequence< ::rtl::OUString > lFullNames ( nTargetCount );
+ css::uno::Sequence< OUString > lFullNames ( nTargetCount );
// expand names to full path names
sal_Int32 nSource=0;
sal_Int32 nTarget=0;
for( nSource=0; nSource<nSourceCount; ++nSource )
{
- ::rtl::OUStringBuffer sPath( SETNAME_HANDLER );
+ OUStringBuffer sPath( SETNAME_HANDLER );
sPath.append(CFG_PATH_SEPERATOR);
sPath.append(lNames[nSource]);
sPath.append(CFG_PATH_SEPERATOR);
@@ -257,7 +257,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
aHandler.m_sUNOName = ::utl::extractFirstFromConfigurationPath(lNames[nSource]);
// unpack all values of this handler
- css::uno::Sequence< ::rtl::OUString > lTemp;
+ css::uno::Sequence< OUString > lTemp;
lValues[nTarget] >>= lTemp;
aHandler.m_lProtocols = Converter::convert_seqOUString2OUStringList(lTemp);
@@ -276,7 +276,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
}
//_________________________________________________________________________________________________________________
-void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lPropertyNames*/)
+void HandlerCFGAccess::Notify(const css::uno::Sequence< OUString >& /*lPropertyNames*/)
{
HandlerHash* pHandler = new HandlerHash;
PatternHash* pPattern = new PatternHash;
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index b8a43a8868fb..a9a0684796f3 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
namespace framework
@@ -65,16 +64,16 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
}
-::rtl::OUString RetrieveLabelFromCommand(
- const ::rtl::OUString& aCmdURL,
+OUString RetrieveLabelFromCommand(
+ const OUString& aCmdURL,
const uno::Reference< uno::XComponentContext >& _xContext,
uno::Reference< container::XNameAccess >& _xUICommandLabels,
const uno::Reference< frame::XFrame >& _xFrame,
- ::rtl::OUString& _rModuleIdentifier,
+ OUString& _rModuleIdentifier,
sal_Bool& _rIni,
const sal_Char* _pName)
{
- ::rtl::OUString aLabel;
+ OUString aLabel;
// Retrieve popup menu labels
if ( !_xUICommandLabels.is() )
@@ -109,7 +108,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
{
if ( !aCmdURL.isEmpty() )
{
- rtl::OUString aStr;
+ OUString aStr;
Sequence< PropertyValue > aPropSeq;
if( _xUICommandLabels->hasByName( aCmdURL ) )
{
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index 07a46429474e..3bf207806758 100644
--- a/framework/source/fwi/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
@@ -38,7 +38,7 @@ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize )
return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize );
}
-static rtl::OUString GetUserDomain()
+static OUString GetUserDomain()
{
sal_Unicode aBuffer[256];
DWORD nResult;
@@ -46,9 +46,9 @@ static rtl::OUString GetUserDomain()
nResult = GetUserDomainW_NT( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) );
if ( nResult > 0 )
- return rtl::OUString( aBuffer );
+ return OUString( aBuffer );
else
- return rtl::OUString();
+ return OUString();
}
//_________________________________________________________________________________________________________________
@@ -58,12 +58,12 @@ static rtl::OUString GetUserDomain()
namespace framework
{
-rtl::OUString NetworkDomain::GetYPDomainName()
+OUString NetworkDomain::GetYPDomainName()
{
- return ::rtl::OUString();
+ return OUString();
}
-rtl::OUString NetworkDomain::GetNTDomainName()
+OUString NetworkDomain::GetNTDomainName()
{
return GetUserDomain();
}
@@ -188,18 +188,18 @@ static rtl_uString *getDomainName()
namespace framework
{
-rtl::OUString NetworkDomain::GetYPDomainName()
+OUString NetworkDomain::GetYPDomainName()
{
rtl_uString* pResult = getDomainName();
if ( pResult )
- return rtl::OUString( pResult );
+ return OUString( pResult );
else
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString NetworkDomain::GetNTDomainName()
+OUString NetworkDomain::GetNTDomainName()
{
- return ::rtl::OUString();
+ return OUString();
}
}
@@ -213,14 +213,14 @@ rtl::OUString NetworkDomain::GetNTDomainName()
namespace framework
{
-rtl::OUString NetworkDomain::GetYPDomainName()
+OUString NetworkDomain::GetYPDomainName()
{
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString NetworkDomain::GetNTDomainName()
+OUString NetworkDomain::GetNTDomainName()
{
- return rtl::OUString();
+ return OUString();
}
}
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 848c2274f440..695342d3b287 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -48,7 +48,7 @@ namespace framework{
force opening of the configuration access in readonly or in read/write mode
*/
ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- /*IN*/ const ::rtl::OUString& sRoot )
+ /*IN*/ const OUString& sRoot )
: ThreadHelpBase( )
, m_xContext ( rxContext)
, m_sRoot ( sRoot )
diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx
index 12ce3134d059..710c08bc5b74 100644
--- a/framework/source/fwi/threadhelp/lockhelper.cxx
+++ b/framework/source/fwi/threadhelp/lockhelper.cxx
@@ -499,8 +499,8 @@ ELockType& LockHelper::implts_getLockType()
{
static ELockType eType = FALLBACK_LOCKTYPE;
- ::rtl::OUString aEnvVar( ENVVAR_LOCKTYPE );
- ::rtl::OUString sValue ;
+ OUString aEnvVar( ENVVAR_LOCKTYPE );
+ OUString sValue ;
if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None )
{
eType = (ELockType)(sValue.toInt32());
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 4ceeb870469e..a0d5acc2bc9d 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -36,7 +36,6 @@ using namespace ::cppu ;
using namespace ::osl ;
using namespace ::std ;
-using rtl::OUString;
//*****************************************************************************************************************
// constructor
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 3b0d7a4e2e64..d6733eadd3c5 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -126,7 +126,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
return;
// unknown module -> no configuration available!
- ::rtl::OUString sModuleName = PersistentWindowState::implst_identifyModule(xContext, xFrame);
+ OUString sModuleName = PersistentWindowState::implst_identifyModule(xContext, xFrame);
if (sModuleName.isEmpty())
return;
@@ -136,7 +136,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
{
if (bRestoreWindowState)
{
- ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName);
+ OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName);
PersistentWindowState::implst_setWindowStateOnWindow(xWindow,sWindowState);
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
@@ -156,7 +156,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
case css::frame::FrameAction_COMPONENT_DETACHING :
{
- ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow);
+ OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow);
PersistentWindowState::implst_setWindowStateOnConfig(xContext, sModuleName, sWindowState);
}
break;
@@ -173,10 +173,10 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
}
//*****************************************************************************************************************
-::rtl::OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame)
{
- ::rtl::OUString sModuleName;
+ OUString sModuleName;
css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
css::frame::ModuleManager::create( rxContext );
@@ -188,25 +188,25 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sModuleName = ::rtl::OUString(); }
+ { sModuleName = OUString(); }
return sModuleName;
}
//*****************************************************************************************************************
-::rtl::OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sModuleName)
+OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const OUString& sModuleName)
{
- ::rtl::OUString sWindowState;
+ OUString sWindowState;
- ::rtl::OUStringBuffer sRelPathBuf(256);
+ OUStringBuffer sRelPathBuf(256);
sRelPathBuf.appendAscii("Office/Factories/*[\"");
sRelPathBuf.append (sModuleName );
sRelPathBuf.appendAscii("\"]" );
- ::rtl::OUString sPackage("org.openoffice.Setup/");
- ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
- ::rtl::OUString sKey("ooSetupFactoryWindowAttributes");
+ OUString sPackage("org.openoffice.Setup/");
+ OUString sRelPath = sRelPathBuf.makeStringAndClear();
+ OUString sKey("ooSetupFactoryWindowAttributes");
try
{
@@ -219,24 +219,24 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sWindowState = ::rtl::OUString(); }
+ { sWindowState = OUString(); }
return sWindowState;
}
//*****************************************************************************************************************
void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sModuleName ,
- const ::rtl::OUString& sWindowState)
+ const OUString& sModuleName ,
+ const OUString& sWindowState)
{
- ::rtl::OUStringBuffer sRelPathBuf(256);
+ OUStringBuffer sRelPathBuf(256);
sRelPathBuf.appendAscii("Office/Factories/*[\"");
sRelPathBuf.append (sModuleName );
sRelPathBuf.appendAscii("\"]" );
- ::rtl::OUString sPackage("org.openoffice.Setup/");
- ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
- ::rtl::OUString sKey("ooSetupFactoryWindowAttributes");
+ OUString sPackage("org.openoffice.Setup/");
+ OUString sRelPath = sRelPathBuf.makeStringAndClear();
+ OUString sKey("ooSetupFactoryWindowAttributes");
try
{
@@ -254,9 +254,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
}
//*****************************************************************************************************************
-::rtl::OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
+OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
{
- ::rtl::OUString sWindowState;
+ OUString sWindowState;
if (xWindow.is())
{
@@ -272,7 +272,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
{
sal_uLong nMask = WINDOWSTATE_MASK_ALL;
nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
- sWindowState = rtl::OStringToOUString(
+ sWindowState = OStringToOUString(
((SystemWindow*)pWindow)->GetWindowState(nMask),
RTL_TEXTENCODING_UTF8);
}
@@ -285,7 +285,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
//*********************************************************************************************************
void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow ,
- const ::rtl::OUString& sWindowState)
+ const OUString& sWindowState)
{
if (
(!xWindow.is() ) ||
@@ -314,9 +314,9 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
if (pWorkWindow->IsMinimized())
return;
- ::rtl::OUString sOldWindowState = ::rtl::OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US );
+ OUString sOldWindowState = OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US );
if ( sOldWindowState != sWindowState )
- pSystemWindow->SetWindowState(rtl::OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
+ pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
// <- SOLAR SAFE ------------------------
}
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 970be61f5b3d..02df7c03973c 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -55,7 +55,7 @@ StatusIndicator::~StatusIndicator()
}
//***********************************************
-void SAL_CALL StatusIndicator::start(const ::rtl::OUString& sText ,
+void SAL_CALL StatusIndicator::start(const OUString& sText ,
sal_Int32 nRange)
throw(css::uno::RuntimeException)
{
@@ -104,7 +104,7 @@ void SAL_CALL StatusIndicator::reset()
}
//***********************************************
-void SAL_CALL StatusIndicator::setText(const ::rtl::OUString& sText)
+void SAL_CALL StatusIndicator::setText(const OUString& sText)
throw(css::uno::RuntimeException)
{
// SAFE ->
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 19347ee43177..6a103ad86a4e 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -165,7 +165,7 @@ void SAL_CALL StatusIndicatorFactory::update()
//-----------------------------------------------
void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
- const ::rtl::OUString& sText ,
+ const OUString& sText ,
sal_Int32 nRange)
{
// SAFE -> ----------------------------------
@@ -204,7 +204,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus
if (pItem != m_aStack.end())
{
pItem->m_nValue = 0;
- pItem->m_sText = ::rtl::OUString();
+ pItem->m_sText = OUString();
}
css::uno::Reference< css::task::XStatusIndicator > xActive = m_xActiveChild;
@@ -237,7 +237,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn
// activate next child ... or finish the progress if there is no further one.
m_xActiveChild.clear();
- ::rtl::OUString sText;
+ OUString sText;
sal_Int32 nValue = 0;
IndicatorStack::reverse_iterator pNext = m_aStack.rbegin();
if (pNext != m_aStack.rend())
@@ -280,7 +280,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn
//-----------------------------------------------
void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
- const ::rtl::OUString& sText )
+ const OUString& sText )
{
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
@@ -431,9 +431,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
bool bForceFrontAndFocus(false);
::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(xSMGR),
- ::rtl::OUString("org.openoffice.Office.Common/View"),
- ::rtl::OUString("NewDocumentHandling"),
- ::rtl::OUString("ForceFocusAndToFront"),
+ OUString("org.openoffice.Office.Common/View"),
+ OUString("NewDocumentHandling"),
+ OUString("ForceFocusAndToFront"),
::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
@@ -473,7 +473,7 @@ void StatusIndicatorFactory::impl_createProgress()
if (xLayoutManager.is())
{
xLayoutManager->lock();
- rtl::OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
+ OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
xLayoutManager->createElement( sPROGRESS_RESOURCE );
xLayoutManager->hideElement( sPROGRESS_RESOURCE );
@@ -520,7 +520,7 @@ void StatusIndicatorFactory::impl_showProgress()
// Be sure that we have always a progress. It can be that our frame
// was recycled and therefore the progress was destroyed!
// CreateElement does nothing if there is already a valid progress.
- rtl::OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
+ OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
xLayoutManager->createElement( sPROGRESS_RESOURCE );
xLayoutManager->showElement( sPROGRESS_RESOURCE );
@@ -560,7 +560,7 @@ void StatusIndicatorFactory::impl_hideProgress()
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager;
if (xLayoutManager.is())
- xLayoutManager->hideElement( rtl::OUString(PROGRESS_RESOURCE) );
+ xLayoutManager->hideElement( OUString(PROGRESS_RESOURCE) );
}
}
}
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 4c2060545e2b..e8a5334ec1c0 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -158,7 +158,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
if ( ! xWindow.is() )
return;
- ::rtl::OUString sApplicationID;
+ OUString sApplicationID;
try
{
// SYNCHRONIZED ->
@@ -170,33 +170,33 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
css::frame::ModuleManager::create( comphelper::getComponentContext(xSMGR) );
- rtl::OUString aModuleId = xModuleManager->identify(xFrame);
- rtl::OUString sDesktopName;
+ OUString aModuleId = xModuleManager->identify(xFrame);
+ OUString sDesktopName;
if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
- sDesktopName = ::rtl::OUString("writer");
+ sDesktopName = OUString("writer");
else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
- sDesktopName = ::rtl::OUString("calc");
+ sDesktopName = OUString("calc");
else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
- sDesktopName = ::rtl::OUString("impress");
+ sDesktopName = OUString("impress");
else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
- sDesktopName = ::rtl::OUString("draw");
+ sDesktopName = OUString("draw");
else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
- sDesktopName = ::rtl::OUString("math");
+ sDesktopName = OUString("math");
else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) ||
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) )
- sDesktopName = ::rtl::OUString("base");
+ sDesktopName = OUString("base");
else
- sDesktopName = ::rtl::OUString("startcenter");
+ sDesktopName = OUString("startcenter");
sApplicationID = utl::ConfigManager::getProductName().toAsciiLowerCase();
- sApplicationID += ::rtl::OUString(sal_Unicode('-'));
+ sApplicationID += OUString(sal_Unicode('-'));
sApplicationID += sDesktopName;
}
catch(const css::uno::Exception&)
@@ -240,7 +240,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
rInfo.sID = xModuleManager->identify(xFrame);
::comphelper::SequenceAsHashMap lProps = xModuleManager->getByName (rInfo.sID);
- rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString());
+ rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, OUString());
rInfo.nIcon = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ICON , INVALID_ICON_ID );
// Note: If we could retrieve a module id ... everything is OK.
@@ -344,7 +344,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
pWorkWindow->SetIcon( (sal_uInt16)nIcon );
css::uno::Reference< css::frame::XModel > xModel = xController->getModel();
- rtl::OUString aURL;
+ OUString aURL;
if( xModel.is() )
aURL = xModel->getURL();
pWorkWindow->SetRepresentedURL( aURL );
@@ -364,7 +364,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
if ( ! xTitle.is() )
return;
- const ::rtl::OUString sTitle = xTitle->getTitle ();
+ const OUString sTitle = xTitle->getTitle ();
// VCL SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index a819f3f91f13..a70340ad22d8 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -49,7 +49,6 @@ const char UIELEMENT_PROPNAME_RESOURCEURL[] = "ResourceURL";
const char UIELEMENT_PROPNAME_TYPE[] = "Type";
const char UIELEMENT_PROPNAME_XMENUBAR[] = "XMenuBar";
const char UIELEMENT_PROPNAME_NOCLOSE[] = "NoClose";
-using ::rtl::OUString;
using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
using namespace com::sun::star::frame;
@@ -453,14 +452,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE
const com::sun::star::beans::Property pProperties[] =
{
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
};
// Use it to initialize sequence!
const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
@@ -483,7 +482,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc
if ( m_xConfigSource.is() && m_bPersistent )
{
- ::rtl::OUString aResourceURL( m_aResourceURL );
+ OUString aResourceURL( m_aResourceURL );
Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource );
aLock.unlock();
@@ -524,7 +523,7 @@ Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (Runti
return xFrame;
}
-::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException)
+OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException)
{
ResetableGuard aLock( m_aLock );
return m_aResourceURL;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 860d5765003a..071448d37e7f 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -40,7 +40,6 @@ const char UIELEMENT_PROPNAME_FRAME[] = "Frame";
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
-using ::rtl::OUString;
namespace framework
{
@@ -131,7 +130,7 @@ throw ( Exception, RuntimeException )
return xFrame;
}
-::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException)
{
return m_aResourceURL;
}
@@ -242,9 +241,9 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement
const com::sun::star::beans::Property pProperties[] =
{
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
- com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+ com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
};
// Use it to initialize sequence!
const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 4441ae2a9b3e..b8517a451488 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -47,7 +47,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu
{
if (!m_xParentWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("Cant work without a parent window!"),
+ OUString("Cant work without a parent window!"),
static_cast< css::task::XStatusIndicator* >(this));
}
@@ -57,7 +57,7 @@ VCLStatusIndicator::~VCLStatusIndicator()
}
//-----------------------------------------------
-void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText ,
+void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
sal_Int32 nRange)
throw(css::uno::RuntimeException)
{
@@ -117,7 +117,7 @@ void SAL_CALL VCLStatusIndicator::end()
{
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
- m_sText = ::rtl::OUString();
+ m_sText = OUString();
m_nRange = 0;
m_nValue = 0;
aWriteLock.unlock();
@@ -139,7 +139,7 @@ void SAL_CALL VCLStatusIndicator::end()
}
//-----------------------------------------------
-void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText)
+void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
throw(css::uno::RuntimeException)
{
// SAFE -> ----------------------------------
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 4e7d2c4e2e5a..dbaf0fdafc51 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -63,7 +63,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
keys -> commands
*/
typedef ::boost::unordered_map< css::awt::KeyEvent ,
- ::rtl::OUString ,
+ OUString ,
KeyEventHashCode ,
KeyEventEqualsFunc > TKey2Commands;
@@ -123,7 +123,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
sal_True if the speicfied key exists inside this container.
*/
virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const;
- virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const;
+ virtual sal_Bool hasCommand(const OUString& sCommand) const;
//---------------------------------------
/** TODO document me */
@@ -140,7 +140,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
describe the command.
*/
virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey ,
- const ::rtl::OUString& sCommand);
+ const OUString& sCommand);
//---------------------------------------
/** @short returns the list of keys, which are registered
@@ -152,16 +152,16 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
@return [TKeyList]
the list of registered keys. Can be empty!
*/
- virtual TKeyList getKeysByCommand(const ::rtl::OUString& sCommand) const;
+ virtual TKeyList getKeysByCommand(const OUString& sCommand) const;
//---------------------------------------
/** TODO */
- virtual ::rtl::OUString getCommandByKey(const css::awt::KeyEvent& aKey) const;
+ virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const;
//---------------------------------------
/** TODO */
virtual void removeKey(const css::awt::KeyEvent& aKey);
- virtual void removeCommand(const ::rtl::OUString& sCommand);
+ virtual void removeCommand(const OUString& sCommand);
};
} // namespace framework
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index a918a4627700..2d71deb8d92e 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -124,12 +124,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
throw(css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+ virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException );
virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
- const ::rtl::OUString& sCommand )
+ const OUString& sCommand )
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException );
@@ -137,16 +137,16 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
throw(css::container::NoSuchElementException,
css::uno::RuntimeException );
- virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+ virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException );
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
throw(css::lang::IllegalArgumentException ,
css::uno::RuntimeException );
- virtual void SAL_CALL removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+ virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException );
@@ -196,7 +196,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
throw(css::uno::RuntimeException);
// IStorageListener
- virtual void changesOccurred(const ::rtl::OUString& sPath);
+ virtual void changesOccurred(const OUString& sPath);
//______________________________________
// helper for derived classes
@@ -260,7 +260,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
Depends from the parameter bWriteable!
*/
css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage,
- const ::rtl::OUString& sSubStorage ,
+ const OUString& sSubStorage ,
sal_Bool bOutStream );
//---------------------------------------
@@ -311,8 +311,8 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
AcceleratorCache* m_pPrimaryWriteCache;
AcceleratorCache* m_pSecondaryWriteCache;
- ::rtl::OUString m_sGlobalOrModules;
- ::rtl::OUString m_sModuleCFG;
+ OUString m_sGlobalOrModules;
+ OUString m_sModuleCFG;
::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
@@ -337,12 +337,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
throw(css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+ virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException );
virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
- const ::rtl::OUString& sCommand )
+ const OUString& sCommand )
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException );
@@ -350,16 +350,16 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
throw(css::container::NoSuchElementException,
css::uno::RuntimeException );
- virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+ virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException );
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
throw(css::lang::IllegalArgumentException ,
css::uno::RuntimeException );
- virtual void SAL_CALL removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+ virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
css::uno::RuntimeException );
@@ -440,10 +440,10 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
void impl_ts_load(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg);
void impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg);
- void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred);
+ void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred);
void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred);
- void reloadChanged(const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey);
+ void reloadChanged(const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey);
AcceleratorCache& impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested = sal_False);
};
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index d92049c752c8..1068a4c53987 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -75,7 +75,7 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
private:
- ::rtl::OUString m_sLocale;
+ OUString m_sLocale;
/** helper to listen for configuration changes without ownership cycle problems */
css::uno::Reference< css::util::XChangesListener > m_xCfgListener;
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index e37672497bc5..a6355067185f 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -40,7 +40,7 @@ class IStorageListener
//--------------------------------------
/** @short TODO */
- virtual void changesOccurred(const ::rtl::OUString& sPath) = 0;
+ virtual void changesOccurred(const OUString& sPath) = 0;
protected:
~IStorageListener() {}
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 88122013705d..4563d60bf39a 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -60,7 +60,7 @@ class KeyMapping
//---------------------------------------
/** @short hash structure to map key codes to identifier. */
typedef ::boost::unordered_map< sal_Int16 ,
- ::rtl::OUString ,
+ OUString ,
ShortHashCode ,
::std::equal_to< sal_Int16 > > Code2IdentifierHash;
@@ -102,7 +102,7 @@ class KeyMapping
if the given identifier does not describe
a well known key code.
*/
- virtual sal_uInt16 mapIdentifierToCode(const ::rtl::OUString& sIdentifier)
+ virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier)
throw(css::lang::IllegalArgumentException);
//----------------------------------
@@ -114,7 +114,7 @@ class KeyMapping
@return The corresponding string identifier.
*/
- virtual ::rtl::OUString mapCodeToIdentifier(sal_uInt16 nCode);
+ virtual OUString mapCodeToIdentifier(sal_uInt16 nCode);
//______________________________________
// helper
@@ -136,7 +136,7 @@ class KeyMapping
@return [boolean]
sal_True if convertion was successfully.
*/
- sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier,
+ sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier,
sal_uInt16& rCode );
};
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index d7080939ef30..bd7838fdc3be 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -51,8 +51,8 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
//----------------------------------
/** identify the application module, where this accelerator
configuration cache should work on. */
- ::rtl::OUString m_sModule;
- ::rtl::OUString m_sLocale;
+ OUString m_sModule;
+ OUString m_sLocale;
//______________________________________
// interface
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 19853be14932..512ee8be89d7 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -56,13 +56,13 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
public:
- static ::rtl::OUString PRESET_DEFAULT();
- static ::rtl::OUString TARGET_CURRENT();
+ static OUString PRESET_DEFAULT();
+ static OUString TARGET_CURRENT();
- static ::rtl::OUString RESOURCETYPE_MENUBAR();
- static ::rtl::OUString RESOURCETYPE_TOOLBAR();
- static ::rtl::OUString RESOURCETYPE_ACCELERATOR();
- static ::rtl::OUString RESOURCETYPE_STATUSBAR();
+ static OUString RESOURCETYPE_MENUBAR();
+ static OUString RESOURCETYPE_TOOLBAR();
+ static OUString RESOURCETYPE_ACCELERATOR();
+ static OUString RESOURCETYPE_STATUSBAR();
//-------------------------------------------
// types
@@ -134,7 +134,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@descr e.g. menubars, toolbars, accelerators
*/
- ::rtl::OUString m_sResourceType;
+ OUString m_sResourceType;
//---------------------------------------
/** @short specify the application module for a module
@@ -144,7 +144,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
"module". Further it must be a valid module identifier
then ...
*/
- ::rtl::OUString m_sModule;
+ OUString m_sModule;
//---------------------------------------
/** @short provides access to the:
@@ -209,9 +209,9 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
//---------------------------------------
/** @short knows the relative path from the root. */
- ::rtl::OUString m_sRelPathShare;
- ::rtl::OUString m_sRelPathNoLang;
- ::rtl::OUString m_sRelPathUser;
+ OUString m_sRelPathShare;
+ OUString m_sRelPathNoLang;
+ OUString m_sRelPathUser;
//-------------------------------------------
// native interface
@@ -322,8 +322,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
if the specified resource couldn't be located.
*/
void connectToResource( EConfigType eConfigType ,
- const ::rtl::OUString& sResourceType ,
- const ::rtl::OUString& sModule ,
+ const OUString& sResourceType ,
+ const OUString& sModule ,
const css::uno::Reference< css::embed::XStorage >& xDocumentRoot ,
const LanguageTag& rLanguageTag = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE));
@@ -348,8 +348,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@throw com::sun::star::io::IOException
if copying failed.
*/
- void copyPresetToTarget(const ::rtl::OUString& sPreset,
- const ::rtl::OUString& sTarget);
+ void copyPresetToTarget(const OUString& sPreset,
+ const OUString& sTarget);
//---------------------------------------
/** @short open the specified preset as stream object
@@ -366,7 +366,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@return The opened preset stream ... or NULL if the preset does not exists.
*/
- css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset,
+ css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset,
sal_Bool bUseNoLangGlobal = sal_False);
//---------------------------------------
@@ -388,7 +388,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@return The opened target stream ... or NULL if the target does not exists
or couldnt be created as new one.
*/
- css::uno::Reference< css::io::XStream > openTarget(const ::rtl::OUString& sTarget ,
+ css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget ,
sal_Bool bCreateIfMissing);
//---------------------------------------
@@ -427,7 +427,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@return An opened storage in case method was successfully - null otherwise.
*/
- css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const ::rtl::OUString& sPath ,
+ css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath ,
sal_Int32 eMode ,
sal_Bool bShare);
@@ -454,7 +454,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@return An iterator, which points directly into lLocalizedValue list.
As a negative result the special iterator lLocalizedValues.end() will be returned.
*/
- ::std::vector< ::rtl::OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< ::rtl::OUString >& lLocalizedValues,
+ ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues,
OUString& rLanguageTag ,
sal_Bool bAllowFallbacks );
@@ -486,7 +486,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@return An opened storage in case method was successfully - null otherwise.
*/
- css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(::rtl::OUString& sPath ,
+ css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString& sPath ,
sal_Int32 eMode ,
sal_Bool bShare ,
OUString& rLanguageTag ,
@@ -501,7 +501,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
@return [vector< string >]
a list of folder names.
*/
- ::std::vector< ::rtl::OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder);
+ ::std::vector< OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder);
};
} // namespace framework
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index bfde625885c2..1c51cdf786aa 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -60,10 +60,10 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
};
/** @short TODO */
- typedef ::boost::unordered_map< ::rtl::OUString ,
+ typedef ::boost::unordered_map< OUString ,
TStorageInfo ,
- ::rtl::OUStringHash ,
- ::std::equal_to< ::rtl::OUString > > TPath2StorageInfo;
+ OUStringHash ,
+ ::std::equal_to< OUString > > TPath2StorageInfo;
//-------------------------------------------
// member
@@ -108,45 +108,45 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
/** @short TODO
open or get!
*/
- virtual css::uno::Reference< css::embed::XStorage > openPath(const ::rtl::OUString& sPath ,
+ virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath ,
sal_Int32 nOpenMode);
//---------------------------------------
/** @short TODO
*/
- virtual StorageHolder::TStorageList getAllPathStorages(const ::rtl::OUString& sPath);
+ virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath);
//---------------------------------------
/** @short TODO
*/
- virtual void commitPath(const ::rtl::OUString& sPath);
+ virtual void commitPath(const OUString& sPath);
//---------------------------------------
/** @short TODO
*/
- virtual void closePath(const ::rtl::OUString& sPath);
+ virtual void closePath(const OUString& sPath);
//---------------------------------------
/** @short TODO
*/
- virtual void notifyPath(const ::rtl::OUString& sPath);
+ virtual void notifyPath(const OUString& sPath);
//---------------------------------------
/** @short TODO
*/
virtual void addStorageListener( IStorageListener* pListener,
- const ::rtl::OUString& sPath );
+ const OUString& sPath );
//---------------------------------------
/** @short TODO
*/
virtual void removeStorageListener( IStorageListener* pListener,
- const ::rtl::OUString& sPath );
+ const OUString& sPath );
//---------------------------------------
/** @short TODO
*/
- virtual ::rtl::OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage);
+ virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage);
//---------------------------------------
/** @short TODO
@@ -156,7 +156,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
//---------------------------------------
/** @short TODO
*/
- virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const ::rtl::OUString& sChildPath);
+ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath);
//---------------------------------------
/** @short TODO
@@ -188,12 +188,12 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
again.
*/
static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
- const ::rtl::OUString& sSubStorage ,
+ const OUString& sSubStorage ,
sal_Int32 eOpenMode ,
sal_Bool bAllowFallback);
static css::uno::Reference< css::io::XStream > openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
- const ::rtl::OUString& sSubStream ,
+ const OUString& sSubStream ,
sal_Int32 eOpenMode ,
sal_Bool bAllowFallback);
@@ -204,12 +204,12 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
//-----------------------------------
/** @short TODO
*/
- static ::rtl::OUString impl_st_normPath(const ::rtl::OUString& sPath);
+ static OUString impl_st_normPath(const OUString& sPath);
//-----------------------------------
/** @short TODO
*/
- static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath);
+ static OUStringList impl_st_parsePath(const OUString& sPath);
};
} // namespace framework
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 20c003916efe..c4f866577ccc 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -51,7 +51,7 @@ class LoadDispatcher : private ThreadHelpBase
css::uno::WeakReference< css::frame::XFrame > m_xOwnerFrame;
/** @short TODO document me */
- ::rtl::OUString m_sTarget;
+ OUString m_sTarget;
/** @short TODO document me */
sal_Int32 m_nSearchFlags;
@@ -85,7 +85,7 @@ class LoadDispatcher : private ThreadHelpBase
*/
LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
const css::uno::Reference< css::frame::XFrame >& xOwnerFrame ,
- const ::rtl::OUString sTargetName ,
+ const OUString sTargetName ,
sal_Int32 nSearchFlags);
//_______________________________________
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 4d561cb8ee5b..9624e9c99fa0 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -117,7 +117,7 @@ class WindowCommandDispatch : private ThreadHelpBase
@param sCommand
the command for dispatch
*/
- void impl_dispatchCommand(const ::rtl::OUString& sCommand);
+ void impl_dispatchCommand(const OUString& sCommand);
}; // class MACDispatch
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index c76877f2d09a..a1065ce6945d 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -135,7 +135,7 @@ private:
/** @short contains the name of the target, in which the specified resource
of this instance must be loaded.
*/
- ::rtl::OUString m_sTarget;
+ OUString m_sTarget;
/** @short if m_sTarget is not a special one, this flags regulate searching
of a suitable one.
@@ -218,8 +218,8 @@ public:
static css::uno::Reference< css::lang::XComponent > loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader,
const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
- const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTarget,
+ const OUString& sURL ,
+ const OUString& sTarget,
sal_Int32 nFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
throw(css::lang::IllegalArgumentException,
@@ -275,10 +275,10 @@ public:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime cant be used any longer.
*/
- void initializeLoading(const ::rtl::OUString& sURL ,
+ void initializeLoading(const OUString& sURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor,
const css::uno::Reference< css::frame::XFrame >& xBaseFrame ,
- const ::rtl::OUString& sTarget ,
+ const OUString& sTarget ,
sal_Int32 nSearchFlags ,
EFeature eFeature = E_NO_FEATURE ,
EContentType eContentType = E_UNSUPPORTED_CONTENT);
@@ -364,7 +364,7 @@ public:
@return A suitable enum value, which classify the specified content.
*/
- static EContentType classifyContent(const ::rtl::OUString& sURL ,
+ static EContentType classifyContent(const OUString& sURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor);
/** TODO document me ... */
@@ -431,7 +431,7 @@ private:
@attention Internaly we update the member m_lMediaDescriptor!
*/
- ::rtl::OUString impl_askUserForTypeAndFilterIfAllowed()
+ OUString impl_askUserForTypeAndFilterIfAllowed()
throw(LoadEnvException, css::uno::RuntimeException);
/** @short tries to use ContentHandler objects for loading.
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 9bd67738cd04..868944587147 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -100,7 +100,7 @@ class LoadEnvException
/** @short contains a suitable message, which describes the reason for this
exception. */
- ::rtl::OString m_sMessage;
+ OString m_sMessage;
/** @short An ID, which make this exception unique among others. */
sal_Int32 m_nID;
@@ -158,7 +158,7 @@ class LoadEnvException
*/
~LoadEnvException()
{
- m_sMessage = ::rtl::OString();
+ m_sMessage = OString();
m_nID = 0;
m_bHandled = false;
m_exOriginal.clear();
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index 539100abceef..4adea994479a 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -75,7 +75,7 @@ class TargetHelper
@return It returns <TRUE/> if <var>sCheckTarget</var> represent
the expected <var>eSpecialTarget</var> value; <FALSE/> otherwise.
*/
- static sal_Bool matchSpecialTarget(const ::rtl::OUString& sCheckTarget ,
+ static sal_Bool matchSpecialTarget(const OUString& sCheckTarget ,
ESpecialTarget eSpecialTarget);
//___________________________________________
@@ -99,7 +99,7 @@ class TargetHelper
@param sName
the new frame name, which sould be checked.
*/
- static sal_Bool isValidNameForFrame(const ::rtl::OUString& sName);
+ static sal_Bool isValidNameForFrame(const OUString& sName);
};
} // namespace framework
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 01d97c1d5456..1e684825f30f 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -89,8 +89,8 @@ class ConfigurationHelper
see enum EOpenMode for further informations.
*/
static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sPackage ,
- const ::rtl::OUString& sRelPath ,
+ const OUString& sPackage ,
+ const OUString& sRelPath ,
sal_Int32 nOpenFlags)
{
css::uno::Reference< css::uno::XInterface > xCFG;
@@ -100,7 +100,7 @@ class ConfigurationHelper
css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider =
css::configuration::theDefaultProvider::get( rxContext );
- ::rtl::OUStringBuffer sPath(1024);
+ OUStringBuffer sPath(1024);
sPath.append(sPackage );
sPath.append(static_cast<sal_Unicode>('/'));
sPath.append(sRelPath );
@@ -115,13 +115,13 @@ class ConfigurationHelper
css::uno::Sequence< css::uno::Any > lParams(c);
css::beans::PropertyValue aParam;
- aParam.Name = ::rtl::OUString("nodepath");
+ aParam.Name = OUString("nodepath");
aParam.Value <<= sPath.makeStringAndClear();
lParams[0] <<= aParam;
if (bAllLocales)
{
- aParam.Name = ::rtl::OUString("*");
+ aParam.Name = OUString("*");
aParam.Value <<= sal_True;
lParams[1] <<= aParam;
}
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 0510b86495ea..9a4399215ae8 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -44,12 +44,12 @@ class WindowHelper
public:
//-----------------------------------------------
-static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
+static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
{
if (!xWindow.is())
- return ::rtl::OUString();
+ return OUString();
- rtl::OString sWindowState;
+ OString sWindowState;
// SOLAR SAFE -> ----------------------------
{
SolarMutexGuard aSolarGuard;
@@ -65,12 +65,12 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind
}
// <- SOLAR SAFE ----------------------------
- return rtl::OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8);
+ return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8);
}
//-----------------------------------------------
static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow ,
- const ::rtl::OUString& sWindowState)
+ const OUString& sWindowState)
{
if (
(!xWindow.is() ) ||
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 788476b0fddc..f099e0e94ef2 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -46,26 +46,26 @@ namespace framework{
// path to module config
-static ::rtl::OUString CFG_PACKAGE_MODULES ("/org.openoffice.Setup/Office/Factories");
-static ::rtl::OUString CFG_PACKAGE_SETUP ("/org.openoffice.Setup");
-static ::rtl::OUString CFG_PACKAGE_COMMON ("/org.openoffice.Office.Common");
-static ::rtl::OUString CFG_PATH_L10N ("L10N");
-static ::rtl::OUString CFG_PATH_HELP ("Help");
-static ::rtl::OUString CFG_KEY_LOCALE ("ooLocale");
-static ::rtl::OUString CFG_KEY_HELPSYSTEM ("System");
+static OUString CFG_PACKAGE_MODULES ("/org.openoffice.Setup/Office/Factories");
+static OUString CFG_PACKAGE_SETUP ("/org.openoffice.Setup");
+static OUString CFG_PACKAGE_COMMON ("/org.openoffice.Office.Common");
+static OUString CFG_PATH_L10N ("L10N");
+static OUString CFG_PATH_HELP ("Help");
+static OUString CFG_KEY_LOCALE ("ooLocale");
+static OUString CFG_KEY_HELPSYSTEM ("System");
// props of job environment
-static ::rtl::OUString PROP_ENVIRONMENT ("Environment");
-static ::rtl::OUString PROP_JOBCONFIG ("JobConfig");
-static ::rtl::OUString PROP_ENVTYPE ("EnvType");
-static ::rtl::OUString PROP_MODEL ("Model");
+static OUString PROP_ENVIRONMENT ("Environment");
+static OUString PROP_JOBCONFIG ("JobConfig");
+static OUString PROP_ENVTYPE ("EnvType");
+static OUString PROP_MODEL ("Model");
// props of module config
-static ::rtl::OUString PROP_HELP_BASEURL ("ooSetupFactoryHelpBaseURL");
-static ::rtl::OUString PROP_AUTOMATIC_HELP ("ooSetupFactoryHelpOnOpen");
+static OUString PROP_HELP_BASEURL ("ooSetupFactoryHelpBaseURL");
+static OUString PROP_AUTOMATIC_HELP ("ooSetupFactoryHelpOnOpen");
// special value of job environment
-static ::rtl::OUString ENVTYPE_DOCUMENTEVENT ("DOCUMENTEVENT");
+static OUString ENVTYPE_DOCUMENTEVENT ("DOCUMENTEVENT");
//-----------------------------------------------
@@ -145,7 +145,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
{
// Analyze the given arguments; try to locate a model there and
// classify it's used application module.
- ::rtl::OUString sModule = its_getModuleIdFromEnv(lArguments);
+ OUString sModule = its_getModuleIdFromEnv(lArguments);
// Attention: We are bound to events for openeing any document inside the office.
// That includes e.g. the help module itself. But we have to do nothing then!
@@ -156,7 +156,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
// a) help isnt open => show default page for the detected module
// b) help shows any other default page(!) => show default page for the detected module
// c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages)
- ::rtl::OUString sCurrentHelpURL = its_getCurrentHelpURL();
+ OUString sCurrentHelpURL = its_getCurrentHelpURL();
sal_Bool bCurrentHelpURLIsAnyDefaultURL = its_isHelpUrlADefaultOne(sCurrentHelpURL);
sal_Bool bShowIt = sal_False;
@@ -170,7 +170,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
if (bShowIt)
{
// retrieve the help URL for the detected application module
- ::rtl::OUString sModuleDependendHelpURL = its_checkIfHelpEnabledAndGetURL(sModule);
+ OUString sModuleDependendHelpURL = its_checkIfHelpEnabledAndGetURL(sModule);
if (!sModuleDependendHelpURL.isEmpty())
{
// Show this help page.
@@ -203,7 +203,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
}
//-----------------------------------------------
-::rtl::OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
+OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
{
::comphelper::SequenceAsHashMap lArgs (lArguments);
::comphelper::SequenceAsHashMap lEnvironment = lArgs.getUnpackedValueOrDefault(PROP_ENVIRONMENT, css::uno::Sequence< css::beans::NamedValue >());
@@ -212,13 +212,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
// check for right environment.
// If its not a DocumentEvent, which triggered this job,
// we cant work correctly! => return immediately and do nothing
- ::rtl::OUString sEnvType = lEnvironment.getUnpackedValueOrDefault(PROP_ENVTYPE, ::rtl::OUString());
+ OUString sEnvType = lEnvironment.getUnpackedValueOrDefault(PROP_ENVTYPE, OUString());
if (!sEnvType.equals(ENVTYPE_DOCUMENTEVENT))
- return ::rtl::OUString();
+ return OUString();
css::uno::Reference< css::frame::XModel > xDoc = lEnvironment.getUnpackedValueOrDefault(PROP_MODEL, css::uno::Reference< css::frame::XModel >());
if (!xDoc.is())
- return ::rtl::OUString();
+ return OUString();
// be sure that we work on top level documents only, which are registered
// on the desktop instance. Ignore e.g. life previews, which are top frames too ...
@@ -231,7 +231,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
if (xFrame.is() && xFrame->isTop())
xDesktopCheck = css::uno::Reference< css::frame::XDesktop >(xFrame->getCreator(), css::uno::UNO_QUERY);
if (!xDesktopCheck.is())
- return ::rtl::OUString();
+ return OUString();
// OK - now we are sure this document is a top level document.
// Classify it.
@@ -241,7 +241,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
aLock.unlock();
// <- SAFE
- ::rtl::OUString sModuleId;
+ OUString sModuleId;
try
{
sModuleId = xModuleManager->identify(xDoc);
@@ -249,13 +249,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sModuleId = ::rtl::OUString(); }
+ { sModuleId = OUString(); }
return sModuleId;
}
//-----------------------------------------------
-::rtl::OUString HelpOnStartup::its_getCurrentHelpURL()
+OUString HelpOnStartup::its_getCurrentHelpURL()
{
// SAFE ->
ResetableGuard aLock(m_aLock);
@@ -264,13 +264,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
// <- SAFE
if (!xDesktop.is())
- return ::rtl::OUString();
+ return OUString();
css::uno::Reference< css::frame::XFrame > xHelp = xDesktop->findFrame(SPECIALTARGET_HELPTASK, css::frame::FrameSearchFlag::CHILDREN);
if (!xHelp.is())
- return ::rtl::OUString();
+ return OUString();
- ::rtl::OUString sCurrentHelpURL;
+ OUString sCurrentHelpURL;
try
{
css::uno::Reference< css::frame::XFramesSupplier > xHelpRoot (xHelp , css::uno::UNO_QUERY_THROW);
@@ -291,13 +291,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sCurrentHelpURL = ::rtl::OUString(); }
+ { sCurrentHelpURL = OUString(); }
return sCurrentHelpURL;
}
//-----------------------------------------------
-::sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL)
+::sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL)
{
if (sHelpURL.isEmpty())
return sal_False;
@@ -305,8 +305,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
// SAFE ->
ResetableGuard aLock(m_aLock);
css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig;
- ::rtl::OUString sLocale = m_sLocale;
- ::rtl::OUString sSystem = m_sSystem;
+ OUString sLocale = m_sLocale;
+ OUString sSystem = m_sSystem;
aLock.unlock();
// <- SAFE
@@ -314,8 +314,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
return sal_False;
// check given help url against all default ones
- const css::uno::Sequence< ::rtl::OUString > lModules = xConfig->getElementNames();
- const ::rtl::OUString* pModules = lModules.getConstArray();
+ const css::uno::Sequence< OUString > lModules = xConfig->getElementNames();
+ const OUString* pModules = lModules.getConstArray();
::sal_Int32 c = lModules.getLength();
::sal_Int32 i = 0;
@@ -328,9 +328,9 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
if (!xModuleConfig.is())
continue;
- ::rtl::OUString sHelpBaseURL;
+ OUString sHelpBaseURL;
xModuleConfig->getByName(PROP_HELP_BASEURL) >>= sHelpBaseURL;
- ::rtl::OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem);
+ OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem);
if (sHelpURL.equals(sHelpURLForModule))
return sal_True;
}
@@ -344,17 +344,17 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
}
//-----------------------------------------------
-::rtl::OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const ::rtl::OUString& sModule)
+OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule)
{
// SAFE ->
ResetableGuard aLock(m_aLock);
css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig;
- ::rtl::OUString sLocale = m_sLocale;
- ::rtl::OUString sSystem = m_sSystem;
+ OUString sLocale = m_sLocale;
+ OUString sSystem = m_sSystem;
aLock.unlock();
// <- SAFE
- ::rtl::OUString sHelpURL;
+ OUString sHelpURL;
try
{
@@ -368,7 +368,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
if (bHelpEnabled)
{
- ::rtl::OUString sHelpBaseURL;
+ OUString sHelpBaseURL;
xModuleConfig->getByName(PROP_HELP_BASEURL) >>= sHelpBaseURL;
sHelpURL = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem);
}
@@ -376,17 +376,17 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
- { sHelpURL = ::rtl::OUString(); }
+ { sHelpURL = OUString(); }
return sHelpURL;
}
//-----------------------------------------------
-::rtl::OUString HelpOnStartup::ist_createHelpURL(const ::rtl::OUString& sBaseURL,
- const ::rtl::OUString& sLocale ,
- const ::rtl::OUString& sSystem )
+OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL,
+ const OUString& sLocale ,
+ const OUString& sSystem )
{
- ::rtl::OUStringBuffer sHelpURL(256);
+ OUStringBuffer sHelpURL(256);
sHelpURL.append (sBaseURL );
sHelpURL.appendAscii("?Language=");
sHelpURL.append (sLocale );
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 385b2bffe8cf..6eb116a77043 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -245,7 +245,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
#if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
{
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("Got exception during job execution. Original Message was:\n\"");
sMsg.append (ex.Message);
sMsg.appendAscii("\"");
@@ -377,28 +377,28 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c
// Create list of environment variables. This list must be part of the
// returned structure everytimes ... but some of its members are opetional!
css::uno::Sequence< css::beans::NamedValue > lEnvArgs(1);
- lEnvArgs[0].Name = ::rtl::OUString::createFromAscii(JobData::PROP_ENVTYPE);
+ lEnvArgs[0].Name = OUString::createFromAscii(JobData::PROP_ENVTYPE);
lEnvArgs[0].Value <<= m_aJobCfg.getEnvironmentDescriptor();
if (m_xFrame.is())
{
sal_Int32 c = lEnvArgs.getLength();
lEnvArgs.realloc(c+1);
- lEnvArgs[c].Name = ::rtl::OUString::createFromAscii(JobData::PROP_FRAME);
+ lEnvArgs[c].Name = OUString::createFromAscii(JobData::PROP_FRAME);
lEnvArgs[c].Value <<= m_xFrame;
}
if (m_xModel.is())
{
sal_Int32 c = lEnvArgs.getLength();
lEnvArgs.realloc(c+1);
- lEnvArgs[c].Name = ::rtl::OUString::createFromAscii(JobData::PROP_MODEL);
+ lEnvArgs[c].Name = OUString::createFromAscii(JobData::PROP_MODEL);
lEnvArgs[c].Value <<= m_xModel;
}
if (eMode==JobData::E_EVENT)
{
sal_Int32 c = lEnvArgs.getLength();
lEnvArgs.realloc(c+1);
- lEnvArgs[c].Name = ::rtl::OUString::createFromAscii(JobData::PROP_EVENTNAME);
+ lEnvArgs[c].Name = OUString::createFromAscii(JobData::PROP_EVENTNAME);
lEnvArgs[c].Value <<= m_aJobCfg.getEvent();
}
@@ -421,28 +421,28 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c
{
sal_Int32 nLength = lAllArgs.getLength();
lAllArgs.realloc(nLength+1);
- lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_CONFIG);
+ lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_CONFIG);
lAllArgs[nLength].Value <<= lConfigArgs;
}
if (lJobConfigArgs.getLength()>0)
{
sal_Int32 nLength = lAllArgs.getLength();
lAllArgs.realloc(nLength+1);
- lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_OWNCONFIG);
+ lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_OWNCONFIG);
lAllArgs[nLength].Value <<= lJobConfigArgs;
}
if (lEnvArgs.getLength()>0)
{
sal_Int32 nLength = lAllArgs.getLength();
lAllArgs.realloc(nLength+1);
- lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_ENVIRONMENT);
+ lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_ENVIRONMENT);
lAllArgs[nLength].Value <<= lEnvArgs;
}
if (lDynamicArgs.getLength()>0)
{
sal_Int32 nLength = lAllArgs.getLength();
lAllArgs.realloc(nLength+1);
- lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_DYNAMICDATA);
+ lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_DYNAMICDATA);
lAllArgs[nLength].Value <<= lDynamicArgs;
}
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 69f5daa4e728..fa1633472efd 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -145,7 +145,7 @@ JobData::~JobData()
@param sAlias
the alias name of this job, used to locate job properties inside cfg
*/
-void JobData::setAlias( const ::rtl::OUString& sAlias )
+void JobData::setAlias( const OUString& sAlias )
{
/* SAFE { */
WriteGuard aWriteLock(m_aLock);
@@ -158,7 +158,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
// try to open the configuration set of this job directly and get a property access to it
// We open it readonly here
- ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
+ OUString sKey(OUString::createFromAscii(JOBCFG_ROOT));
sKey += ::utl::wrapConfigurationElementName(m_sAlias);
ConfigAccess aConfig(m_xContext, sKey);
@@ -175,22 +175,22 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
css::uno::Any aValue;
// read uno implementation name
- aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_SERVICE));
+ aValue = xJobProperties->getPropertyValue(OUString::createFromAscii(JOBCFG_PROP_SERVICE));
aValue >>= m_sService;
// read module context list
- aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_CONTEXT));
+ aValue = xJobProperties->getPropertyValue(OUString::createFromAscii(JOBCFG_PROP_CONTEXT));
aValue >>= m_sContext;
// read whole argument list
- aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS));
+ aValue = xJobProperties->getPropertyValue(OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS));
css::uno::Reference< css::container::XNameAccess > xArgumentList;
if (
(aValue >>= xArgumentList) &&
(xArgumentList.is() )
)
{
- css::uno::Sequence< ::rtl::OUString > lArgumentNames = xArgumentList->getElementNames();
+ css::uno::Sequence< OUString > lArgumentNames = xArgumentList->getElementNames();
sal_Int32 nCount = lArgumentNames.getLength();
m_lArguments.realloc(nCount);
for (sal_Int32 i=0; i<nCount; ++i)
@@ -215,7 +215,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
@param sService
the uno service name of this "non configured" job
*/
-void JobData::setService( const ::rtl::OUString& sService )
+void JobData::setService( const OUString& sService )
{
/* SAFE { */
WriteGuard aWriteLock(m_aLock);
@@ -249,8 +249,8 @@ void JobData::setService( const ::rtl::OUString& sService )
@param sAlias
mark the required job inside event registration list
*/
-void JobData::setEvent( const ::rtl::OUString& sEvent ,
- const ::rtl::OUString& sAlias )
+void JobData::setEvent( const OUString& sEvent ,
+ const OUString& sAlias )
{
// share code to read all job properties!
setAlias(sAlias);
@@ -292,7 +292,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
// It doesn't matter if this config object was already opened before.
// It doesn nothing here then ... or it change the mode automaticly, if
// it was opened using another one before.
- ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
+ OUString sKey(OUString::createFromAscii(JOBCFG_ROOT));
sKey += ::utl::wrapConfigurationElementName(m_sAlias);
ConfigAccess aConfig(m_xContext, sKey);
@@ -304,7 +304,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
if (xArgumentList.is())
{
sal_Int32 nCount = m_lArguments.getLength();
- css::uno::Sequence< ::rtl::OUString > lNames (nCount);
+ css::uno::Sequence< OUString > lNames (nCount);
css::uno::Sequence< css::uno::Any > lValues(nCount);
for (sal_Int32 i=0; i<nCount; ++i)
@@ -393,23 +393,23 @@ JobData::EEnvironment JobData::getEnvironment() const
//________________________________
-::rtl::OUString JobData::getEnvironmentDescriptor() const
+OUString JobData::getEnvironmentDescriptor() const
{
- ::rtl::OUString sDescriptor;
+ OUString sDescriptor;
/* SAFE { */
ReadGuard aReadLock(m_aLock);
switch(m_eEnvironment)
{
case E_EXECUTION :
- sDescriptor = ::rtl::OUString("EXECUTOR");
+ sDescriptor = OUString("EXECUTOR");
break;
case E_DISPATCH :
- sDescriptor = ::rtl::OUString("DISPATCH");
+ sDescriptor = OUString("DISPATCH");
break;
case E_DOCUMENTEVENT :
- sDescriptor = ::rtl::OUString("DOCUMENTEVENT");
+ sDescriptor = OUString("DOCUMENTEVENT");
break;
default:
break;
@@ -420,7 +420,7 @@ JobData::EEnvironment JobData::getEnvironment() const
//________________________________
-::rtl::OUString JobData::getService() const
+OUString JobData::getService() const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
@@ -430,7 +430,7 @@ JobData::EEnvironment JobData::getEnvironment() const
//________________________________
-::rtl::OUString JobData::getEvent() const
+OUString JobData::getEvent() const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
@@ -460,15 +460,15 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
lConfig.realloc(3);
sal_Int32 i = 0;
- lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_ALIAS);
+ lConfig[i].Name = OUString::createFromAscii(PROP_ALIAS);
lConfig[i].Value <<= m_sAlias;
++i;
- lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_SERVICE);
+ lConfig[i].Name = OUString::createFromAscii(PROP_SERVICE);
lConfig[i].Value <<= m_sService;
++i;
- lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_CONTEXT);
+ lConfig[i].Name = OUString::createFromAscii(PROP_CONTEXT);
lConfig[i].Value <<= m_sContext;
++i;
}
@@ -521,7 +521,7 @@ void JobData::disableJob()
// It doesn't matter if this config object was already opened before.
// It doesn nothing here then ... or it change the mode automaticly, if
// it was opened using another one before.
- ::rtl::OUStringBuffer sKey(256);
+ OUStringBuffer sKey(256);
sKey.appendAscii(JobData::EVENTCFG_ROOT );
sKey.append (::utl::wrapConfigurationElementName(m_sEvent));
sKey.appendAscii(JobData::EVENTCFG_PATH_JOBLIST );
@@ -539,7 +539,7 @@ void JobData::disableJob()
// Convert and write the user timestamp to the configuration.
css::uno::Any aValue;
aValue <<= Converter::convert_DateTime2ISO8601(DateTime( DateTime::SYSTEM));
- xPropSet->setPropertyValue(::rtl::OUString::createFromAscii(EVENTCFG_PROP_USERTIME), aValue);
+ xPropSet->setPropertyValue(OUString::createFromAscii(EVENTCFG_PROP_USERTIME), aValue);
}
aConfig.close();
@@ -551,15 +551,15 @@ void JobData::disableJob()
//________________________________
/**
*/
-sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
- const ::rtl::OUString& sUserTime )
+sal_Bool isEnabled( const OUString& sAdminTime ,
+ const OUString& sUserTime )
{
/*Attention!
To prevent interpreting of TriGraphs inside next const string value,
we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated
to "~" ...
*/
- static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*");
+ static OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*");
WildCard aISOPattern(PATTERN_ISO8601);
sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
@@ -577,10 +577,10 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
/**
*/
void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sEvent ,
+ const OUString& sEvent ,
::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs )
{
- css::uno::Sequence< ::rtl::OUString > lAdditionalJobs = JobData::getEnabledJobsForEvent(rxContext, sEvent);
+ css::uno::Sequence< OUString > lAdditionalJobs = JobData::getEnabledJobsForEvent(rxContext, sEvent);
sal_Int32 c = lAdditionalJobs.getLength();
sal_Int32 i = 0;
@@ -594,7 +594,7 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XC
//________________________________
/**
*/
-sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const
+sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const
{
sal_Int32 nContextLen = m_sContext.getLength();
sal_Int32 nModuleIdLen = rModuleIdent.getLength();
@@ -607,7 +607,7 @@ sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const
sal_Int32 nIndex = m_sContext.indexOf( rModuleIdent );
if ( nIndex >= 0 && ( nIndex+nModuleIdLen <= nContextLen ))
{
- ::rtl::OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen );
+ OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen );
return sContextModule.equals( rModuleIdent );
}
}
@@ -618,49 +618,49 @@ sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const
//________________________________
/**
*/
-css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& sEvent )
+css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ const OUString& sEvent )
{
// these static values may perform following loop for reading time stamp values ...
- static ::rtl::OUString ADMINTIME = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_PROP_ADMINTIME);
- static ::rtl::OUString USERTIME = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_PROP_USERTIME );
- static ::rtl::OUString ROOT = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_ROOT );
- static ::rtl::OUString JOBLIST = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_PATH_JOBLIST );
+ static OUString ADMINTIME = OUString::createFromAscii(JobData::EVENTCFG_PROP_ADMINTIME);
+ static OUString USERTIME = OUString::createFromAscii(JobData::EVENTCFG_PROP_USERTIME );
+ static OUString ROOT = OUString::createFromAscii(JobData::EVENTCFG_ROOT );
+ static OUString JOBLIST = OUString::createFromAscii(JobData::EVENTCFG_PATH_JOBLIST );
// create a config access to "/org.openoffice.Office.Jobs/Events"
ConfigAccess aConfig(rxContext,ROOT);
aConfig.open(ConfigAccess::E_READONLY);
if (aConfig.getMode()==ConfigAccess::E_CLOSED)
- return css::uno::Sequence< ::rtl::OUString >();
+ return css::uno::Sequence< OUString >();
css::uno::Reference< css::container::XHierarchicalNameAccess > xEventRegistry(aConfig.cfg(), css::uno::UNO_QUERY);
if (!xEventRegistry.is())
- return css::uno::Sequence< ::rtl::OUString >();
+ return css::uno::Sequence< OUString >();
// check if the given event exist inside list of registered ones
- ::rtl::OUString sPath(sEvent);
+ OUString sPath(sEvent);
sPath += JOBLIST;
if (!xEventRegistry->hasByHierarchicalName(sPath))
- return css::uno::Sequence< ::rtl::OUString >();
+ return css::uno::Sequence< OUString >();
// step to the job list, which is a child of the event node inside cfg
// e.g. "/org.openoffice.Office.Jobs/Events/<event name>/JobList"
css::uno::Any aJobList = xEventRegistry->getByHierarchicalName(sPath);
css::uno::Reference< css::container::XNameAccess > xJobList;
if (!(aJobList >>= xJobList) || !xJobList.is())
- return css::uno::Sequence< ::rtl::OUString >();
+ return css::uno::Sequence< OUString >();
// get all alias names of jobs, which are part of this job list
// But Some of them can be disabled by it's time stamp values.
// We create an additional job name list with the same size, then the original list ...
// step over all job entries ... check her time stamps ... and put only job names to the
// destination list, which represent an enabled job.
- css::uno::Sequence< ::rtl::OUString > lAllJobs = xJobList->getElementNames();
- ::rtl::OUString* pAllJobs = lAllJobs.getArray();
+ css::uno::Sequence< OUString > lAllJobs = xJobList->getElementNames();
+ OUString* pAllJobs = lAllJobs.getArray();
sal_Int32 c = lAllJobs.getLength();
- css::uno::Sequence< ::rtl::OUString > lEnabledJobs(c);
- ::rtl::OUString* pEnabledJobs = lEnabledJobs.getArray();
+ css::uno::Sequence< OUString > lEnabledJobs(c);
+ OUString* pEnabledJobs = lEnabledJobs.getArray();
sal_Int32 d = 0;
for (sal_Int32 s=0; s<c; ++s)
@@ -674,10 +674,10 @@ css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css
continue;
}
- ::rtl::OUString sAdminTime;
+ OUString sAdminTime;
xJob->getPropertyValue(ADMINTIME) >>= sAdminTime;
- ::rtl::OUString sUserTime;
+ OUString sUserTime;
xJob->getPropertyValue(USERTIME) >>= sUserTime;
if (!isEnabled(sAdminTime, sUserTime))
@@ -711,10 +711,10 @@ void JobData::impl_reset()
WriteGuard aWriteLock(m_aLock);
m_eMode = E_UNKNOWN_MODE;
m_eEnvironment = E_UNKNOWN_ENVIRONMENT;
- m_sAlias = ::rtl::OUString();
- m_sService = ::rtl::OUString();
- m_sContext = ::rtl::OUString();
- m_sEvent = ::rtl::OUString();
+ m_sAlias = OUString();
+ m_sService = OUString();
+ m_sContext = OUString();
+ m_sEvent = OUString();
m_lArguments = css::uno::Sequence< css::beans::NamedValue >();
aWriteLock.unlock();
/* } SAFE */
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 74ad02581f11..90d3dc257834 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -154,7 +154,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
Can be SELF or CREATE only and are set only if sTargetFrameName isn't a special target
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch( /*IN*/ const css::util::URL& aURL ,
- /*IN*/ const ::rtl::OUString& /*sTargetFrameName*/ ,
+ /*IN*/ const OUString& /*sTargetFrameName*/ ,
/*IN*/ sal_Int32 /*nSearchFlags*/ ) throw(css::uno::RuntimeException)
{
css::uno::Reference< css::frame::XDispatch > xDispatch;
@@ -224,7 +224,7 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL
JobURL aAnalyzedURL(aURL.Complete);
if (aAnalyzedURL.isValid())
{
- ::rtl::OUString sRequest;
+ OUString sRequest;
if (aAnalyzedURL.getEvent(sRequest))
impl_dispatchEvent(sRequest, lArgs, xListener);
else
@@ -253,7 +253,7 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL
@param xListener
an interested listener for possible results of this operation
*/
-void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString& sEvent ,
+void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString& sEvent ,
/*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
/*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
@@ -262,7 +262,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
// filter disabled jobs using it's time stamp values.
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- css::uno::Sequence< ::rtl::OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent);
+ css::uno::Sequence< OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent);
aReadLock.unlock();
/* } SAFE */
@@ -336,7 +336,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
@param xListener
an interested listener for possible results of this operation
*/
-void JobDispatch::impl_dispatchService( /*IN*/ const ::rtl::OUString& sService ,
+void JobDispatch::impl_dispatchService( /*IN*/ const OUString& sService ,
/*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
/*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
@@ -387,7 +387,7 @@ void JobDispatch::impl_dispatchService( /*IN*/ const ::rtl::OUString&
@param xListener
an interested listener for possible results of this operation
*/
-void JobDispatch::impl_dispatchAlias( /*IN*/ const ::rtl::OUString& sAlias ,
+void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString& sAlias ,
/*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
/*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 2bfb5466b6f3..6b133a5c219d 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -117,7 +117,7 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::lang::XMultiSer
, ::cppu::OWeakObject ( )
, m_xSMGR (xSMGR )
, m_xModuleManager ( )
- , m_aConfig (comphelper::getComponentContext(xSMGR), ::rtl::OUString::createFromAscii(JobData::EVENTCFG_ROOT) )
+ , m_aConfig (comphelper::getComponentContext(xSMGR), OUString::createFromAscii(JobData::EVENTCFG_ROOT) )
{
// Don't do any reference related code here! Do it inside special
// impl_ method() ... see DEFINE_INIT_SERVICE() macro for further informations.
@@ -141,7 +141,7 @@ JobExecutor::~JobExecutor()
@param sEvent
is used to locate registered jobs
*/
-void SAL_CALL JobExecutor::trigger( const ::rtl::OUString& sEvent ) throw(css::uno::RuntimeException)
+void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT(aLog, "fwk (as96863) JobExecutor::trigger()");
@@ -157,7 +157,7 @@ void SAL_CALL JobExecutor::trigger( const ::rtl::OUString& sEvent ) throw(css::u
// get list of all enabled jobs
// The called static helper methods read it from the configuration and
// filter disabled jobs using it's time stamp values.
- css::uno::Sequence< ::rtl::OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent);
+ css::uno::Sequence< OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent);
aReadLock.unlock();
/* } SAFE */
@@ -197,8 +197,8 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
const char EVENT_ON_LOAD[] = "OnLoad"; // Doc UI event
const char EVENT_ON_CREATE[] = "OnCreate"; // Doc API event
const char EVENT_ON_LOAD_FINISHED[] = "OnLoadFinished"; // Doc API event
- ::rtl::OUString EVENT_ON_DOCUMENT_OPENED("onDocumentOpened"); // Job UI event : OnNew or OnLoad
- ::rtl::OUString EVENT_ON_DOCUMENT_ADDED("onDocumentAdded"); // Job API event : OnCreate or OnLoadFinished
+ OUString EVENT_ON_DOCUMENT_OPENED("onDocumentOpened"); // Job UI event : OnNew or OnLoad
+ OUString EVENT_ON_DOCUMENT_ADDED("onDocumentAdded"); // Job API event : OnCreate or OnLoadFinished
/* SAFE { */
ReadGuard aReadLock(m_aLock);
@@ -211,7 +211,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
// see using of m_lEvents.find() below ...
// retrieve event context from event source
- rtl::OUString aModuleIdentifier;
+ OUString aModuleIdentifier;
try
{
aModuleIdentifier = m_xModuleManager->identify( aEvent.Source );
@@ -285,10 +285,10 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException)
{
- ::rtl::OUString sValue;
+ OUString sValue;
if (aEvent.Accessor >>= sValue)
{
- ::rtl::OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
+ OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
if (!sEvent.isEmpty())
{
OUStringList::iterator pEvent = m_lEvents.find(sEvent);
@@ -300,10 +300,10 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent
void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException)
{
- ::rtl::OUString sValue;
+ OUString sValue;
if (aEvent.Accessor >>= sValue)
{
- ::rtl::OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
+ OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
if (!sEvent.isEmpty())
{
OUStringList::iterator pEvent = m_lEvents.find(sEvent);
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 2378e539249e..94810a72db7f 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -38,7 +38,7 @@ namespace framework{
@param sURL
the job URL for parsing
*/
-JobURL::JobURL( /*IN*/ const ::rtl::OUString& sURL )
+JobURL::JobURL( /*IN*/ const OUString& sURL )
: ThreadHelpBase( &Application::GetSolarMutex() )
{
#ifdef ENABLE_COMPONENT_SELF_CHECK
@@ -56,9 +56,9 @@ JobURL::JobURL( /*IN*/ const ::rtl::OUString& sURL )
do
{
// seperate all token of "{[event=<name>],[alias=<name>],[service=<name>]}"
- ::rtl::OUString sToken = sURL.getToken(0, JOBURL_PART_SEPERATOR, t);
- ::rtl::OUString sPartValue ;
- ::rtl::OUString sPartArguments;
+ OUString sToken = sURL.getToken(0, JOBURL_PART_SEPERATOR, t);
+ OUString sPartValue ;
+ OUString sPartArguments;
// check for "event="
if (
@@ -130,12 +130,12 @@ sal_Bool JobURL::isValid() const
@attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>!
*/
-sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const
+sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- sEvent = ::rtl::OUString();
+ sEvent = OUString();
sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEvent = m_sEvent;
@@ -163,12 +163,12 @@ sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const
@attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>!
*/
-sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const
+sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- sAlias = ::rtl::OUString();
+ sAlias = OUString();
sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAlias = m_sAlias;
@@ -196,12 +196,12 @@ sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const
@attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>!
*/
-sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const
+sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- sService = ::rtl::OUString();
+ sService = OUString();
sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sService = m_sService;
@@ -238,11 +238,11 @@ sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const
@return <TRUE/> if the identifier could be found and the string was splitted.
<FALSE/> otherwise.
*/
-sal_Bool JobURL::implst_split( /*IN*/ const ::rtl::OUString& sPart ,
+sal_Bool JobURL::implst_split( /*IN*/ const OUString& sPart ,
/*IN*/ const sal_Char* pPartIdentifier ,
/*IN*/ sal_Int32 nPartLength ,
- /*OUT*/ ::rtl::OUString& rPartValue ,
- /*OUT*/ ::rtl::OUString& rPartArguments )
+ /*OUT*/ OUString& rPartValue ,
+ /*OUT*/ OUString& rPartArguments )
{
// first search for the given identifier
sal_Bool bPartFound = (sPart.matchIgnoreAsciiCaseAsciiL(pPartIdentifier,nPartLength,0));
@@ -255,9 +255,9 @@ sal_Bool JobURL::implst_split( /*IN*/ const ::rtl::OUString& sPart ,
// Do so - we set the return value with the whole part string.
// Arguments will be set to an empty string as default.
// If we detect the right sign - we split the arguments and overwrite the default.
- ::rtl::OUString sValueAndArguments = sPart.copy(nPartLength);
- ::rtl::OUString sValue = sValueAndArguments ;
- ::rtl::OUString sArguments;
+ OUString sValueAndArguments = sPart.copy(nPartLength);
+ OUString sValue = sValueAndArguments ;
+ OUString sArguments;
sal_Int32 nArgStart = sValueAndArguments.indexOf('?',0);
if (nArgStart!=-1)
@@ -365,13 +365,13 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
/*IN*/ const sal_Char* pExpectedAliasArgs ,
/*IN*/ const sal_Char* pExpectedServiceArgs )
{
- ::rtl::OUString sEvent ;
- ::rtl::OUString sAlias ;
- ::rtl::OUString sService ;
- ::rtl::OUString sEventArgs ;
- ::rtl::OUString sAliasArgs ;
- ::rtl::OUString sServiceArgs;
- ::rtl::OUString sURL (::rtl::OUString::createFromAscii(pURL));
+ OUString sEvent ;
+ OUString sAlias ;
+ OUString sService ;
+ OUString sEventArgs ;
+ OUString sAliasArgs ;
+ OUString sServiceArgs;
+ OUString sURL (OUString::createFromAscii(pURL));
sal_Bool bOK = sal_True;
JobURL aURL(sURL);
@@ -488,7 +488,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
);
}
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("\"" );
sMsg.append (sURL );
@@ -538,12 +538,12 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
@returns The formated string representation.
*/
-::rtl::OUString JobURL::impldbg_toString() const
+OUString JobURL::impldbg_toString() const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- ::rtl::OUStringBuffer sBuffer(256);
+ OUStringBuffer sBuffer(256);
if (m_eRequest==E_UNKNOWN)
sBuffer.appendAscii("E_UNKNOWN");
@@ -569,12 +569,12 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL ,
//________________________________
-sal_Bool JobURL::getServiceArgs( /*OUT*/ ::rtl::OUString& sServiceArgs ) const
+sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- sServiceArgs = ::rtl::OUString();
+ sServiceArgs = OUString();
sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sServiceArgs = m_sServiceArgs;
@@ -587,12 +587,12 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ ::rtl::OUString& sServiceArgs ) const
//________________________________
-sal_Bool JobURL::getEventArgs( /*OUT*/ ::rtl::OUString& sEventArgs ) const
+sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- sEventArgs = ::rtl::OUString();
+ sEventArgs = OUString();
sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEventArgs = m_sEventArgs;
@@ -605,12 +605,12 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ ::rtl::OUString& sEventArgs ) const
//________________________________
-sal_Bool JobURL::getAliasArgs( /*OUT*/ ::rtl::OUString& sAliasArgs ) const
+sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const
{
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- sAliasArgs = ::rtl::OUString();
+ sAliasArgs = OUString();
sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAliasArgs = m_sAliasArgs;
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index b4a4e1a36fce..5170af2f0cf8 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -47,19 +47,19 @@ namespace framework{
/** address job configuration inside argument set provided on method execute(). */
-static const ::rtl::OUString PROP_JOBCONFIG("JobConfig");
+static const OUString PROP_JOBCONFIG("JobConfig");
/** address job configuration property "Command". */
-static const ::rtl::OUString PROP_COMMAND("Command");
+static const OUString PROP_COMMAND("Command");
/** address job configuration property "Arguments". */
-static const ::rtl::OUString PROP_ARGUMENTS("Arguments");
+static const OUString PROP_ARGUMENTS("Arguments");
/** address job configuration property "DeactivateJobIfDone". */
-static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone");
+static const OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone");
/** address job configuration property "CheckExitCode". */
-static const ::rtl::OUString PROP_CHECKEXITCODE("CheckExitCode");
+static const OUString PROP_CHECKEXITCODE("CheckExitCode");
//-----------------------------------------------
@@ -99,13 +99,13 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N
::comphelper::SequenceAsHashMap lArgs (lJobArguments);
::comphelper::SequenceAsHashMap lOwnCfg(lArgs.getUnpackedValueOrDefault(PROP_JOBCONFIG, css::uno::Sequence< css::beans::NamedValue >()));
- const ::rtl::OUString sCommand = lOwnCfg.getUnpackedValueOrDefault(PROP_COMMAND , ::rtl::OUString());
- const css::uno::Sequence< ::rtl::OUString > lCommandArguments = lOwnCfg.getUnpackedValueOrDefault(PROP_ARGUMENTS , css::uno::Sequence< ::rtl::OUString >());
+ const OUString sCommand = lOwnCfg.getUnpackedValueOrDefault(PROP_COMMAND , OUString());
+ const css::uno::Sequence< OUString > lCommandArguments = lOwnCfg.getUnpackedValueOrDefault(PROP_ARGUMENTS , css::uno::Sequence< OUString >());
const ::sal_Bool bDeactivateJobIfDone = lOwnCfg.getUnpackedValueOrDefault(PROP_DEACTIVATEJOBIFDONE , sal_True );
const ::sal_Bool bCheckExitCode = lOwnCfg.getUnpackedValueOrDefault(PROP_CHECKEXITCODE , sal_True );
// replace all might existing place holder.
- ::rtl::OUString sRealCommand = impl_substituteCommandVariables(sCommand);
+ OUString sRealCommand = impl_substituteCommandVariables(sCommand);
// Command is required as minimum.
// If it does not exists ... we cant do our job.
@@ -139,7 +139,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
}
//-----------------------------------------------
-::rtl::OUString ShellJob::impl_substituteCommandVariables(const ::rtl::OUString& sCommand)
+OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand)
{
// SYNCHRONIZED ->
ReadGuard aReadLock(m_aLock);
@@ -152,19 +152,19 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getComponentContext(xSMGR) );
css::uno::Reference< css::util::XStringSubstitution > xSubst( css::util::PathSubstitution::create(xContext) );
const ::sal_Bool bSubstRequired = sal_True;
- const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired);
+ const OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired);
return sCompleteCommand;
}
catch(const css::uno::Exception&)
{}
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-::sal_Bool ShellJob::impl_execute(const ::rtl::OUString& sCommand ,
- const css::uno::Sequence< ::rtl::OUString >& lArguments ,
+::sal_Bool ShellJob::impl_execute(const OUString& sCommand ,
+ const css::uno::Sequence< OUString >& lArguments ,
::sal_Bool bCheckExitCode)
{
::rtl_uString** pArgs = NULL;
@@ -173,7 +173,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
oslProcess hProcess(0);
if (nArgs > 0)
- pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< ::rtl::OUString* >(lArguments.getConstArray()));
+ pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< OUString* >(lArguments.getConstArray()));
oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs, nOptions, NULL, NULL, NULL, 0, &hProcess);
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 6908369866cb..46ed6b443359 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -89,7 +89,7 @@ OUString retrieveToolbarNameFromHelpURL( Window* pWindow )
ToolBox* pToolBox = dynamic_cast<ToolBox *>( pWindow );
if ( pToolBox )
{
- aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 );
+ aToolbarName = OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 );
sal_Int32 i = aToolbarName.lastIndexOf( ':' );
if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() ))
aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index fa70e80eaea4..1ceb6b4eabee 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -152,7 +152,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
{
// Initialize statusbar member
const sal_Bool bRefreshVisibility = sal_False;
- m_aStatusBarElement.m_aType = rtl::OUString( "statusbar" );
+ m_aStatusBarElement.m_aType = OUString( "statusbar" );
m_aStatusBarElement.m_aName = m_aStatusBarAlias;
m_pToolbarManager = new ToolbarLayoutManager( comphelper::getComponentContext(xServiceManager), Reference<XUIElementFactory>(m_xUIElementFactoryManager, UNO_QUERY_THROW), this );
@@ -203,7 +203,7 @@ void LayoutManager::impl_clearUpMenuBar()
{
try
{
- xPropSet->getPropertyValue( ::rtl::OUString( "XMenuBar" )) >>= xMenuBar;
+ xPropSet->getPropertyValue( OUString( "XMenuBar" )) >>= xMenuBar;
}
catch (const beans::UnknownPropertyException&)
{
@@ -264,7 +264,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
Reference< XMultiServiceFactory > xServiceManager( m_xSMGR );
Reference< XNameAccess > xPersistentWindowStateSupplier( m_xPersistentWindowStateSupplier );
ToolbarLayoutManager* pToolbarManager( m_pToolbarManager );
- ::rtl::OUString aModuleIdentifier( m_aModuleIdentifier );
+ OUString aModuleIdentifier( m_aModuleIdentifier );
bool bAutomaticToolbars( m_bAutomaticToolbars );
aReadLock.unlock();
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -276,7 +276,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
{
if ( bAttached )
{
- ::rtl::OUString aOldModuleIdentifier( aModuleIdentifier );
+ OUString aOldModuleIdentifier( aModuleIdentifier );
try
{
aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ) );
@@ -388,7 +388,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
xModuleCfgMgr.clear();
xDocCfgMgr.clear();
xPersistentWindowState.clear();
- aModuleIdentifier = ::rtl::OUString();
+ aModuleIdentifier = OUString();
}
Reference< XUIConfigurationManager > xModCfgMgr( xModuleCfgMgr, UNO_QUERY );
@@ -469,10 +469,10 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive
pToolbarManager->setFloatingToolbarsVisibility( bActive );
}
-uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::OUString& aName )
+uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const OUString& aName )
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
if ( aElementType.equalsIgnoreAsciiCase("menubar") &&
@@ -489,7 +489,7 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::O
return uno::Reference< ui::XUIElement >();
}
-sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData )
+sal_Bool LayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData )
{
sal_Bool bGetSettingsState( sal_False );
@@ -623,7 +623,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
return sal_False;
}
-void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, const UIElement& rElementData )
+void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UIElement& rElementData )
{
WriteGuard aWriteLock( m_aLock );
Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
@@ -639,7 +639,7 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
try
{
// Check persistent flag of the user interface element
- xPropSet->getPropertyValue( ::rtl::OUString( "Persistent" )) >>= bPersistent;
+ xPropSet->getPropertyValue( OUString( "Persistent" )) >>= bPersistent;
}
catch (const beans::UnknownPropertyException&)
{
@@ -714,15 +714,15 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
return aContainerWinSize;
}
-Reference< XUIElement > LayoutManager::implts_createElement( const rtl::OUString& aName )
+Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aName )
{
Reference< ui::XUIElement > xUIElement;
ReadGuard aReadLock( m_aLock );
Sequence< PropertyValue > aPropSeq( 2 );
- aPropSeq[0].Name = ::rtl::OUString( "Frame" );
+ aPropSeq[0].Name = OUString( "Frame" );
aPropSeq[0].Value <<= m_xFrame;
- aPropSeq[1].Name = ::rtl::OUString( "Persistent" );
+ aPropSeq[1].Name = OUString( "Persistent" );
aPropSeq[1].Value <<= sal_True;
try
@@ -826,7 +826,7 @@ void LayoutManager::implts_destroyStatusBar()
Reference< XComponent > xCompStatusBar;
WriteGuard aWriteLock( m_aLock );
- m_aStatusBarElement.m_aName = rtl::OUString();
+ m_aStatusBarElement.m_aName = OUString();
xCompStatusBar = Reference< XComponent >( m_aStatusBarElement.m_xUIElement, UNO_QUERY );
m_aStatusBarElement.m_xUIElement.clear();
aWriteLock.unlock();
@@ -837,7 +837,7 @@ void LayoutManager::implts_destroyStatusBar()
implts_destroyProgressBar();
}
-void LayoutManager::implts_createStatusBar( const rtl::OUString& aStatusBarName )
+void LayoutManager::implts_createStatusBar( const OUString& aStatusBarName )
{
WriteGuard aWriteLock( m_aLock );
if ( !m_aStatusBarElement.m_xUIElement.is() )
@@ -851,7 +851,7 @@ void LayoutManager::implts_createStatusBar( const rtl::OUString& aStatusBarName
implts_createProgressBar();
}
-void LayoutManager::implts_readStatusBarState( const rtl::OUString& rStatusBarName )
+void LayoutManager::implts_readStatusBarState( const OUString& rStatusBarName )
{
WriteGuard aWriteLock( m_aLock );
if ( !m_aStatusBarElement.m_bStateRead )
@@ -1165,7 +1165,7 @@ throw (uno::RuntimeException)
if ( m_xFrame.is() && m_xContainerWindow.is() )
{
- rtl::OUString aModuleIdentifier;
+ OUString aModuleIdentifier;
Reference< XDispatchProvider > xDispatchProvider;
MenuBar* pMenuBar = new MenuBar;
@@ -1403,7 +1403,7 @@ void LayoutManager::implts_reparentChildWindows()
aWriteLock.unlock();
}
-uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( const ::rtl::OUString& aElementName )
+uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( const OUString& aElementName )
{
Reference< XUIElement > xUIElement = implts_createElement( aElementName );
return xUIElement;
@@ -1430,7 +1430,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
return nResult;
}
-void SAL_CALL LayoutManager::createElement( const ::rtl::OUString& aName )
+void SAL_CALL LayoutManager::createElement( const OUString& aName )
throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::createElement" );
@@ -1463,8 +1463,8 @@ throw (RuntimeException)
if ( m_xContainerWindow.is() && !bPreviewFrame ) // no UI elements on preview frames
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
@@ -1494,7 +1494,7 @@ throw (RuntimeException)
{
try
{
- xPropSet->getPropertyValue( ::rtl::OUString( "XMenuBar" )) >>= xMenuBar;
+ xPropSet->getPropertyValue( OUString( "XMenuBar" )) >>= xMenuBar;
}
catch (const beans::UnknownPropertyException&)
{
@@ -1564,7 +1564,7 @@ throw (RuntimeException)
}
}
-void SAL_CALL LayoutManager::destroyElement( const ::rtl::OUString& aName )
+void SAL_CALL LayoutManager::destroyElement( const OUString& aName )
throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::destroyElement" );
@@ -1575,8 +1575,8 @@ throw (RuntimeException)
bool bMustBeLayouted( sal_False );
bool bMustBeDestroyed( sal_False );
bool bNotify( sal_False );
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
Reference< XComponent > xComponent;
parseResourceURL( aName, aElementType, aElementName );
@@ -1641,19 +1641,19 @@ throw (RuntimeException)
implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
}
-::sal_Bool SAL_CALL LayoutManager::requestElement( const ::rtl::OUString& rResourceURL )
+::sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL )
throw (uno::RuntimeException)
{
bool bResult( false );
bool bNotify( false );
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( rResourceURL, aElementType, aElementName );
WriteGuard aWriteLock( m_aLock );
- ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
+ OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s requested.", aResName.getStr() );
if (( aElementType.equalsIgnoreAsciiCase("statusbar") &&
@@ -1718,7 +1718,7 @@ throw (uno::RuntimeException)
return bResult;
}
-Reference< XUIElement > SAL_CALL LayoutManager::getElement( const ::rtl::OUString& aName )
+Reference< XUIElement > SAL_CALL LayoutManager::getElement( const OUString& aName )
throw (RuntimeException)
{
Reference< XUIElement > xUIElement = implts_findElement( aName );
@@ -1771,7 +1771,7 @@ throw (uno::RuntimeException)
return aSeq;
}
-sal_Bool SAL_CALL LayoutManager::showElement( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName )
throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::showElement" );
@@ -1779,12 +1779,12 @@ throw (RuntimeException)
bool bResult( false );
bool bNotify( false );
bool bMustLayout( false );
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
- ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
+ OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
if ( aElementType.equalsIgnoreAsciiCase("menubar") &&
@@ -1856,18 +1856,18 @@ throw (RuntimeException)
return bResult;
}
-sal_Bool SAL_CALL LayoutManager::hideElement( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName )
throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" );
bool bNotify( false );
bool bMustLayout( false );
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
- ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
+ OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
if ( aElementType.equalsIgnoreAsciiCase("menubar") &&
@@ -1941,11 +1941,11 @@ throw (RuntimeException)
return sal_False;
}
-sal_Bool SAL_CALL LayoutManager::dockWindow( const ::rtl::OUString& aName, DockingArea DockingArea, const awt::Point& Pos )
+sal_Bool SAL_CALL LayoutManager::dockWindow( const OUString& aName, DockingArea DockingArea, const awt::Point& Pos )
throw (RuntimeException)
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -1980,7 +1980,7 @@ throw (RuntimeException)
return bResult;
}
-sal_Bool SAL_CALL LayoutManager::floatWindow( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL LayoutManager::floatWindow( const OUString& aName )
throw (RuntimeException)
{
bool bResult( false );
@@ -2000,7 +2000,7 @@ throw (RuntimeException)
return bResult;
}
-::sal_Bool SAL_CALL LayoutManager::lockWindow( const ::rtl::OUString& aName )
+::sal_Bool SAL_CALL LayoutManager::lockWindow( const OUString& aName )
throw (uno::RuntimeException)
{
bool bResult( false );
@@ -2020,7 +2020,7 @@ throw (uno::RuntimeException)
return bResult;
}
-::sal_Bool SAL_CALL LayoutManager::unlockWindow( const ::rtl::OUString& aName )
+::sal_Bool SAL_CALL LayoutManager::unlockWindow( const OUString& aName )
throw (uno::RuntimeException)
{
bool bResult( false );
@@ -2040,7 +2040,7 @@ throw (uno::RuntimeException)
return bResult;
}
-void SAL_CALL LayoutManager::setElementSize( const ::rtl::OUString& aName, const awt::Size& aSize )
+void SAL_CALL LayoutManager::setElementSize( const OUString& aName, const awt::Size& aSize )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2058,7 +2058,7 @@ throw (RuntimeException)
}
}
-void SAL_CALL LayoutManager::setElementPos( const ::rtl::OUString& aName, const awt::Point& aPos )
+void SAL_CALL LayoutManager::setElementPos( const OUString& aName, const awt::Point& aPos )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2076,7 +2076,7 @@ throw (RuntimeException)
}
}
-void SAL_CALL LayoutManager::setElementPosSize( const ::rtl::OUString& aName, const awt::Point& aPos, const awt::Size& aSize )
+void SAL_CALL LayoutManager::setElementPosSize( const OUString& aName, const awt::Point& aPos, const awt::Size& aSize )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2094,11 +2094,11 @@ throw (RuntimeException)
}
}
-sal_Bool SAL_CALL LayoutManager::isElementVisible( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL LayoutManager::isElementVisible( const OUString& aName )
throw (RuntimeException)
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
if ( aElementType.equalsIgnoreAsciiCase("menubar") &&
@@ -2168,7 +2168,7 @@ throw (RuntimeException)
return sal_False;
}
-sal_Bool SAL_CALL LayoutManager::isElementFloating( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL LayoutManager::isElementFloating( const OUString& aName )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2184,7 +2184,7 @@ throw (RuntimeException)
return sal_False;
}
-sal_Bool SAL_CALL LayoutManager::isElementDocked( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL LayoutManager::isElementDocked( const OUString& aName )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2200,7 +2200,7 @@ throw (RuntimeException)
return sal_False;
}
-::sal_Bool SAL_CALL LayoutManager::isElementLocked( const ::rtl::OUString& aName )
+::sal_Bool SAL_CALL LayoutManager::isElementLocked( const OUString& aName )
throw (uno::RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2216,7 +2216,7 @@ throw (uno::RuntimeException)
return sal_False;
}
-awt::Size SAL_CALL LayoutManager::getElementSize( const ::rtl::OUString& aName )
+awt::Size SAL_CALL LayoutManager::getElementSize( const OUString& aName )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2232,7 +2232,7 @@ throw (RuntimeException)
return awt::Size();
}
-awt::Point SAL_CALL LayoutManager::getElementPos( const ::rtl::OUString& aName )
+awt::Point SAL_CALL LayoutManager::getElementPos( const OUString& aName )
throw (RuntimeException)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2259,7 +2259,7 @@ throw (RuntimeException)
RTL_LOGFILE_TRACE1( "framework (cd100003) ::LayoutManager::lock lockCount=%d", nLockCount );
#ifdef DBG_UTIL
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::lock "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::lock "));
aStr.append(reinterpret_cast<sal_Int64>(this));
aStr.append(RTL_CONSTASCII_STRINGPARAM(" - "));
aStr.append(nLockCount);
@@ -2281,7 +2281,7 @@ throw (RuntimeException)
RTL_LOGFILE_TRACE1( "framework (cd100003) ::LayoutManager::unlock lockCount=%d", nLockCount );
#ifdef DBG_UTIL
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::unlock "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::unlock "));
aStr.append(reinterpret_cast<sal_Int64>(this));
aStr.append(RTL_CONSTASCII_STRINGPARAM(" - "));
aStr.append(nLockCount);
@@ -2631,8 +2631,8 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose)
xDispatcher->executeDispatch(
xProvider,
- ::rtl::OUString(".uno:CloseWin"),
- ::rtl::OUString("_self"),
+ OUString(".uno:CloseWin"),
+ OUString("_self"),
0,
uno::Sequence< beans::PropertyValue >());
@@ -2958,8 +2958,8 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
if ( xFrame.is() )
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
bool bRefreshLayout(false);
parseResourceURL( Event.ResourceURL, aElementType, aElementName );
@@ -2977,7 +2977,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
if ( xElementSettings.is() )
{
- ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" );
+ OUString aConfigSourcePropName( "ConfigurationSource" );
uno::Reference< XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
if ( xPropSet.is() )
{
@@ -3007,8 +3007,8 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
if ( xFrame.is() )
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
bool bRefreshLayout(false);
parseResourceURL( Event.ResourceURL, aElementType, aElementName );
@@ -3027,7 +3027,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
if ( xElementSettings.is() )
{
bool bNoSettings( false );
- ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" );
+ OUString aConfigSourcePropName( "ConfigurationSource" );
Reference< XInterface > xElementCfgMgr;
Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
@@ -3091,8 +3091,8 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
if ( xFrame.is() )
{
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
+ OUString aElementType;
+ OUString aElementName;
bool bRefreshLayout(false);
parseResourceURL( Event.ResourceURL, aElementType, aElementName );
@@ -3110,7 +3110,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
if ( xElementSettings.is() )
{
- ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" );
+ OUString aConfigSourcePropName( "ConfigurationSource" );
Reference< XInterface > xElementCfgMgr;
Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index c1ea381619b1..9063f5be195c 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -108,13 +108,13 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
void createStaticToolbars();
void destroyToolbars();
- bool requestToolbar( const ::rtl::OUString& rResourceURL );
- bool createToolbar( const ::rtl::OUString& rResourceURL );
- bool destroyToolbar( const ::rtl::OUString& rResourceURL );
+ bool requestToolbar( const OUString& rResourceURL );
+ bool createToolbar( const OUString& rResourceURL );
+ bool destroyToolbar( const OUString& rResourceURL );
// visibility
- bool showToolbar( const ::rtl::OUString& rResourceURL );
- bool hideToolbar( const ::rtl::OUString& rResourceURL );
+ bool showToolbar( const OUString& rResourceURL );
+ bool hideToolbar( const OUString& rResourceURL );
void refreshToolbarsVisibility( bool bAutomaticToolbars );
void setFloatingToolbarsVisibility( bool bVisible );
@@ -122,21 +122,21 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
bool isVisible() { return m_bVisible; }
// docking and further functions
- bool dockToolbar( const ::rtl::OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos );
+ bool dockToolbar( const OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos );
bool dockAllToolbars();
- bool floatToolbar( const ::rtl::OUString& rResoureURL );
- bool lockToolbar( const ::rtl::OUString& rResourceURL );
- bool unlockToolbar( const ::rtl::OUString& rResourceURL );
- void setToolbarPos( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos );
- void setToolbarSize( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Size& aSize );
- void setToolbarPosSize( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize );
- bool isToolbarVisible( const ::rtl::OUString& rResourceURL );
- bool isToolbarFloating( const ::rtl::OUString& rResourceURL );
- bool isToolbarDocked( const ::rtl::OUString& rResourceURL );
- bool isToolbarLocked( const ::rtl::OUString& rResourceURL );
- ::com::sun::star::awt::Point getToolbarPos( const ::rtl::OUString& rResourceURL );
- ::com::sun::star::awt::Size getToolbarSize( const ::rtl::OUString& rResourceURL );
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > getToolbar( const ::rtl::OUString& aName );
+ bool floatToolbar( const OUString& rResoureURL );
+ bool lockToolbar( const OUString& rResourceURL );
+ bool unlockToolbar( const OUString& rResourceURL );
+ void setToolbarPos( const OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos );
+ void setToolbarSize( const OUString& rResourceURL, const ::com::sun::star::awt::Size& aSize );
+ void setToolbarPosSize( const OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize );
+ bool isToolbarVisible( const OUString& rResourceURL );
+ bool isToolbarFloating( const OUString& rResourceURL );
+ bool isToolbarDocked( const OUString& rResourceURL );
+ bool isToolbarLocked( const OUString& rResourceURL );
+ ::com::sun::star::awt::Point getToolbarPos( const OUString& rResourceURL );
+ ::com::sun::star::awt::Size getToolbarSize( const OUString& rResourceURL );
+ ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > getToolbar( const OUString& aName );
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > getToolbars();
// child window notifications
@@ -193,7 +193,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
{
SingleRowColumnWindowData() : nVarSize( 0 ), nStaticSize( 0 ), nSpace( 0 ) {}
- std::vector< rtl::OUString > aUIElementNames;
+ std::vector< OUString > aUIElementNames;
std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aRowColumnWindows;
std::vector< ::com::sun::star::awt::Rectangle > aRowColumnWindowSizes;
std::vector< sal_Int32 > aRowColumnSpace;
@@ -211,7 +211,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
::Rectangle implts_calcDockingArea();
void implts_sortUIElements();
void implts_reparentToolbars();
- rtl::OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const;
+ OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const;
void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
void implts_destroyDockingAreaWindows();
@@ -232,11 +232,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
//---------------------------------------------------------------------------------------------------------
// lookup/container methods
//---------------------------------------------------------------------------------------------------------
- UIElement implts_findToolbar( const rtl::OUString& aName );
+ UIElement implts_findToolbar( const OUString& aName );
UIElement implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar );
- UIElement& impl_findToolbar( const rtl::OUString& aName );
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const ::rtl::OUString& aName );
- Window* implts_getWindow( const ::rtl::OUString& aName );
+ UIElement& impl_findToolbar( const OUString& aName );
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const OUString& aName );
+ Window* implts_getWindow( const OUString& aName );
bool implts_insertToolbar( const UIElement& rUIElement );
void implts_setToolbar( const UIElement& rUIElement );
::Size implts_getTopBottomDockingAreaSizes();
@@ -248,11 +248,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset );
void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos );
DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos );
- ::Rectangle implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const rtl::OUString& rExcludeElementName );
+ ::Rectangle implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName );
::Rectangle implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea,
sal_Int32 nRowCol,
const ::Rectangle& rDockedElementRect,
- const ::rtl::OUString& rMovedElementName,
+ const OUString& rMovedElementName,
const ::Rectangle& rMovedElementRect );
::Rectangle implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea,
sal_Int32 nRowCol,
@@ -273,16 +273,16 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
void implts_createCustomToolBars();
void implts_createNonContextSensitiveToolBars();
void implts_createCustomToolBars( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aCustomTbxSeq );
- void implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle );
- void implts_createToolBar( const ::rtl::OUString& aName, bool& bNotify, ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement );
- css::uno::Reference< css::ui::XUIElement > implts_createElement( const ::rtl::OUString& aName );
+ void implts_createCustomToolBar( const OUString& aTbxResName, const OUString& aTitle );
+ void implts_createToolBar( const OUString& aName, bool& bNotify, ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement );
+ css::uno::Reference< css::ui::XUIElement > implts_createElement( const OUString& aName );
void implts_setToolbarCreation( bool bStart = true );
bool implts_isToolbarCreationActive();
//---------------------------------------------------------------------------------------------------------
// persistence methods
//---------------------------------------------------------------------------------------------------------
- sal_Bool implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData );
+ sal_Bool implts_readWindowStateData( const OUString& aName, UIElement& rElementData );
void implts_writeWindowStateData( const UIElement& rElementData );
//---------------------------------------------------------------------------------------------------------
@@ -319,11 +319,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
bool m_bLayoutInProgress;
bool m_bToolbarCreation;
- ::rtl::OUString m_aFullAddonTbxPrefix;
- ::rtl::OUString m_aCustomTbxPrefix;
- ::rtl::OUString m_aCustomizeCmd;
- ::rtl::OUString m_aToolbarTypeString;
- ::rtl::OUString m_aModuleIdentifier;
+ OUString m_aFullAddonTbxPrefix;
+ OUString m_aCustomTbxPrefix;
+ OUString m_aCustomizeCmd;
+ OUString m_aToolbarTypeString;
+ OUString m_aModuleIdentifier;
};
} // namespace framework
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index b0275f7c0c7e..78f8f27b0848 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -144,8 +144,8 @@ LoadEnv::~LoadEnv()
css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader,
const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
- const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTarget,
+ const OUString& sURL ,
+ const OUString& sTarget,
sal_Int32 nFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
throw(css::lang::IllegalArgumentException,
@@ -222,10 +222,10 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
}
-void LoadEnv::initializeLoading(const ::rtl::OUString& sURL ,
+void LoadEnv::initializeLoading(const OUString& sURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor,
const css::uno::Reference< css::frame::XFrame >& xBaseFrame ,
- const ::rtl::OUString& sTarget ,
+ const OUString& sTarget ,
sal_Int32 nSearchFlags ,
EFeature eFeature , // => use default ...
EContentType eContentType ) // => use default ...
@@ -559,7 +559,7 @@ void LoadEnv::impl_setResult(sal_Bool bResult)
TODO: Is it a good idea to change Sequence<>
parameter to stl-adapter?
-----------------------------------------------*/
-LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& sURL ,
+LoadEnv::EContentType LoadEnv::classifyContent(const OUString& sURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor)
{
//-------------------------------------------
@@ -639,12 +639,12 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
xContext->getServiceManager()->createInstanceWithContext(SERVICENAME_TYPEDETECTION, xContext),
css::uno::UNO_QUERY);
- ::rtl::OUString sType = xDetect->queryTypeByURL(sURL);
+ OUString sType = xDetect->queryTypeByURL(sURL);
css::uno::Sequence< css::beans::NamedValue > lQuery(1) ;
css::uno::Reference< css::container::XContainerQuery > xContainer ;
css::uno::Reference< css::container::XEnumeration > xSet ;
- css::uno::Sequence< ::rtl::OUString > lTypesReg(1);
+ css::uno::Sequence< OUString > lTypesReg(1);
//-------------------------------------------
@@ -661,7 +661,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
// Because there exist some types, which are referenced by
// other objects ... but not by filters nor frame loaders!
- rtl::OUString sPROP_TYPES(PROP_TYPES);
+ OUString sPROP_TYPES(PROP_TYPES);
lTypesReg[0] = sType;
lQuery[0].Name = sPROP_TYPES;
@@ -766,8 +766,8 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip
void LoadEnv::impl_detectTypeAndFilter()
throw(LoadEnvException, css::uno::RuntimeException)
{
- static ::rtl::OUString TYPEPROP_PREFERREDFILTER("PreferredFilter");
- static ::rtl::OUString FILTERPROP_FLAGS ("Flags");
+ static OUString TYPEPROP_PREFERREDFILTER("PreferredFilter");
+ static OUString FILTERPROP_FLAGS ("Flags");
static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16;
// SAFE ->
@@ -782,7 +782,7 @@ void LoadEnv::impl_detectTypeAndFilter()
aReadLock.unlock();
// <- SAFE
- rtl::OUString sType, sFilter;
+ OUString sType, sFilter;
if (queryOrcusTypeAndFilter(lDescriptor, sType, sFilter) && !sType.isEmpty() && !sFilter.isEmpty())
{
@@ -810,7 +810,7 @@ void LoadEnv::impl_detectTypeAndFilter()
m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sType;
// Is there an already detected (may be preselected) filter?
// see below ...
- sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString());
+ sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString());
aWriteLock.unlock();
// <- SAFE
@@ -830,7 +830,7 @@ void LoadEnv::impl_detectTypeAndFilter()
try
{
::comphelper::SequenceAsHashMap lTypeProps(xTypeCont->getByName(sType));
- sFilter = lTypeProps.getUnpackedValueOrDefault(TYPEPROP_PREFERREDFILTER, ::rtl::OUString());
+ sFilter = lTypeProps.getUnpackedValueOrDefault(TYPEPROP_PREFERREDFILTER, OUString());
if (!sFilter.isEmpty())
{
// SAFE ->
@@ -886,7 +886,7 @@ sal_Bool LoadEnv::impl_handleContent()
ReadGuard aReadLock(m_aLock);
// the type must exist inside the descriptor ... otherwise this class is implemented wrong :-)
- ::rtl::OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString());
+ OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), OUString());
if (sType.isEmpty())
throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
@@ -903,20 +903,20 @@ sal_Bool LoadEnv::impl_handleContent()
// <- SAFE -----------------------------------
// query
- css::uno::Sequence< ::rtl::OUString > lTypeReg(1);
+ css::uno::Sequence< OUString > lTypeReg(1);
lTypeReg[0] = sType;
css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = rtl::OUString(PROP_TYPES);
+ lQuery[0].Name = OUString(PROP_TYPES);
lQuery[0].Value <<= lTypeReg;
- ::rtl::OUString sPROP_NAME(PROP_NAME);
+ OUString sPROP_NAME(PROP_NAME);
css::uno::Reference< css::container::XEnumeration > xSet = xQuery->createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
{
::comphelper::SequenceAsHashMap lProps (xSet->nextElement());
- ::rtl::OUString sHandler = lProps.getUnpackedValueOrDefault(sPROP_NAME, ::rtl::OUString());
+ OUString sHandler = lProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
css::uno::Reference< css::frame::XNotifyingDispatch > xHandler;
try
@@ -961,9 +961,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
{
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(xSMGR),
- ::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 !
@@ -1035,7 +1035,7 @@ sal_Bool LoadEnv::impl_loadContent()
WriteGuard aWriteLock(m_aLock);
// search or create right target frame
- ::rtl::OUString sTarget = m_sTarget;
+ OUString sTarget = m_sTarget;
if (TargetHelper::matchSpecialTarget(sTarget, TargetHelper::E_DEFAULT))
{
m_xTargetFrame = impl_searchAlreadyLoaded();
@@ -1128,7 +1128,7 @@ sal_Bool LoadEnv::impl_loadContent()
// convert media descriptor and URL to right format for later interface call!
css::uno::Sequence< css::beans::PropertyValue > lDescriptor;
m_lMediaDescriptor >> lDescriptor;
- ::rtl::OUString sURL = m_aURL.Complete;
+ OUString sURL = m_aURL.Complete;
// try to locate any interested frame loader
css::uno::Reference< css::uno::XInterface > xLoader = impl_searchLoader();
@@ -1191,7 +1191,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
// Otherwhise ...
// We need this type information to locate an registered frame loader
// Without such information we can't work!
- ::rtl::OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString());
+ OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), OUString());
if (sType.isEmpty())
throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
@@ -1202,14 +1202,14 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
aReadLock.unlock();
// <- SAFE -----------------------------------
- css::uno::Sequence< ::rtl::OUString > lTypesReg(1);
+ css::uno::Sequence< OUString > lTypesReg(1);
lTypesReg[0] = sType;
css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = rtl::OUString(PROP_TYPES);
+ lQuery[0].Name = OUString(PROP_TYPES);
lQuery[0].Value <<= lTypesReg;
- ::rtl::OUString sPROP_NAME(PROP_NAME);
+ OUString sPROP_NAME(PROP_NAME);
css::uno::Reference< css::container::XEnumeration > xSet = xQuery->createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
@@ -1217,7 +1217,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
// try everyone ...
// Ignore any loader, which makes trouble :-)
::comphelper::SequenceAsHashMap lLoaderProps(xSet->nextElement());
- ::rtl::OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, ::rtl::OUString());
+ OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
css::uno::Reference< css::uno::XInterface > xLoader ;
try
{
@@ -1252,7 +1252,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
// <- SAFE
css::util::URL aCmd;
- aCmd.Complete = ::rtl::OUString(".uno:JumpToMark");
+ aCmd.Complete = OUString(".uno:JumpToMark");
css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
xParser->parseStrict(aCmd);
@@ -1262,7 +1262,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
return;
::comphelper::SequenceAsHashMap lArgs;
- lArgs[::rtl::OUString("Bookmark")] <<= aURL.Mark;
+ lArgs[OUString("Bookmark")] <<= aURL.Mark;
xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList());
}
@@ -1344,7 +1344,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
// don't check the complete URL here.
// use its main part - ignore optional jumpmarks!
- const ::rtl::OUString sURL = xModel->getURL();
+ const OUString sURL = xModel->getURL();
if (!::utl::UCBContentHelper::EqualURLs( m_aURL.Main, sURL ))
{
xTask.clear ();
@@ -1597,7 +1597,7 @@ void LoadEnv::impl_reactForLoadingState()
::comphelper::MediaDescriptor::const_iterator pFrameName = m_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_FRAMENAME());
if (pFrameName != m_lMediaDescriptor.end())
{
- ::rtl::OUString sFrameName;
+ OUString sFrameName;
pFrameName->second >>= sFrameName;
// Check the name again. e.g. "_default" isnt allowed.
// On the other side "_beamer" is a valid name :-)
@@ -1699,9 +1699,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
css::uno::Any const a =
::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(xSMGR),
- ::rtl::OUString("org.openoffice.Office.Common/View"),
- ::rtl::OUString("NewDocumentHandling"),
- ::rtl::OUString("ForceFocusAndToFront"),
+ OUString("org.openoffice.Office.Common/View"),
+ OUString("NewDocumentHandling"),
+ OUString("ForceFocusAndToFront"),
::comphelper::ConfigurationHelper::E_READONLY);
a >>= bForceFrontAndFocus;
}
@@ -1716,7 +1716,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
{
- static ::rtl::OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories");
+ static OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories");
// no window -> action not possible
if (!xWindow.is())
@@ -1756,9 +1756,9 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
ReadGuard aReadLock(m_aLock);
// no filter -> no module -> no persistent window state
- ::rtl::OUString sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(
+ OUString sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(
::comphelper::MediaDescriptor::PROP_FILTERNAME(),
- ::rtl::OUString());
+ OUString());
if (sFilter.isEmpty())
return;
@@ -1774,7 +1774,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
xSMGR->createInstance(SERVICENAME_FILTERFACTORY),
css::uno::UNO_QUERY_THROW);
::comphelper::SequenceAsHashMap lProps (xFilterCfg->getByName(sFilter));
- ::rtl::OUString sModule = lProps.getUnpackedValueOrDefault(FILTER_PROPNAME_DOCUMENTSERVICE, ::rtl::OUString());
+ OUString sModule = lProps.getUnpackedValueOrDefault(FILTER_PROPNAME_DOCUMENTSERVICE, OUString());
// get access to the configuration of this office module
css::uno::Reference< css::container::XNameAccess > xModuleCfg(::comphelper::ConfigurationHelper::openConfig(
@@ -1786,7 +1786,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
// read window state from the configuration
// and apply it on the window.
// Do nothing, if no configuration entry exists!
- ::rtl::OUString sWindowState ;
+ OUString sWindowState ;
::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES) >>= sWindowState;
if (!sWindowState.isEmpty())
{
@@ -1803,7 +1803,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
return;
SystemWindow* pSystemWindow = (SystemWindow*)pWindowCheck;
- pSystemWindow->SetWindowState(rtl::OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
+ pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
// <- SOLAR SAFE
}
}
diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx
index 41a064ef9375..b87ed7469bd4 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
@@ -21,7 +21,7 @@
namespace framework{
-sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget ,
+sal_Bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget ,
ESpecialTarget eSpecialTarget)
{
switch(eSpecialTarget)
@@ -57,7 +57,7 @@ sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget ,
}
}
-sal_Bool TargetHelper::isValidNameForFrame(const ::rtl::OUString& sName)
+sal_Bool TargetHelper::isValidNameForFrame(const OUString& sName)
{
// some special targets are realy special ones :-)
// E.g. the are realy used to locate one frame inside the frame tree.
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 73c8d1e5af5d..02451e107f86 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -97,7 +97,7 @@ Sequence< Any > make_seq_out_of_struct(
{
throw RuntimeException(
type.getTypeName() +
- ::rtl::OUString( "is no struct or exception!" ),
+ OUString( "is no struct or exception!" ),
Reference< XInterface >() );
}
typelib_TypeDescription * pTD = 0;
@@ -106,7 +106,7 @@ Sequence< Any > make_seq_out_of_struct(
if (! pTD)
{
throw RuntimeException(
- ::rtl::OUString( "cannot get type descr of type " ) +
+ OUString( "cannot get type descr of type " ) +
type.getTypeName(),
Reference< XInterface >() );
}
@@ -144,7 +144,7 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::
void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException )
{
- ::rtl::OUString aTarget;
+ OUString aTarget;
com::sun::star::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_False );
m_aStatements.push_back( aStatement );
@@ -154,7 +154,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException )
{
- ::rtl::OUString aTarget;
+ OUString aTarget;
// last parameter must be set to true -> it's a comment
com::sun::star::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_True );
@@ -171,15 +171,15 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException
}
//*************************************************************************
-::rtl::OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException )
+OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException )
{
/* SAFE{ */
WriteGuard aWriteLock(m_aLock);
if ( m_aStatements.empty() )
- return ::rtl::OUString();
+ return OUString();
- ::rtl::OUStringBuffer aScriptBuffer;
+ OUStringBuffer aScriptBuffer;
aScriptBuffer.ensureCapacity(10000);
m_nRecordingID = 1;
@@ -195,13 +195,13 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException
std::vector< com::sun::star::frame::DispatchStatement>::iterator p;
for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p )
implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer );
- ::rtl::OUString sScript = aScriptBuffer.makeStringAndClear();
+ OUString sScript = aScriptBuffer.makeStringAndClear();
return sScript;
/* } */
}
//*************************************************************************
-void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUStringBuffer& aArgumentBuffer )
+void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer )
{
// if value == bool
if (aValue.getValueTypeClass() == css::uno::TypeClass_STRUCT )
@@ -242,7 +242,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS
else if (aValue.getValueTypeClass() == css::uno::TypeClass_STRING )
{
// strings need \"
- ::rtl::OUString sVal;
+ OUString sVal;
aValue >>= sVal;
// encode non printable characters or '"' by using the CHR$ function
@@ -315,12 +315,12 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS
}
catch (const css::script::CannotConvertException&) {}
catch (const css::uno::Exception&) {}
- ::rtl::OUString sVal;
+ OUString sVal;
aNew >>= sVal;
if (aValue.getValueTypeClass() == css::uno::TypeClass_ENUM )
{
- ::rtl::OUString aName = aValue.getValueType().getTypeName();
+ OUString aName = aValue.getValueType().getTypeName();
aArgumentBuffer.append( aName );
aArgumentBuffer.appendAscii(".");
}
@@ -329,15 +329,15 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS
}
}
-void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL,
+void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
- sal_Bool bAsComment, ::rtl::OUStringBuffer& aScriptBuffer )
+ sal_Bool bAsComment, OUStringBuffer& aScriptBuffer )
{
- ::rtl::OUStringBuffer aArgumentBuffer(1000);
- ::rtl::OUString sArrayName;
+ OUStringBuffer aArgumentBuffer(1000);
+ OUString sArrayName;
// this value is used to name the arrays of aArgumentBuffer
- sArrayName = ::rtl::OUString("args");
- sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID);
+ sArrayName = OUString("args");
+ sArrayName += OUString::valueOf((sal_Int32)m_nRecordingID);
aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n");
@@ -348,7 +348,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL,
if(!lArguments[i].Value.hasValue())
continue;
- ::rtl::OUStringBuffer sValBuffer(100);
+ OUStringBuffer sValBuffer(100);
try
{
AppendToBuffer(lArguments[i].Value, sValBuffer);
@@ -438,7 +438,7 @@ com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) t
{
if (idx >= (sal_Int32)m_aStatements.size()) {
throw com::sun::star::lang::IndexOutOfBoundsException(
- ::rtl::OUString( "Dispatch recorder out of bounds" ),
+ OUString( "Dispatch recorder out of bounds" ),
Reference< XInterface >() );
}
@@ -454,13 +454,13 @@ void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::st
if (element.getValueType() !=
::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL)) {
throw com::sun::star::lang::IllegalArgumentException(
- ::rtl::OUString( "Illegal argument in dispatch recorder" ),
+ OUString( "Illegal argument in dispatch recorder" ),
Reference< XInterface >(), 2 );
}
if (idx >= (sal_Int32)m_aStatements.size()) {
throw com::sun::star::lang::IndexOutOfBoundsException(
- ::rtl::OUString( "Dispatch recorder out of bounds" ),
+ OUString( "Dispatch recorder out of bounds" ),
Reference< XInterface >() );
}
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 00c3e0792757..20ffa4585f22 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -310,7 +310,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
{
OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
throw css::uno::RuntimeException(
- ::rtl::OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."),
+ OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."),
m_xOwner);
}
@@ -337,7 +337,7 @@ void CacheLockGuard::unlock()
{
OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
throw css::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
m_xOwner);
}
aWriteLock.unlock();
@@ -356,7 +356,7 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap&
{
m_nWorkingEntryID = lArgs.getUnpackedValueOrDefault(PROP_ENTRY_ID, (sal_Int32)-1 );
m_xProgress = lArgs.getUnpackedValueOrDefault(PROP_PROGRESS, css::uno::Reference< css::task::XStatusIndicator >());
- m_sSavePath = lArgs.getUnpackedValueOrDefault(PROP_SAVEPATH, ::rtl::OUString() );
+ m_sSavePath = lArgs.getUnpackedValueOrDefault(PROP_SAVEPATH, OUString() );
m_xHoldRefForAsyncOpAlive = xOwner;
};
@@ -386,7 +386,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy)
//-----------------------------------------------
void DispatchParams::forget()
{
- m_sSavePath = ::rtl::OUString();
+ m_sSavePath = OUString();
m_nWorkingEntryID = -1;
m_xProgress.clear();
m_xHoldRefForAsyncOpAlive.clear();
@@ -715,7 +715,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
throw(css::uno::RuntimeException)
{
if (!xListener.is())
- throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
+ throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
// container is threadsafe by using a shared mutex!
m_lListener.addInterface(aURL.Complete, xListener);
@@ -750,7 +750,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
throw(css::uno::RuntimeException)
{
if (!xListener.is())
- throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
+ throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
// container is threadsafe by using a shared mutex!
m_lListener.removeInterface(aURL.Complete, xListener);
}
@@ -845,7 +845,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
for (i=0; i<c; ++i)
{
- ::rtl::OUString sPath;
+ OUString sPath;
pChanges[i].Accessor >>= sPath;
if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED )
@@ -935,7 +935,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
aWriteLock.unlock();
// <- SAFE ----------------------------------
- rtl::OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY));
+ OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY));
// throws a RuntimeException if an error occure!
css::uno::Reference< css::container::XNameAccess > xCFG(
::comphelper::ConfigurationHelper::openConfig(xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD),
@@ -946,17 +946,17 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
try
{
- rtl::OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE);
+ OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE);
::comphelper::ConfigurationHelper::readDirectKey(xContext,
sCFG_PACKAGE_RECOVERY,
sCFG_PATH_AUTOSAVE,
- rtl::OUString(CFG_ENTRY_MINSPACE_DOCSAVE),
+ OUString(CFG_ENTRY_MINSPACE_DOCSAVE),
::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceDocSave;
::comphelper::ConfigurationHelper::readDirectKey(xContext,
sCFG_PACKAGE_RECOVERY,
sCFG_PATH_AUTOSAVE,
- rtl::OUString(CFG_ENTRY_MINSPACE_CONFIGSAVE),
+ OUString(CFG_ENTRY_MINSPACE_CONFIGSAVE),
::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceConfigSave;
}
catch(const css::uno::Exception&)
@@ -985,11 +985,11 @@ void AutoRecovery::implts_readAutoSaveConfig()
// AutoSave [bool]
sal_Bool bEnabled = sal_False;
- xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled;
+ xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled;
// UserAutoSave [bool]
sal_Bool bUserEnabled = sal_False;
- xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled;
+ xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled;
// SAFE -> ------------------------------
WriteGuard aWriteLock(m_aLock);
@@ -1017,7 +1017,7 @@ void AutoRecovery::implts_readAutoSaveConfig()
// AutoSaveTimeIntervall [int] in min
sal_Int32 nTimeIntervall = 15;
- xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall;
+ xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall;
// SAFE -> ----------------------------------
aWriteLock.lock();
@@ -1050,14 +1050,14 @@ void AutoRecovery::implts_readConfig()
css::uno::Any aValue;
// RecoveryList [set]
- aValue = xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_RECOVERYLIST));
+ aValue = xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST));
css::uno::Reference< css::container::XNameAccess > xList;
aValue >>= xList;
if (xList.is())
{
- const rtl::OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER);
- const css::uno::Sequence< ::rtl::OUString > lItems = xList->getElementNames();
- const ::rtl::OUString* pItems = lItems.getConstArray();
+ const OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER);
+ const css::uno::Sequence< OUString > lItems = xList->getElementNames();
+ const OUString* pItems = lItems.getConstArray();
sal_Int32 c = lItems.getLength();
sal_Int32 i = 0;
@@ -1072,22 +1072,22 @@ void AutoRecovery::implts_readConfig()
continue;
AutoRecovery::TDocumentInfo aInfo;
- aInfo.NewTempURL = ::rtl::OUString();
+ aInfo.NewTempURL = OUString();
aInfo.Document = css::uno::Reference< css::frame::XModel >();
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL ;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL ;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL ;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter ;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title;
- xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL ;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL ;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL ;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter ;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title;
+ xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames;
implts_specifyAppModuleAndFactory(aInfo);
implts_specifyDefaultFilterAndExtension(aInfo);
if (pItems[i].indexOf(sRECOVERY_ITEM_BASE_IDENTIFIER)==0)
{
- ::rtl::OUString sID = pItems[i].copy(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength());
+ OUString sID = pItems[i].copy(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength());
aInfo.ID = sID.toInt32();
// SAFE -> ----------------------
aWriteLock.lock();
@@ -1124,7 +1124,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
if (rInfo.AppModule.isEmpty())
{
throw css::uno::RuntimeException(
- ::rtl::OUString("Cant find out the default filter and its extension, if no application module is known!"),
+ OUString("Cant find out the default filter and its extension, if no application module is known!"),
static_cast< css::frame::XDispatch* >(this));
}
@@ -1141,7 +1141,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
{
// open module config on demand and cache the update access
xCFG = css::uno::Reference< css::container::XNameAccess >(
- ::comphelper::ConfigurationHelper::openConfig(comphelper::getComponentContext(xSMGR), rtl::OUString(CFG_PACKAGE_MODULES),
+ ::comphelper::ConfigurationHelper::openConfig(comphelper::getComponentContext(xSMGR), OUString(CFG_PACKAGE_MODULES),
::comphelper::ConfigurationHelper::E_STANDARD),
css::uno::UNO_QUERY_THROW);
@@ -1156,27 +1156,27 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
xCFG->getByName(rInfo.AppModule),
css::uno::UNO_QUERY_THROW);
- xModuleProps->getByName(rtl::OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter;
+ xModuleProps->getByName(OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter;
css::uno::Reference< css::container::XNameAccess > xFilterCFG(xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNameAccess > xTypeCFG (xSMGR->createInstance(SERVICENAME_TYPEDETECTION), css::uno::UNO_QUERY_THROW);
::comphelper::SequenceAsHashMap lFilterProps (xFilterCFG->getByName(rInfo.DefaultFilter));
- ::rtl::OUString sTypeRegistration = lFilterProps.getUnpackedValueOrDefault(rtl::OUString(FILTER_PROP_TYPE), ::rtl::OUString());
+ OUString sTypeRegistration = lFilterProps.getUnpackedValueOrDefault(OUString(FILTER_PROP_TYPE), OUString());
::comphelper::SequenceAsHashMap lTypeProps (xTypeCFG->getByName(sTypeRegistration));
- css::uno::Sequence< ::rtl::OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(rtl::OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< ::rtl::OUString >());
+ css::uno::Sequence< OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< OUString >());
if (lExtensions.getLength())
{
- rInfo.Extension = ::rtl::OUString(".");
+ rInfo.Extension = OUString(".");
rInfo.Extension += lExtensions[0];
}
else
- rInfo.Extension = ::rtl::OUString(".unknown");
+ rInfo.Extension = OUString(".unknown");
}
catch(const css::uno::Exception&)
{
- rInfo.DefaultFilter = ::rtl::OUString();
- rInfo.Extension = ::rtl::OUString();
+ rInfo.DefaultFilter = OUString();
+ rInfo.Extension = OUString();
}
}
@@ -1200,8 +1200,8 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo
rInfo.AppModule = xManager->identify(rInfo.Document);
::comphelper::SequenceAsHashMap lModuleDescription(xManager->getByName(rInfo.AppModule));
- lModuleDescription[rtl::OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= rInfo.FactoryURL;
- lModuleDescription[rtl::OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService;
+ lModuleDescription[OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= rInfo.FactoryURL;
+ lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService;
}
//-----------------------------------------------
@@ -1212,7 +1212,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
i_rInfo.ViewNames.realloc(0);
// obtain list of controllers of this document
- ::std::vector< ::rtl::OUString > aViewNames;
+ ::std::vector< OUString > aViewNames;
const Reference< XModel2 > xModel( i_rInfo.Document, UNO_QUERY );
if ( xModel.is() )
{
@@ -1220,7 +1220,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
while ( xEnumControllers->hasMoreElements() )
{
const Reference< XController2 > xController( xEnumControllers->nextElement(), UNO_QUERY );
- ::rtl::OUString sViewName;
+ OUString sViewName;
if ( xController.is() )
sViewName = xController->getViewControllerName();
OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
@@ -1232,7 +1232,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
else
{
const Reference< XController2 > xController( xModel->getCurrentController(), UNO_QUERY );
- ::rtl::OUString sViewName;
+ OUString sViewName;
if ( xController.is() )
sViewName = xController->getViewControllerName();
OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
@@ -1272,15 +1272,15 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
xCFG = css::uno::Reference< css::container::XHierarchicalNameAccess >(implts_openConfig(), css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNameAccess > xCheck;
- xCFG->getByHierarchicalName(rtl::OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck;
+ xCFG->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck;
css::uno::Reference< css::container::XNameContainer > xModify(xCheck, css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::lang::XSingleServiceFactory > xCreate(xCheck, css::uno::UNO_QUERY_THROW);
- ::rtl::OUStringBuffer sIDBuf;
+ OUStringBuffer sIDBuf;
sIDBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(RECOVERY_ITEM_BASE_IDENTIFIER));
sIDBuf.append((sal_Int32)rInfo.ID);
- ::rtl::OUString sID = sIDBuf.makeStringAndClear();
+ OUString sID = sIDBuf.makeStringAndClear();
// remove
if (bRemoveIt)
@@ -1307,14 +1307,14 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
else
xCheck->getByName(sID) >>= xSet;
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL ));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL ));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL ));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title));
- xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL ));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL ));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL ));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title));
+ xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames));
if (bNew)
xModify->insertByName(sID, css::uno::makeAny(xSet));
@@ -1742,7 +1742,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
// and save an information about the real used filter by this document.
// We save this document with DefaultFilter ... and load it with the RealFilter.
implts_specifyDefaultFilterAndExtension(aNew);
- aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME() , ::rtl::OUString());
+ aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME() , OUString());
// Further we must know, if this document base on a template.
// Then we must load it in a different way.
@@ -1925,22 +1925,22 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr
css::uno::Reference< css::frame::XStorable > xDoc(rInfo.Document, css::uno::UNO_QUERY);
rInfo.OrgURL = xDoc->getLocation();
- ::rtl::OUString sRemoveURL1 = rInfo.OldTempURL;
- ::rtl::OUString sRemoveURL2 = rInfo.NewTempURL;
- rInfo.OldTempURL = ::rtl::OUString();
- rInfo.NewTempURL = ::rtl::OUString();
+ OUString sRemoveURL1 = rInfo.OldTempURL;
+ OUString sRemoveURL2 = rInfo.NewTempURL;
+ rInfo.OldTempURL = OUString();
+ rInfo.NewTempURL = OUString();
::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
- rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString());
+ rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString());
css::uno::Reference< css::frame::XTitle > xDocTitle(xDocument, css::uno::UNO_QUERY);
if (xDocTitle.is ())
rInfo.Title = xDocTitle->getTitle ();
else
{
- rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE() , ::rtl::OUString());
+ rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE() , OUString());
if (rInfo.Title.isEmpty())
- rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), ::rtl::OUString());
+ rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), OUString());
}
rInfo.UsedForSaving = sal_False;
@@ -2029,7 +2029,7 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo)
try
{
css::uno::Reference< css::frame::XStorable > xStore(rInfo.Document, css::uno::UNO_QUERY_THROW);
- ::rtl::OUString aURL = xStore->getLocation();
+ OUString aURL = xStore->getLocation();
if ( !aURL.isEmpty() )
{
::svt::DocumentLockFile aLockFile( aURL );
@@ -2153,7 +2153,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl
xExternalProgress = pParams->m_xProgress;
css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( comphelper::getComponentContext(xSMGR));
- ::rtl::OUString sBackupPath(SvtPathOptions().GetBackupPath());
+ OUString sBackupPath(SvtPathOptions().GetBackupPath());
css::uno::Reference< css::frame::XController > xActiveController;
css::uno::Reference< css::frame::XModel > xActiveModel ;
@@ -2315,7 +2315,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl
}
//-----------------------------------------------
-void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& sBackupPath ,
+void AutoRecovery::implts_saveOneDoc(const OUString& sBackupPath ,
AutoRecovery::TDocumentInfo& rInfo ,
const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress)
{
@@ -2333,7 +2333,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
// if the document was loaded with a password, it should be
// stored with password
::comphelper::MediaDescriptor lNewArgs;
- ::rtl::OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), ::rtl::OUString());
+ OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), OUString());
if (!sPassword.isEmpty())
lNewArgs[::comphelper::MediaDescriptor::PROP_PASSWORD()] <<= sPassword;
@@ -2349,7 +2349,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
// #i66598# use special handling of property "DocumentBaseURL" (it must be an empty string!)
// for make hyperlinks working
- lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString();
+ lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
// try to save this document as a new temp file everytimes.
// Mark AutoSave state as "INCOMPLETE" if it failed.
@@ -2421,7 +2421,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
else
{
// safe the state about error ...
- rInfo.NewTempURL = ::rtl::OUString();
+ rInfo.NewTempURL = OUString();
rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE;
rInfo.DocumentState |= AutoRecovery::E_HANDLED;
rInfo.DocumentState |= AutoRecovery::E_INCOMPLETE;
@@ -2433,9 +2433,9 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
// try to remove the old temp file.
// Ignore any error here. We have a new temp file, which is up to date.
// The only thing is: we fill the disk with temp files, if we cant remove old ones :-)
- ::rtl::OUString sRemoveFile = rInfo.OldTempURL;
+ OUString sRemoveFile = rInfo.OldTempURL;
rInfo.OldTempURL = rInfo.NewTempURL;
- rInfo.NewTempURL = ::rtl::OUString();
+ rInfo.NewTempURL = OUString();
implts_flushConfigItem(rInfo);
@@ -2489,8 +2489,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
::comphelper::MediaDescriptor lDescriptor;
// its an UI feature - so the "USER" itself must be set as referer
- lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= ::rtl::OUString(REFERRER_USER);
- lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString();
+ lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= OUString(REFERRER_USER);
+ lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString();
// recovered documents are loaded hidden, and shown all at once, later
lDescriptor[::comphelper::MediaDescriptor::PROP_HIDDEN()] <<= true;
@@ -2518,8 +2518,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
}
}
- ::rtl::OUString sLoadOriginalURL;
- ::rtl::OUString sLoadBackupURL ;
+ OUString sLoadOriginalURL;
+ OUString sLoadBackupURL ;
if (!bBackupWasTried)
sLoadBackupURL = rInfo.OldTempURL;
@@ -2542,7 +2542,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
// A "Salvaged" item must exists every time. The core can make something special then for recovery.
// Of course it should be the real file name of the original file, in case we load the temp. backup here.
- ::rtl::OUString sURL;
+ OUString sURL;
if (!sLoadBackupURL.isEmpty())
{
sURL = sLoadBackupURL;
@@ -2642,7 +2642,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
}
//-----------------------------------------------
-void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL ,
+void AutoRecovery::implts_openOneDoc(const OUString& sURL ,
::comphelper::MediaDescriptor& lDescriptor,
AutoRecovery::TDocumentInfo& rInfo )
{
@@ -2685,7 +2685,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL
Reference< XDocumentRecovery > xDocRecover( xModel, UNO_QUERY_THROW );
xDocRecover->recoverFromFile(
sURL,
- lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString() ),
+ lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), OUString() ),
lDescriptor.getAsConstPropertyValueList()
);
@@ -2694,14 +2694,14 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL
}
// re-create all the views
- ::std::vector< ::rtl::OUString > aViewsToRestore( rInfo.ViewNames.getLength() );
+ ::std::vector< OUString > aViewsToRestore( rInfo.ViewNames.getLength() );
if ( rInfo.ViewNames.getLength() )
::std::copy( rInfo.ViewNames.getConstArray(), rInfo.ViewNames.getConstArray() + rInfo.ViewNames.getLength(), aViewsToRestore.begin() );
// if we don't have views for whatever reason, then create a default-view, at least
if ( aViewsToRestore.empty() )
- aViewsToRestore.push_back( ::rtl::OUString() );
+ aViewsToRestore.push_back( OUString() );
- for ( ::std::vector< ::rtl::OUString >::const_iterator viewName = aViewsToRestore.begin();
+ for ( ::std::vector< OUString >::const_iterator viewName = aViewsToRestore.begin();
viewName != aViewsToRestore.end();
++viewName
)
@@ -2753,7 +2753,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL
}
// re-throw
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("Recovery of \"");
sMsg.append (sURL );
sMsg.appendAscii("\" failed." );
@@ -2767,7 +2767,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL
}
//-----------------------------------------------
-void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString& sBackupPath ,
+void AutoRecovery::implts_generateNewTempURL(const OUString& sBackupPath ,
::comphelper::MediaDescriptor& /*rMediaDescriptor*/,
AutoRecovery::TDocumentInfo& rInfo )
{
@@ -2785,7 +2785,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&
// we should not save it realy. Then we put the information about such "empty document"
// into the configuration and dont create any recovery file on disk.
// We use the title of the document to make it unique.
- ::rtl::OUStringBuffer sUniqueName;
+ OUStringBuffer sUniqueName;
if (!rInfo.OrgURL.isEmpty())
{
css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
@@ -2800,7 +2800,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&
// TODO: Must we strip some illegal signes - if we use the title?
- rtl::OUString sName(sUniqueName.makeStringAndClear());
+ OUString sName(sUniqueName.makeStringAndClear());
String sExtension(rInfo.Extension);
String sPath(sBackupPath);
::utl::TempFile aTempFile(sName, &sExtension, &sPath);
@@ -2814,7 +2814,7 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
{
// Helper shares mutex with us -> threadsafe!
::cppu::OInterfaceContainerHelper* pListenerForURL = 0;
- ::rtl::OUString sJob = AutoRecovery::implst_getJobDescription(eJob);
+ OUString sJob = AutoRecovery::implst_getJobDescription(eJob);
// inform listener, which are registered for any URLs(!)
pListenerForURL = m_lListener.getContainer(sJob);
@@ -2837,10 +2837,10 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
}
//-----------------------------------------------
-::rtl::OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
+OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
{
// describe the current running operation
- ::rtl::OUStringBuffer sFeature(256);
+ OUStringBuffer sFeature(256);
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL));
// Attention: Because "eJob" is used as a flag field the order of checking these
@@ -2908,7 +2908,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
//-----------------------------------------------
css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( sal_Int32 eJob ,
- const ::rtl::OUString& sEventType,
+ const OUString& sEventType,
AutoRecovery::TDocumentInfo* pInfo )
{
css::frame::FeatureStateEvent aEvent;
@@ -2919,15 +2919,15 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(
{
// pack rInfo for transport via UNO
::comphelper::NamedValueCollection aInfo;
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_ID), pInfo->ID );
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL );
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL );
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL );
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL );
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ;
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title);
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames);
- aInfo.put( rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState);
+ aInfo.put( OUString(CFG_ENTRY_PROP_ID), pInfo->ID );
+ aInfo.put( OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL );
+ aInfo.put( OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL );
+ aInfo.put( OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL );
+ aInfo.put( OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL );
+ aInfo.put( OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ;
+ aInfo.put( OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title);
+ aInfo.put( OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames);
+ aInfo.put( OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState);
aEvent.State <<= aInfo.getPropertyValues();
}
@@ -2981,9 +2981,9 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
// documents exists and was saved.
::comphelper::ConfigurationHelper::writeDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_CRASHED),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_CRASHED),
css::uno::makeAny(sal_True),
::comphelper::ConfigurationHelper::E_STANDARD);
@@ -3042,9 +3042,9 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams)
// Reset the configuration hint "we was crashed"!
::comphelper::ConfigurationHelper::writeDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_CRASHED),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_CRASHED),
css::uno::makeAny(sal_False),
::comphelper::ConfigurationHelper::E_STANDARD);
}
@@ -3109,9 +3109,9 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/)
// the on next startup we know what's happen last time
::comphelper::ConfigurationHelper::writeDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_SESSIONDATA),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_SESSIONDATA),
css::uno::makeAny(sal_True),
::comphelper::ConfigurationHelper::E_STANDARD);
@@ -3146,9 +3146,9 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams)
LOG_RECOVERY("... reset config key 'SessionData'")
::comphelper::ConfigurationHelper::writeDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_SESSIONDATA),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_SESSIONDATA),
css::uno::makeAny(sal_False),
::comphelper::ConfigurationHelper::E_STANDARD);
@@ -3169,7 +3169,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
if (rInfo.ID != aParams.m_nWorkingEntryID)
continue;
- ::rtl::OUString sSourceURL;
+ OUString sSourceURL;
// Prefer temp file. It contains the changes against the original document!
if (!rInfo.OldTempURL.isEmpty())
sSourceURL = rInfo.OldTempURL;
@@ -3216,9 +3216,9 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
}
//-----------------------------------------------
-AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUString& sSource ,
- const ::rtl::OUString& sTargetPath,
- const ::rtl::OUString& sTargetName)
+AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource ,
+ const OUString& sTargetPath,
+ const OUString& sTargetName)
{
// create content for the parent folder and call transfer on that content with the source content
// and the destination file name as parameters
@@ -3283,9 +3283,9 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
sal_Bool bSessionData = sal_False;
::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_SESSIONDATA),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_SESSIONDATA),
::comphelper::ConfigurationHelper::E_READONLY) >>= bSessionData;
sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0));
@@ -3302,18 +3302,18 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
case AUTORECOVERY_PROPHANDLE_CRASHED :
aValue = ::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_CRASHED),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_CRASHED),
::comphelper::ConfigurationHelper::E_READONLY);
break;
case AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA :
aValue = ::comphelper::ConfigurationHelper::readDirectKey(
comphelper::getComponentContext(m_xSMGR),
- rtl::OUString(CFG_PACKAGE_RECOVERY),
- rtl::OUString(CFG_PATH_RECOVERYINFO),
- rtl::OUString(CFG_ENTRY_SESSIONDATA),
+ OUString(CFG_PACKAGE_RECOVERY),
+ OUString(CFG_PATH_RECOVERYINFO),
+ OUString(CFG_ENTRY_SESSIONDATA),
::comphelper::ConfigurationHelper::E_READONLY);
break;
}
@@ -3459,7 +3459,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
sal_uInt64 nFreeSpace = SAL_MAX_UINT64;
- ::rtl::OUString sBackupPath(SvtPathOptions().GetBackupPath());
+ OUString sBackupPath(SvtPathOptions().GetBackupPath());
::osl::VolumeInfo aInfo (osl_VolumeInfo_Mask_FreeSpace);
::osl::FileBase::RC aRC = ::osl::Directory::getVolumeInfo(sBackupPath, aInfo);
@@ -3479,13 +3479,13 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
//-----------------------------------------------
void AutoRecovery::impl_showFullDiscError()
{
- rtl::OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
- rtl::OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
+ OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
+ OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
- rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath());
+ OUString sBackupURL(SvtPathOptions().GetBackupPath());
INetURLObject aConverter(sBackupURL);
sal_Unicode aDelimiter;
- rtl::OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter);
+ OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter);
if (sBackupPath.getLength() < 1)
sBackupPath = sBackupURL;
@@ -3621,7 +3621,7 @@ void AutoRecovery::impl_flushALLConfigChanges()
}
//-----------------------------------------------
-void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL)
+void AutoRecovery::st_impl_removeFile(const OUString& sURL)
{
if ( sURL.isEmpty())
return;
@@ -3629,7 +3629,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL)
try
{
::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getComponentContext(m_xSMGR));
- aContent.executeCommand(::rtl::OUString("delete"), css::uno::makeAny(sal_True));
+ aContent.executeCommand(OUString("delete"), css::uno::makeAny(sal_True));
}
catch(const css::uno::Exception&)
{
@@ -3641,13 +3641,13 @@ void AutoRecovery::st_impl_removeLockFile()
{
try
{
- ::rtl::OUString sUserURL;
+ OUString sUserURL;
::utl::Bootstrap::locateUserInstallation( sUserURL );
- ::rtl::OUStringBuffer sLockURLBuf;
+ OUStringBuffer sLockURLBuf;
sLockURLBuf.append (sUserURL);
sLockURLBuf.appendAscii("/.lock");
- ::rtl::OUString sLockURL = sLockURLBuf.makeStringAndClear();
+ OUString sLockURL = sLockURLBuf.makeStringAndClear();
AutoRecovery::st_impl_removeFile(sLockURL);
}
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 6c7b4eede5a8..88515c03f10f 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -244,7 +244,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
@return The implementation name of this class.
*/
-::rtl::OUString SAL_CALL BackingComp::getImplementationName()
+OUString SAL_CALL BackingComp::getImplementationName()
throw(css::uno::RuntimeException)
{
return impl_getStaticImplementationName();
@@ -264,7 +264,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
<br><FALSE/> otherwise.
*/
-sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sServiceName )
+sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceName )
throw(css::uno::RuntimeException)
{
return (
@@ -286,7 +286,7 @@ sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sS
@return A list of all supported uno service names.
*/
-css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames()
throw(css::uno::RuntimeException)
{
return impl_getStaticSupportedServiceNames();
@@ -305,7 +305,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceN
@return The implementation name of this class.
*/
-::rtl::OUString BackingComp::impl_getStaticImplementationName()
+OUString BackingComp::impl_getStaticImplementationName()
{
return IMPLEMENTATIONNAME_STARTMODULE;
}
@@ -323,9 +323,9 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceN
@return A list of all supported uno service names.
*/
-css::uno::Sequence< ::rtl::OUString > BackingComp::impl_getStaticSupportedServiceNames()
+css::uno::Sequence< OUString > BackingComp::impl_getStaticSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > lNames(1);
+ css::uno::Sequence< OUString > lNames(1);
lNames[0] = "com.sun.star.frame.StartModule";
return lNames;
}
@@ -444,12 +444,12 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
// check some required states
if (m_xFrame.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("already attached"),
+ OUString("already attached"),
static_cast< ::cppu::OWeakObject* >(this));
if (!xFrame.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("invalid frame reference"),
+ OUString("invalid frame reference"),
static_cast< ::cppu::OWeakObject* >(this));
if (!m_xWindow.is())
@@ -635,7 +635,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("unexpected source or called twice"),
+ OUString("unexpected source or called twice"),
static_cast< ::cppu::OWeakObject* >(this));
m_xWindow = css::uno::Reference< css::awt::XWindow >();
@@ -726,7 +726,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
throw(css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
- ::rtl::OUString("not supported"),
+ OUString("not supported"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -773,7 +773,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
if (m_xWindow.is())
throw css::uno::Exception(
- ::rtl::OUString("already initialized"),
+ OUString("already initialized"),
static_cast< ::cppu::OWeakObject* >(this));
css::uno::Reference< css::awt::XWindow > xParentWindow;
@@ -784,7 +784,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
)
{
throw css::uno::Exception(
- ::rtl::OUString("wrong or corrupt argument list"),
+ OUString("wrong or corrupt argument list"),
static_cast< ::cppu::OWeakObject* >(this));
}
@@ -795,7 +795,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
if (!m_xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("couldn't create component window"),
+ OUString("couldn't create component window"),
static_cast< ::cppu::OWeakObject* >(this));
// start listening for window disposing
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 4cfa131ae101..fdf245f826e2 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -71,7 +71,7 @@ namespace framework
{
struct LoadRecentFile
{
- rtl::OUString aTargetURL;
+ OUString aTargetURL;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aArgSeq;
};
@@ -126,15 +126,15 @@ namespace framework
void loadImage( const ResId& i_rId, PushButton& i_rButton );
- void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, const std::set<rtl::OUString>& i_rURLS,
+ void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, const std::set<OUString>& i_rURLS,
SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
PushButton& i_rBtn,
MnemonicGenerator& i_rMnemonicGen,
const String& i_rStr = String()
);
- void dispatchURL( const rtl::OUString& i_rURL,
- const rtl::OUString& i_rTarget = rtl::OUString( "_default" ),
+ void dispatchURL( const OUString& i_rURL,
+ const OUString& i_rTarget = OUString( "_default" ),
const com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >& i_xProv = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(),
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >()
);
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 628730fed95a..b46b5c8fff3f 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -155,8 +155,8 @@ DEFINE_INIT_SERVICE ( Desktop,
InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
- ::rtl::OUStringBuffer sUntitledPrefix (256);
- sUntitledPrefix.append (::rtl::OUString( String( FwkResId( STR_UNTITLED_DOCUMENT ))));
+ OUStringBuffer sUntitledPrefix (256);
+ sUntitledPrefix.append (OUString( String( FwkResId( STR_UNTITLED_DOCUMENT ))));
sUntitledPrefix.appendAscii (" ");
::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection ();
@@ -431,7 +431,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra
css::uno::Reference< css::lang::XServiceInfo > xInfo( xListener, css::uno::UNO_QUERY );
if ( xInfo.is() )
{
- ::rtl::OUString sImplementationName = xInfo->getImplementationName();
+ OUString sImplementationName = xInfo->getImplementationName();
// SYCNHRONIZED ->
WriteGuard aWriteLock( m_aLock );
@@ -474,7 +474,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
css::uno::Reference< css::lang::XServiceInfo > xInfo( xListener, css::uno::UNO_QUERY );
if ( xInfo.is() )
{
- ::rtl::OUString sImplementationName = xInfo->getImplementationName();
+ OUString sImplementationName = xInfo->getImplementationName();
// SYCNHRONIZED ->
WriteGuard aWriteLock( m_aLock );
@@ -630,8 +630,8 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
@onerror We return a null reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTargetFrameName,
+css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString& sURL ,
+ const OUString& sTargetFrameName,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException ,
css::lang::IllegalArgumentException ,
@@ -722,7 +722,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
@threadsafe yes
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException )
{
const char UNO_PROTOCOL[] = ".uno:";
@@ -899,7 +899,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator(
}
//*****************************************************************************************************************
-::rtl::OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException )
+OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException )
{
/* SAFE { */
ReadGuard aReadLock( m_aLock );
@@ -908,7 +908,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator(
}
//*****************************************************************************************************************
-void SAL_CALL Desktop::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException )
+void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException )
{
/* SAFE { */
WriteGuard aWriteLock( m_aLock );
@@ -1008,7 +1008,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::rtl::OUString& sTargetFrameName ,
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException )
{
css::uno::Reference< css::frame::XFrame > xTarget;
@@ -1089,7 +1089,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r
// get threadsafe some necessary member which are neccessary for following functionality
/* SAFE { */
aReadLock.lock();
- ::rtl::OUString sOwnName = m_sName;
+ OUString sOwnName = m_sName;
aReadLock.unlock();
/* } SAFE */
@@ -1461,7 +1461,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css
}
//-----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Desktop::getUntitledPrefix()
+OUString SAL_CALL Desktop::getUntitledPrefix()
throw (css::uno::RuntimeException)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1780,7 +1780,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty
css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL), css::beans::PropertyAttribute::TRANSIENT ),
css::beans::Property( DESKTOP_PROPNAME_ISPLUGGED , DESKTOP_PROPHANDLE_ISPLUGGED , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
css::beans::Property( DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT ),
- css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , ::getCppuType((const ::rtl::OUString*)NULL) , css::beans::PropertyAttribute::TRANSIENT ),
+ css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , ::getCppuType((const OUString*)NULL) , css::beans::PropertyAttribute::TRANSIENT ),
};
// Use it to initialize sequence!
const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT );
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 86565ee1383f..40adc0695f5e 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -84,8 +84,8 @@ DispatchHelper::~DispatchHelper()
*/
css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
- const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTargetFrameName ,
+ const OUString& sURL ,
+ const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
throw(css::uno::RuntimeException)
@@ -120,7 +120,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
sal_Int32 nLength = lArguments.getLength();
aArguments.realloc( nLength + 1 );
- aArguments[ nLength ].Name = ::rtl::OUString("SynchronMode");
+ aArguments[ nLength ].Name = OUString("SynchronMode");
aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
css::uno::Any aResult;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index e33e93d5af46..6c6a32aeec67 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -302,8 +302,8 @@ Frame::~Frame()
@onerror We return a null reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sTargetFrameName,
+css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const OUString& sURL ,
+ const OUString& sTargetFrameName,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException ,
css::lang::IllegalArgumentException ,
@@ -524,7 +524,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
if (!xWindow.is())
throw css::uno::RuntimeException(
- ::rtl::OUString("Frame::initialize() called without a valid container window reference."),
+ OUString("Frame::initialize() called without a valid container window reference."),
static_cast< css::frame::XFrame* >(this));
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -532,7 +532,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
if ( m_xContainerWindow.is() )
throw css::uno::RuntimeException(
- ::rtl::OUString("Frame::initialized() is called more then once, which isnt useful nor allowed."),
+ OUString("Frame::initialized() is called more then once, which isnt useful nor allowed."),
static_cast< css::frame::XFrame* >(this));
// Look for rejected calls first!
@@ -679,7 +679,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
@onerror An empty string is returned.
*//*-*****************************************************************************************************/
-::rtl::OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException )
+OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException )
{
/* SAFE { */
ReadGuard aReadLock( m_aLock );
@@ -701,7 +701,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
@onerror We do nothing.
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException )
+void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeException )
{
/* SAFE { */
WriteGuard aWriteLock( m_aLock );
@@ -738,7 +738,7 @@ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::Ru
@return A reference to found or may be new created frame.
@threadsafe yes
*//*-*****************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl::OUString& sTargetFrameName,
+css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString& sTargetFrameName,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException )
{
css::uno::Reference< css::frame::XFrame > xTarget;
@@ -858,7 +858,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
// get threadsafe some necessary member which are neccessary for following functionality
/* SAFE { */
aReadLock.lock();
- ::rtl::OUString sOwnName = m_sName;
+ OUString sOwnName = m_sName;
aReadLock.unlock();
/* } SAFE */
@@ -1676,7 +1676,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::
}
//*****************************************************************************************************************
-::rtl::OUString SAL_CALL Frame::getTitle()
+OUString SAL_CALL Frame::getTitle()
throw (css::uno::RuntimeException)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1691,7 +1691,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::
}
//*****************************************************************************************************************
-void SAL_CALL Frame::setTitle( const ::rtl::OUString& sTitle )
+void SAL_CALL Frame::setTitle( const OUString& sTitle )
throw (css::uno::RuntimeException)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1903,7 +1903,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException )
// If may be later somewhere change the disposed-behaviour of this implementation
// and doesn't throw any DisposedExceptions we must guarantee best matching default values ...
m_eActiveState = E_INACTIVE;
- m_sName = ::rtl::OUString();
+ m_sName = OUString();
m_bIsFrameTop = sal_False;
m_bConnected = sal_False;
m_nExternalLockCount = 0;
@@ -2017,7 +2017,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL ,
- const ::rtl::OUString& sTargetFrameName,
+ const OUString& sTargetFrameName,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException )
{
const char UNO_PROTOCOL[] = ".uno:";
@@ -2544,12 +2544,12 @@ void Frame::impl_initializePropInfo()
css::beans::Property(
FRAME_PROPNAME_TITLE,
FRAME_PROPHANDLE_TITLE,
- ::getCppuType((const ::rtl::OUString*)NULL),
+ ::getCppuType((const OUString*)NULL),
css::beans::PropertyAttribute::TRANSIENT));
}
//*****************************************************************************************************************
-void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
+void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/,
sal_Int32 nHandle ,
const css::uno::Any& aValue )
@@ -2567,7 +2567,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
{
case FRAME_PROPHANDLE_TITLE :
{
- ::rtl::OUString sExternalTitle;
+ OUString sExternalTitle;
aValue >>= sExternalTitle;
setTitle (sExternalTitle);
}
@@ -2611,7 +2611,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
}
//*****************************************************************************************************************
-css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sProperty*/,
+css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/,
sal_Int32 nHandle )
{
/* There is no need to lock any mutex here. Because we share the
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 56f6ac4c4b67..689917006e03 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -136,9 +136,9 @@ static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime)
Time(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds));
}
-static ::rtl::OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
+static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
{
- ::rtl::OStringBuffer aDateTimeString;
+ OStringBuffer aDateTimeString;
aDateTimeString.append((sal_Int32)aDateTime.GetYear());
aDateTimeString.append("-");
if (aDateTime.GetMonth()<10) aDateTimeString.append("0");
@@ -160,12 +160,12 @@ static ::rtl::OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool
return OStringToOUString(aDateTimeString.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
}
-static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTime)
+static sal_Bool _parseDateTime(const OUString& aString, DateTime& aDateTime)
{
// take apart a canonical literal xsd:dateTime string
//CCYY-MM-DDThh:mm:ss(Z)
- ::rtl::OUString aDateTimeString = aString.trim();
+ OUString aDateTimeString = aString.trim();
// check length
if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20)
@@ -174,10 +174,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
sal_Int32 nDateLength = 10;
sal_Int32 nTimeLength = 8;
- ::rtl::OUString aUTCString("Z");
+ OUString aUTCString("Z");
- ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
- ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
+ OUString aDateString = aDateTimeString.copy(0, nDateLength);
+ OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
sal_Int32 nIndex = 0;
sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32();
@@ -198,7 +198,7 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
return sal_True;
}
-static ::rtl::OUString _getCurrentDateString()
+static OUString _getCurrentDateString()
{
return _makeDateTimeString(DateTime( DateTime::SYSTEM));
}
@@ -212,7 +212,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
try
{
- ::rtl::OUString aBaseInstallPath;
+ OUString aBaseInstallPath;
Bootstrap::PathStatus aBaseLocateResult =
Bootstrap::locateBaseInstallation(aBaseInstallPath);
if (aBaseLocateResult != Bootstrap::PATH_EXISTS)
@@ -224,40 +224,40 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
// determine the filename of the license to show
OUString aLangString( Application::GetSettings().GetUILanguageTag().getBcp47());
#if defined(WNT)
- ::rtl::OUString aLicensePath =
- aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
- + ::rtl::OUString::createFromAscii(szWNTLicenseName)
- + ::rtl::OUString("_")
+ OUString aLicensePath =
+ aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+ + OUString::createFromAscii(szWNTLicenseName)
+ + OUString("_")
+ aLangString
- + ::rtl::OUString::createFromAscii(szWNTLicenseExt);
+ + OUString::createFromAscii(szWNTLicenseExt);
#else
- ::rtl::OUString aLicensePath =
- aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
- + ::rtl::OUString::createFromAscii(szUNXLicenseName)
- + ::rtl::OUString("_")
+ OUString aLicensePath =
+ aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+ + OUString::createFromAscii(szUNXLicenseName)
+ + OUString("_")
+ aLangString
- + ::rtl::OUString::createFromAscii(szUNXLicenseExt);
+ + OUString::createFromAscii(szUNXLicenseExt);
#endif
// check if we need to show the license at all
// open org.openoffice.Setup/Office/ooLicenseAcceptDate
- ::rtl::OUString sAccessSrvc("com.sun.star.configuration.ConfigurationUpdateAccess");
+ OUString sAccessSrvc("com.sun.star.configuration.ConfigurationUpdateAccess");
// get configuration provider
Reference< XMultiServiceFactory > theConfigProvider = theDefaultProvider::get( m_xContext );
Sequence< Any > theArgs(1);
NamedValue v;
- v.Name = ::rtl::OUString("NodePath");
- v.Value <<= ::rtl::OUString("org.openoffice.Setup/Office");
+ v.Name = OUString("NodePath");
+ v.Value <<= OUString("org.openoffice.Setup/Office");
theArgs[0] <<= v;
Reference< XPropertySet > pset = Reference< XPropertySet >(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
// if we find a date there, compare it to baseinstall license date
- ::rtl::OUString aAcceptDate;
- if (pset->getPropertyValue(::rtl::OUString("ooLicenseAcceptDate")) >>= aAcceptDate)
+ OUString aAcceptDate;
+ if (pset->getPropertyValue(OUString("ooLicenseAcceptDate")) >>= aAcceptDate)
{
// get LicenseFileDate from base install
- ::rtl::OUString aLicenseURL = aLicensePath;
+ OUString aLicenseURL = aLicensePath;
DirectoryItem aDirItem;
if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None)
return makeAny(sal_False);
@@ -289,7 +289,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
// write org.openoffice.Setup/ooLicenseAcceptDate
aAcceptDate = _getCurrentDateString();
- pset->setPropertyValue(::rtl::OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate));
+ pset->setPropertyValue(OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate));
Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
// enable quickstarter
@@ -340,7 +340,7 @@ void SAL_CALL License::removeCloseListener(const css::uno::Reference< css::util:
// License Dialog
//************************************************************************
-LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResMgr) :
+LicenseDialog::LicenseDialog(const OUString & aLicensePath, ResMgr *pResMgr) :
ModalDialog(NULL, ResId(DLG_LICENSE, *pResMgr)),
aLicenseML(this, ResId(ML_LICENSE, *pResMgr)),
aInfo1FT(this, ResId(FT_INFO1, *pResMgr)),
@@ -372,7 +372,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
aPBPageDown.SetStyle( aStyle );
String aText = aInfo2FT.GetText();
- aText.SearchAndReplaceAll( rtl::OUString("%PAGEDOWN"), aPBPageDown.GetText() );
+ aText.SearchAndReplaceAll( OUString("%PAGEDOWN"), aPBPageDown.GetText() );
aInfo2FT.SetText( aText );
aPBDecline.SetText( aStrNotAccept );
@@ -397,7 +397,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
{
nPosition += nBytesRead;
}
- ::rtl::OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8,
+ OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8,
OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE);
delete[] pBuffer;
aLicenseML.SetText(aLicenseString);
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 6a8a8c147d75..b057f2ceafd1 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(
OUString& rUrl = rSeq[i];
INetContentType eType = INetContentTypes::GetContentTypeFromURL( rUrl );
- rtl::OUString aType( INetContentTypes::GetContentType( eType ) );
+ OUString aType( INetContentTypes::GetContentType( eType ) );
if (!aType.isEmpty())
{
rUrl = aType;
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 6afad5741284..6c18d13627c6 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -42,7 +42,7 @@ namespace framework
static const char CFGPATH_FACTORIES[] = "/org.openoffice.Setup/Office/Factories";
static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier";
-rtl::OUString ModuleManager::impl_getStaticImplementationName() {
+OUString ModuleManager::impl_getStaticImplementationName() {
return IMPLEMENTATIONNAME_MODULEMANAGER;
}
@@ -55,9 +55,9 @@ ModuleManager::impl_createFactory(
impl_getSupportedServiceNames());
}
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
ModuleManager::impl_getSupportedServiceNames() {
- css::uno::Sequence< rtl::OUString > s(1);
+ css::uno::Sequence< OUString > s(1);
s[0] = "com.sun.star.frame.ModuleManager";
return s;
}
@@ -80,16 +80,16 @@ ModuleManager::~ModuleManager()
m_xCFG.clear();
}
-rtl::OUString ModuleManager::getImplementationName()
+OUString ModuleManager::getImplementationName()
throw (css::uno::RuntimeException)
{
return impl_getStaticImplementationName();
}
-sal_Bool ModuleManager::supportsService(rtl::OUString const & ServiceName)
+sal_Bool ModuleManager::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException)
{
- css::uno::Sequence< rtl::OUString > s(getSupportedServiceNames());
+ css::uno::Sequence< OUString > s(getSupportedServiceNames());
for (sal_Int32 i = 0; i != s.getLength(); ++i) {
if (s[i] == ServiceName) {
return true;
@@ -98,13 +98,13 @@ sal_Bool ModuleManager::supportsService(rtl::OUString const & ServiceName)
return false;
}
-css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
+css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
return impl_getSupportedServiceNames();
}
-::rtl::OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
+OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
throw(css::lang::IllegalArgumentException,
css::frame::UnknownModuleException,
css::uno::RuntimeException )
@@ -123,7 +123,7 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
)
{
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("Given module is not a frame nor a window, controller or model."),
+ OUString("Given module is not a frame nor a window, controller or model."),
static_cast< ::cppu::OWeakObject* >(this),
1);
}
@@ -141,7 +141,7 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
// No fallbacks to higher components are allowed !
// Note : A frame provides access to module components only ... but it's not a module by himself.
- ::rtl::OUString sModule;
+ OUString sModule;
if (xModel.is())
sModule = implts_identify(xModel);
else if (xController.is())
@@ -151,13 +151,13 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
if (sModule.isEmpty())
throw css::frame::UnknownModuleException(
- ::rtl::OUString("Cant find suitable module for the given component."),
+ OUString("Cant find suitable module for the given component."),
static_cast< ::cppu::OWeakObject* >(this));
return sModule;
}
-void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
+void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
const css::uno::Any& aValue)
throw (css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
@@ -168,7 +168,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
if (lProps.empty() )
{
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("No properties given to replace part of module."),
+ OUString("No properties given to replace part of module."),
static_cast< cppu::OWeakObject * >(this),
2);
}
@@ -186,7 +186,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
// we can close it without a flush ... and our read data wont be affected .-)
css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig(
comphelper::getComponentContext(xSMGR),
- rtl::OUString(CFGPATH_FACTORIES),
+ OUString(CFGPATH_FACTORIES),
::comphelper::ConfigurationHelper::E_STANDARD);
css::uno::Reference< css::container::XNameAccess > xModules (xCfg, css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::container::XNameReplace > xModule ;
@@ -195,7 +195,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
if (!xModule.is())
{
throw css::uno::RuntimeException(
- ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."),
+ OUString("Was not able to get write access to the requested module entry inside configuration."),
static_cast< cppu::OWeakObject * >(this));
}
@@ -204,7 +204,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
pProp != lProps.end() ;
++pProp )
{
- const ::rtl::OUString& sPropName = pProp->first;
+ const OUString& sPropName = pProp->first;
const css::uno::Any& aPropValue = pProp->second;
// let "NoSuchElementException" out ! We support the same API ...
@@ -215,7 +215,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
::comphelper::ConfigurationHelper::flush(xCfg);
}
-css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
+css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
throw(css::container::NoSuchElementException,
css::lang::WrappedTargetException ,
css::uno::RuntimeException )
@@ -227,34 +227,34 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
if (!xModule.is())
{
throw css::uno::RuntimeException(
- ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."),
+ OUString("Was not able to get write access to the requested module entry inside configuration."),
static_cast< cppu::OWeakObject * >(this));
}
// convert it to seq< PropertyValue >
- const css::uno::Sequence< ::rtl::OUString > lPropNames = xModule->getElementNames();
+ const css::uno::Sequence< OUString > lPropNames = xModule->getElementNames();
::comphelper::SequenceAsHashMap lProps ;
sal_Int32 c = lPropNames.getLength();
sal_Int32 i = 0;
- lProps[rtl::OUString(MODULEPROP_IDENTIFIER)] <<= sName;
+ lProps[OUString(MODULEPROP_IDENTIFIER)] <<= sName;
for (i=0; i<c; ++i)
{
- const ::rtl::OUString& sPropName = lPropNames[i];
+ const OUString& sPropName = lPropNames[i];
lProps[sPropName] = xModule->getByName(sPropName);
}
return css::uno::makeAny(lProps.getAsConstPropertyValueList());
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL ModuleManager::getElementNames()
+css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
throw(css::uno::RuntimeException)
{
css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig();
return xCFG->getElementNames();
}
-sal_Bool SAL_CALL ModuleManager::hasByName(const ::rtl::OUString& sName)
+sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName)
throw(css::uno::RuntimeException)
{
css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig();
@@ -274,7 +274,7 @@ sal_Bool SAL_CALL ModuleManager::hasElements()
return xCFG->hasElements();
}
-css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const ::rtl::OUString&)
+css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const OUString&)
throw(css::uno::RuntimeException)
{
return css::uno::Reference< css::container::XEnumeration >();
@@ -284,7 +284,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
throw(css::uno::RuntimeException)
{
::comphelper::SequenceAsHashMap lSearchProps (lProperties);
- css::uno::Sequence< ::rtl::OUString > lModules = getElementNames();
+ css::uno::Sequence< OUString > lModules = getElementNames();
sal_Int32 c = lModules.getLength();
sal_Int32 i = 0;
::comphelper::SequenceAsVector< css::uno::Any > lResult ;
@@ -293,7 +293,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
{
try
{
- const ::rtl::OUString& sModule = lModules[i];
+ const OUString& sModule = lModules[i];
::comphelper::SequenceAsHashMap lModuleProps = getByName(sModule);
if (lModuleProps.match(lSearchProps))
@@ -325,7 +325,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
{
xCfg = ::comphelper::ConfigurationHelper::openConfig(
comphelper::getComponentContext(xSMGR),
- rtl::OUString(CFGPATH_FACTORIES),
+ OUString(CFGPATH_FACTORIES),
::comphelper::ConfigurationHelper::E_READONLY);
}
catch(const css::uno::RuntimeException&)
@@ -344,7 +344,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
// <- SAFE ----------------------------------
}
-::rtl::OUString ModuleManager::implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent)
+OUString ModuleManager::implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent)
{
// Search for an optional (!) interface XModule first.
// Its used to overrule an existing service name. Used e.g. by our database form designer
@@ -357,10 +357,10 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
// comparing service names with configured entries ...
css::uno::Reference< css::lang::XServiceInfo > xInfo(xComponent, css::uno::UNO_QUERY);
if (!xInfo.is())
- return ::rtl::OUString();
+ return OUString();
- const css::uno::Sequence< ::rtl::OUString > lKnownModules = getElementNames();
- const ::rtl::OUString* pKnownModules = lKnownModules.getConstArray();
+ const css::uno::Sequence< OUString > lKnownModules = getElementNames();
+ const OUString* pKnownModules = lKnownModules.getConstArray();
sal_Int32 c = lKnownModules.getLength();
sal_Int32 i = 0;
@@ -370,7 +370,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
return pKnownModules[i];
}
- return ::rtl::OUString();
+ return OUString();
}
} // namespace framework
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index df938341f5c8..98ab2c0e705f 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -63,8 +63,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-using ::rtl::OUString;
-using ::rtl::OString;
namespace framework{
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 87ad8b5b87a3..2592bcc94445 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -286,14 +286,14 @@ void TabWindowService::impl_initializePropInfo()
impl_addPropertyInfo(
css::beans::Property(
- rtl::OUString("Window"),
+ OUString("Window"),
TABWINDOWSERVICE_PROPHANDLE_WINDOW,
::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL),
css::beans::PropertyAttribute::TRANSIENT));
}
//*****************************************************************************************************************
-void SAL_CALL TabWindowService::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
+void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/,
sal_Int32 /*nHandle */,
const css::uno::Any& /*aValue */)
@@ -301,7 +301,7 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const ::rtl::OUString& /*s
}
//*****************************************************************************************************************
-css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const ::rtl::OUString& /*sProperty*/,
+css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/,
sal_Int32 nHandle )
{
/* There is no need to lock any mutex here. Because we share the
@@ -404,7 +404,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
)
{
throw css::lang::IndexOutOfBoundsException(
- ::rtl::OUString("Tab index out of bounds."),
+ OUString("Tab index out of bounds."),
css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
}
}
@@ -418,7 +418,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID);
if (pIt == m_lTabPageInfos.end ())
throw css::lang::IndexOutOfBoundsException(
- ::rtl::OUString("Tab index out of bounds."),
+ OUString("Tab index out of bounds."),
css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
return pIt;
}
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 6c0e37ca0525..ec25e42ffe73 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -50,9 +50,9 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
}
// ::com::sun::star::util::XStringAbbreviation:
-::rtl::OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const ::rtl::OUString & aString) throw (css::uno::RuntimeException)
+OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException)
{
- ::rtl::OUString aResult( aString );
+ OUString aResult( aString );
if ( xStringWidth.is() )
{
// Use INetURLObject to abbreviate URLs
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 99b2af7fe7e9..13cdf557ee97 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -83,7 +83,7 @@ namespace
// Don't add last segment as it is the name!
--nCount;
- rtl::OUStringBuffer aPath;
+ OUStringBuffer aPath;
for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
{
aPath.append( sal_Unicode( '/' ));
@@ -111,8 +111,8 @@ namespace
if ( _bUseIntern )
_rURL.Complete = _rURL.Complete.intern();
- _rParser.SetMark ( ::rtl::OUString() );
- _rParser.SetParam( ::rtl::OUString() );
+ _rParser.SetMark ( OUString() );
+ _rParser.SetParam( OUString() );
_rURL.Main = _rParser.GetMainURL( INetURLObject::NO_DECODE );
}
@@ -130,7 +130,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
}
// Try to extract the protocol
sal_Int32 nURLIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
- ::rtl::OUString aProtocol;
+ OUString aProtocol;
if ( nURLIndex > 1 )
{
aProtocol = aURL.Complete.copy( 0, nURLIndex+1 );
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
// XURLTransformer
//*****************************************************************************************************************
sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL ,
- const ::rtl::OUString& sSmartProtocol ) throw( RuntimeException )
+ const OUString& sSmartProtocol ) throw( RuntimeException )
{
// Safe impossible cases.
if (( &aURL == NULL ) ||
@@ -202,7 +202,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL
{
// Try to extract the protocol
sal_Int32 nIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
- ::rtl::OUString aProtocol;
+ OUString aProtocol;
if ( nIndex > 1 )
{
aProtocol = aURL.Complete.copy( 0, nIndex+1 );
@@ -240,7 +240,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
if ( INetURLObject::CompareProtocolScheme( aURL.Protocol ) != INET_PROT_NOT_VALID )
{
- ::rtl::OUStringBuffer aCompletePath( aURL.Path );
+ OUStringBuffer aCompletePath( aURL.Path );
// Concat the name if it is provided, just support a final slash
if ( !aURL.Name.isEmpty() )
@@ -279,7 +279,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
else if ( !aURL.Protocol.isEmpty() )
{
// Minimal support for unknown protocols
- ::rtl::OUStringBuffer aBuffer( aURL.Protocol );
+ OUStringBuffer aBuffer( aURL.Protocol );
aBuffer.append( aURL.Path );
aURL.Complete = aBuffer.makeStringAndClear();
aURL.Main = aURL.Complete;
@@ -292,7 +292,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
//*****************************************************************************************************************
// XURLTransformer
//*****************************************************************************************************************
-::rtl::OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL ,
+OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL ,
sal_Bool bWithPassword ) throw( RuntimeException )
{
// Safe impossible cases.
@@ -301,7 +301,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
(( bWithPassword != sal_True ) &&
( bWithPassword != sal_False ) ) )
{
- return ::rtl::OUString();
+ return OUString();
}
// Check given URL
@@ -312,18 +312,18 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
if ( !bWithPassword && !aTestURL.Password.isEmpty() )
{
// Exchange password text with other placeholder string
- aTestURL.Password = ::rtl::OUString("<******>");
+ aTestURL.Password = OUString("<******>");
assemble( aTestURL );
}
// Convert internal URLs to "praesentation"-URLs!
- rtl::OUString sPraesentationURL;
+ OUString sPraesentationURL;
INetURLObject::translateToExternal( aTestURL.Complete, sPraesentationURL, INetURLObject::DECODE_UNAMBIGUOUS );
return sPraesentationURL;
}
else
- return ::rtl::OUString();
+ return OUString();
}
//_________________________________________________________________________________________________________________
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 304dc2c1f841..725fda901b59 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -40,7 +40,6 @@
// Defines
//_________________________________________________________________________________________________________________
-using ::rtl::OUString;
using namespace com::sun::star;
namespace framework
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 258eec7dee2c..4f9d4c017300 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -35,7 +35,6 @@
// Defines
//_________________________________________________________________________________________________________________
-using ::rtl::OUString;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 0912b7bdcc1d..2f0eb7175054 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
//_________________________________________________________________________________________________________________
// Namespace
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 63efeda5dfb1..33b7b6ced705 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -34,13 +34,13 @@ GraphicNameAccess::~GraphicNameAccess()
{
}
-void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Reference< graphic::XGraphic >& rElement )
+void GraphicNameAccess::addElement( const OUString& rName, const uno::Reference< graphic::XGraphic >& rElement )
{
m_aNameToElementMap.insert( NameGraphicHashMap::value_type( rName, rElement ));
}
// XNameAccess
-uno::Any SAL_CALL GraphicNameAccess::getByName( const ::rtl::OUString& aName )
+uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName )
throw( container::NoSuchElementException,
lang::WrappedTargetException,
uno::RuntimeException)
@@ -52,12 +52,12 @@ throw( container::NoSuchElementException,
throw container::NoSuchElementException();
}
-uno::Sequence< ::rtl::OUString > SAL_CALL GraphicNameAccess::getElementNames()
+uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames()
throw(::com::sun::star::uno::RuntimeException)
{
if ( m_aSeq.getLength() == 0 )
{
- uno::Sequence< rtl::OUString > aSeq( m_aNameToElementMap.size() );
+ uno::Sequence< OUString > aSeq( m_aNameToElementMap.size() );
NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.begin();
sal_Int32 i( 0);
while ( pIter != m_aNameToElementMap.end())
@@ -71,7 +71,7 @@ throw(::com::sun::star::uno::RuntimeException)
return m_aSeq;
}
-sal_Bool SAL_CALL GraphicNameAccess::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException)
{
NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName );
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 5d77a3cbfc46..2a382526c408 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -49,7 +49,6 @@
// namespaces
//_________________________________________________________________________________________________________________
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::XInterface;
using ::com::sun::star::uno::Exception;
@@ -139,13 +138,13 @@ throw (::com::sun::star::uno::RuntimeException)
m_pImpl->reset();
}
-Sequence< ::rtl::OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType )
+Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType )
throw (::com::sun::star::uno::RuntimeException)
{
return m_pImpl->getAllImageNames( nImageType );
}
-::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
+::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
return m_pImpl->hasImage(nImageType,aCommandURL);
@@ -153,7 +152,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages(
::sal_Int16 nImageType,
- const Sequence< ::rtl::OUString >& aCommandURLSequence )
+ const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
return m_pImpl->getImages(nImageType,aCommandURLSequence);
@@ -161,7 +160,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:
void SAL_CALL ImageManager::replaceImages(
::sal_Int16 nImageType,
- const Sequence< ::rtl::OUString >& aCommandURLSequence,
+ const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
@@ -170,7 +169,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
}
-void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence )
+void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
::com::sun::star::uno::RuntimeException)
@@ -178,7 +177,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
m_pImpl->removeImages(nImageType,aCommandURLSequence);
}
-void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
throw ( ::com::sun::star::container::ElementExistException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index c50fe91db2a4..78d5156ec752 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -49,7 +49,6 @@
#include <rtl/instance.hxx>
#include <svtools/miscopt.hxx>
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::XInterface;
using ::com::sun::star::uno::Exception;
@@ -121,13 +120,13 @@ static GlobalImageList* getGlobalImageList( const uno::Reference< uno::XComponen
return pGlobalImageList;
}
-static rtl::OUString getCanonicalName( const rtl::OUString& rFileName )
+static OUString getCanonicalName( const OUString& rFileName )
{
bool bRemoveSlash( true );
sal_Int32 nLength = rFileName.getLength();
const sal_Unicode* pString = rFileName.getStr();
- rtl::OUStringBuffer aBuf( nLength );
+ OUStringBuffer aBuf( nLength );
for ( sal_Int32 i = 0; i < nLength; i++ )
{
const sal_Unicode c = pString[i];
@@ -152,7 +151,7 @@ static rtl::OUString getCanonicalName( const rtl::OUString& rFileName )
//_________________________________________________________________________________________________________________
-CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::OUString& aModuleIdentifier ) :
+CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) :
m_bVectorInit( sal_False ),
m_aModuleIdentifier( aModuleIdentifier ),
m_xContext( rxContext ),
@@ -174,7 +173,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
if ( !m_bVectorInit )
{
- const rtl::OUString aCommandImageList( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST );
+ const OUString aCommandImageList( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST );
Sequence< OUString > aCmdImageSeq;
uno::Reference< XNameAccess > xCmdDesc = frame::UICommandDescription::create( m_xContext );
@@ -210,7 +209,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
}
// We have to map commands which uses special characters like '/',':','?','\','<'.'>','|'
- String aExt = rtl::OUString(".png");
+ String aExt = OUString(".png");
m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
m_aImageNameVector.resize( aCmdImageSeq.getLength() );
@@ -281,17 +280,17 @@ ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType )
return m_pImageList[nImageType];
}
-std::vector< ::rtl::OUString >& CmdImageList::impl_getImageNameVector()
+std::vector< OUString >& CmdImageList::impl_getImageNameVector()
{
return m_aImageNameVector;
}
-std::vector< rtl::OUString >& CmdImageList::impl_getImageCommandNameVector()
+std::vector< OUString >& CmdImageList::impl_getImageCommandNameVector()
{
return m_aImageCommandNameVector;
}
-Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL )
{
impl_fillCommandToImageNameMap();
CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
@@ -304,7 +303,7 @@ Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUS
return Image();
}
-bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCommandURL )
+bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const OUString& rCommandURL )
{
impl_fillCommandToImageNameMap();
CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL );
@@ -314,12 +313,12 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCom
return false;
}
-::std::vector< rtl::OUString >& CmdImageList::getImageNames()
+::std::vector< OUString >& CmdImageList::getImageNames()
{
return impl_getImageNameVector();
}
-::std::vector< rtl::OUString >& CmdImageList::getImageCommandNames()
+::std::vector< OUString >& CmdImageList::getImageCommandNames()
{
return impl_getImageCommandNameVector();
}
@@ -327,7 +326,7 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCom
//_________________________________________________________________________________________________________________
GlobalImageList::GlobalImageList( const uno::Reference< uno::XComponentContext >& rxContext ) :
- CmdImageList( rxContext, rtl::OUString() ),
+ CmdImageList( rxContext, OUString() ),
m_nRefCount( 0 )
{
}
@@ -336,25 +335,25 @@ GlobalImageList::~GlobalImageList()
{
}
-Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL )
{
osl::MutexGuard guard( getGlobalImageListMutex() );
return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL );
}
-bool GlobalImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL )
+bool GlobalImageList::hasImage( sal_Int16 nImageType, const OUString& rCommandURL )
{
osl::MutexGuard guard( getGlobalImageListMutex() );
return CmdImageList::hasImage( nImageType, rCommandURL );
}
-::std::vector< rtl::OUString >& GlobalImageList::getImageNames()
+::std::vector< OUString >& GlobalImageList::getImageNames()
{
osl::MutexGuard guard( getGlobalImageListMutex() );
return impl_getImageNameVector();
}
-::std::vector< rtl::OUString >& GlobalImageList::getImageCommandNames()
+::std::vector< OUString >& GlobalImageList::getImageCommandNames()
{
osl::MutexGuard guard( getGlobalImageListMutex() );
return impl_getImageCommandNameVector();
@@ -478,7 +477,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
{
try
{
- uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
+ uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
ElementModes::READ );
uno::Reference< XInputStream > xInputStream = xStream->getInputStream();
@@ -500,7 +499,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
}
uno::Reference< XStream > xBitmapStream = xUserBitmapsStorage->openStreamElement(
- rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
+ OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
ElementModes::READ );
if ( xBitmapStream.is() )
@@ -575,17 +574,17 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
pList->pImageItemList->push_back( pItem );
}
- pList->aURL = rtl::OUString("Bitmaps/");
- pList->aURL += rtl::OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]);
+ pList->aURL = OUString("Bitmaps/");
+ pList->aURL += OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]);
uno::Reference< XTransactedObject > xTransaction;
uno::Reference< XOutputStream > xOutputStream;
- uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
+ uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ),
ElementModes::WRITE|ElementModes::TRUNCATE );
if ( xStream.is() )
{
uno::Reference< XStream > xBitmapStream =
- xUserBitmapsStorage->openStreamElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
+ xUserBitmapsStorage->openStreamElement( OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ),
ElementModes::WRITE|ElementModes::TRUNCATE );
if ( xBitmapStream.is() )
{
@@ -620,7 +619,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
// the NoSuchElementException as it can be possible that there is no stream at all!
try
{
- xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
+ xUserImageStorage->removeElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
}
catch ( const ::com::sun::star::container::NoSuchElementException& )
{
@@ -628,7 +627,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
try
{
- xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
+ xUserBitmapsStorage->removeElement( OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
}
catch ( const ::com::sun::star::container::NoSuchElementException& )
{
@@ -776,7 +775,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
if ( xPropSet.is() )
{
long nOpenMode = 0;
- if ( xPropSet->getPropertyValue( rtl::OUString( "OpenMode" )) >>= nOpenMode )
+ if ( xPropSet->getPropertyValue( OUString( "OpenMode" )) >>= nOpenMode )
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
}
}
@@ -805,7 +804,7 @@ throw (::com::sun::star::uno::RuntimeException)
ImageList* pImageList = implts_getUserImageList( ImageType(i));
pImageList->GetImageNames( aUserImageNames );
- Sequence< rtl::OUString > aRemoveList( aUserImageNames.size() );
+ Sequence< OUString > aRemoveList( aUserImageNames.size() );
const sal_uInt32 nCount = aUserImageNames.size();
for ( sal_uInt32 j = 0; j < nCount; j++ )
aRemoveList[j] = aUserImageNames[j];
@@ -818,7 +817,7 @@ throw (::com::sun::star::uno::RuntimeException)
m_bModified = sal_True;
}
-Sequence< ::rtl::OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
+Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
throw (::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
@@ -863,7 +862,7 @@ throw (::com::sun::star::uno::RuntimeException)
return aImageNameSeq;
}
-::sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
+::sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
@@ -896,7 +895,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages(
::sal_Int16 nImageType,
- const Sequence< ::rtl::OUString >& aCommandURLSequence )
+ const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
ResetableGuard aLock( m_aLock );
@@ -910,7 +909,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:
Sequence< uno::Reference< XGraphic > > aGraphSeq( aCommandURLSequence.getLength() );
- const rtl::OUString* aStrArray = aCommandURLSequence.getConstArray();
+ const OUString* aStrArray = aCommandURLSequence.getConstArray();
sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType );
rtl::Reference< GlobalImageList > rGlobalImageList;
@@ -944,7 +943,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:
void ImageManagerImpl::replaceImages(
::sal_Int16 nImageType,
- const Sequence< ::rtl::OUString >& aCommandURLSequence,
+ const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
@@ -1028,7 +1027,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
}
}
-void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence )
+void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
::com::sun::star::uno::RuntimeException)
@@ -1132,7 +1131,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
}
}
-void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
throw ( ::com::sun::star::container::ElementExistException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
@@ -1153,7 +1152,7 @@ throw ( ::com::sun::star::uno::Exception,
throw DisposedException();
CommandMap aOldUserCmdImageSet;
- std::vector< rtl::OUString > aNewUserCmdImageSet;
+ std::vector< OUString > aNewUserCmdImageSet;
if ( m_bModified )
{
@@ -1161,7 +1160,7 @@ throw ( ::com::sun::star::uno::Exception,
{
if ( !m_bDisposed && m_bUserImageListModified[i] )
{
- std::vector< rtl::OUString > aOldUserCmdImageVector;
+ std::vector< OUString > aOldUserCmdImageVector;
ImageList* pImageList = implts_getUserImageList( (ImageType)i );
pImageList->GetImageNames( aOldUserCmdImageVector );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index a1416b00f84e..81bd48609543 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -60,28 +60,28 @@ namespace framework
{
public:
CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& aModuleIdentifier );
+ const OUString& aModuleIdentifier );
virtual ~CmdImageList();
- virtual Image getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
- virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
- virtual ::std::vector< rtl::OUString >& getImageNames();
- virtual ::std::vector< rtl::OUString >& getImageCommandNames();
+ virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL );
+ virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL );
+ virtual ::std::vector< OUString >& getImageNames();
+ virtual ::std::vector< OUString >& getImageCommandNames();
protected:
void impl_fillCommandToImageNameMap();
ImageList* impl_getImageList( sal_Int16 nImageType );
- std::vector< ::rtl::OUString >& impl_getImageNameVector();
- std::vector< ::rtl::OUString >& impl_getImageCommandNameVector();
+ std::vector< OUString >& impl_getImageNameVector();
+ std::vector< OUString >& impl_getImageCommandNameVector();
private:
sal_Bool m_bVectorInit;
- rtl::OUString m_aModuleIdentifier;
+ OUString m_aModuleIdentifier;
ImageList* m_pImageList[ImageType_COUNT];
CommandToImageNameMap m_aCommandToImageNameMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
- ::std::vector< rtl::OUString > m_aImageNameVector;
- ::std::vector< rtl::OUString > m_aImageCommandNameVector;
+ ::std::vector< OUString > m_aImageNameVector;
+ ::std::vector< OUString > m_aImageCommandNameVector;
sal_Int16 m_nSymbolsStyle;
};
@@ -91,10 +91,10 @@ namespace framework
GlobalImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~GlobalImageList();
- virtual Image getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
- virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL );
- virtual ::std::vector< rtl::OUString >& getImageNames();
- virtual ::std::vector< rtl::OUString >& getImageCommandNames();
+ virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL );
+ virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL );
+ virtual ::std::vector< OUString >& getImageNames();
+ virtual ::std::vector< OUString >& getImageCommandNames();
// Reference
virtual oslInterlockedCount SAL_CALL acquire();
@@ -120,12 +120,12 @@ namespace framework
// XImageManager
void reset() throw (::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Sequence< ::rtl::OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
- ::sal_Bool hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
- void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException);
+ ::sal_Bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
+ void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
// XUIConfiguration
void addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
@@ -140,10 +140,10 @@ namespace framework
void clear();
- typedef boost::unordered_map< rtl::OUString,
+ typedef boost::unordered_map< OUString,
sal_Bool,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > ImageNameMap;
+ OUStringHash,
+ ::std::equal_to< OUString > > ImageNameMap;
enum Layer
{
@@ -183,9 +183,9 @@ namespace framework
::cppu::OWeakObject* m_pOwner;
rtl::Reference< GlobalImageList > m_pGlobalImageList;
CmdImageList* m_pDefaultImageList;
- rtl::OUString m_aXMLPostfix;
- rtl::OUString m_aModuleIdentifier;
- rtl::OUString m_aResourceString;
+ OUString m_aXMLPostfix;
+ OUString m_aModuleIdentifier;
+ OUString m_aResourceString;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
ImageList* m_pUserImageList[ImageType_COUNT];
bool m_bUserImageListModified[ImageType_COUNT];
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 6d5fc8226bb9..1125c547100d 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -53,7 +53,6 @@
// namespaces
//_________________________________________________________________________________________________________________
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::XInterface;
using ::com::sun::star::uno::Exception;
@@ -112,13 +111,13 @@ throw (::com::sun::star::uno::RuntimeException)
m_pImpl->reset();
}
-Sequence< ::rtl::OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType )
+Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType )
throw (::com::sun::star::uno::RuntimeException)
{
return m_pImpl->getAllImageNames( nImageType );
}
-::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL )
+::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
return m_pImpl->hasImage(nImageType,aCommandURL);
@@ -126,7 +125,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages(
::sal_Int16 nImageType,
- const Sequence< ::rtl::OUString >& aCommandURLSequence )
+ const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
RTL_LOGFILE_CONTEXT( aLog, "framework: ModuleImageManager::getImages" );
@@ -135,7 +134,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:
void SAL_CALL ModuleImageManager::replaceImages(
::sal_Int16 nImageType,
- const Sequence< ::rtl::OUString >& aCommandURLSequence,
+ const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
@@ -144,7 +143,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
}
-void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence )
+void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
throw ( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
::com::sun::star::uno::RuntimeException)
@@ -152,7 +151,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
m_pImpl->removeImages(nImageType,aCommandURLSequence);
}
-void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
+void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
throw ( ::com::sun::star::container::ElementExistException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::IllegalAccessException,
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 8fe2b042d7d4..f95021c4e38b 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -45,7 +45,6 @@
// namespaces
//_________________________________________________________________________________________________________________
-using rtl::OUString;
using namespace com::sun::star::uno;
using namespace com::sun::star::io;
using namespace com::sun::star::embed;
@@ -110,7 +109,7 @@ static const char RESOURCEURL_PREFIX[] = "private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_";
-static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL )
+static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) &&
@@ -132,7 +131,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL
return UIElementType::UNKNOWN;
}
-static OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
+static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
@@ -166,7 +165,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme
if ( pDataSettings )
{
// Retrieve user interface name from XPropertySet interface
- rtl::OUString aUIName;
+ OUString aUIName;
Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
if ( xPropSet.is() )
{
@@ -204,7 +203,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme
if ( pDataSettings )
{
// Retrieve user interface name from XPropertySet interface
- rtl::OUString aUIName;
+ OUString aUIName;
Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
if ( xPropSet.is() )
{
@@ -237,7 +236,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
if ( xElementTypeStorage.is() )
{
- rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
+ OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
aBuf.appendAscii( RESOURCEURL_PREFIX );
aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] );
aBuf.appendAscii( "/" );
@@ -384,7 +383,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer() ), UNO_QUERY );
}
-ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
+ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
{
// preload list of element types on demand
impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
@@ -811,12 +810,12 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a
if ( !m_bInitialized )
{
::comphelper::SequenceAsHashMap lArgs(aArguments);
- m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleIdentifier"), ::rtl::OUString());
- m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleShortName"), ::rtl::OUString());
+ m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString());
+ m_aModuleShortName = lArgs.getUnpackedValueOrDefault(OUString("ModuleShortName"), OUString());
for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
{
- rtl::OUString aResourceType;
+ OUString aResourceType;
if ( i == ::com::sun::star::ui::UIElementType::MENUBAR )
aResourceType = PresetHandler::RESOURCETYPE_MENUBAR();
else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR )
@@ -848,7 +847,7 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a
if ( xPropSet.is() )
{
long nOpenMode = 0;
- Any a = xPropSet->getPropertyValue( rtl::OUString( "OpenMode" ));
+ Any a = xPropSet->getPropertyValue( OUString( "OpenMode" ));
if ( a >>= nOpenMode )
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
}
@@ -1018,7 +1017,7 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin
return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY );
}
-sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL )
+sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1041,7 +1040,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
return sal_False;
}
-Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
+Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1070,7 +1069,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw NoSuchElementException();
}
-void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData )
+void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1180,7 +1179,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
}
}
-void SAL_CALL ModuleUIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL )
+void SAL_CALL ModuleUIConfigurationManager::removeSettings( const OUString& ResourceURL )
throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1259,7 +1258,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
}
}
-void SAL_CALL ModuleUIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
+void SAL_CALL ModuleUIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
@@ -1337,13 +1336,13 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
Sequence< Any > aPropSeq( 3 );
PropertyValue aPropValue;
- aPropValue.Name = rtl::OUString( "UserConfigStorage" );
+ aPropValue.Name = OUString( "UserConfigStorage" );
aPropValue.Value = makeAny( m_xUserConfigStorage );
aPropSeq[0] = makeAny( aPropValue );
- aPropValue.Name = rtl::OUString( "ModuleIdentifier" );
+ aPropValue.Name = OUString( "ModuleIdentifier" );
aPropValue.Value = makeAny( m_aModuleIdentifier );
aPropSeq[1] = makeAny( aPropValue );
- aPropValue.Name = rtl::OUString( "UserRootCommit" );
+ aPropValue.Name = OUString( "UserRootCommit" );
aPropValue.Value = makeAny( m_xUserRootCommit );
aPropSeq[2] = makeAny( aPropValue );
@@ -1361,7 +1360,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage
throw DisposedException();
Reference< XMultiServiceFactory > xSMGR = m_xServiceManager;
- ::rtl::OUString aModule = m_aModuleIdentifier;
+ OUString aModule = m_aModuleIdentifier;
if ( !m_xModuleAcceleratorManager.is() )
{
@@ -1369,7 +1368,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage
Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW);
PropertyValue aProp;
- aProp.Name = ::rtl::OUString("ModuleIdentifier");
+ aProp.Name = OUString("ModuleIdentifier");
aProp.Value <<= aModule;
Sequence< Any > lArgs(1);
@@ -1388,7 +1387,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager(
}
// XModuleUIConfigurationManager
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const ::rtl::OUString& ResourceURL )
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1411,7 +1410,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
return sal_False;
}
-Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL )
+Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 5e70410fd721..78f97f4c9a14 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -78,17 +78,17 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ
public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
{
public:
- ConfigurationAccess_UICategory( const ::rtl::OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext );
+ ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext );
virtual ~ConfigurationAccess_UICategory();
// 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
@@ -107,21 +107,21 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ
virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
protected:
- Any getUINameFromID( const rtl::OUString& rId );
- Any getUINameFromCache( const rtl::OUString& rId );
- Sequence< rtl::OUString > getAllIds();
+ Any getUINameFromID( const OUString& rId );
+ Any getUINameFromCache( const OUString& rId );
+ Sequence< OUString > getAllIds();
sal_Bool fillCache();
private:
- typedef ::boost::unordered_map< ::rtl::OUString,
- ::rtl::OUString,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > IdToInfoCache;
+ typedef ::boost::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ ::std::equal_to< OUString > > IdToInfoCache;
sal_Bool initializeConfigAccess();
- rtl::OUString m_aConfigCategoryAccess;
- rtl::OUString m_aPropUIName;
+ OUString m_aConfigCategoryAccess;
+ OUString m_aPropUIName;
Reference< XNameAccess > m_xGenericUICategories;
Reference< XMultiServiceFactory > m_xConfigProvider;
Reference< XNameAccess > m_xConfigAccess;
@@ -135,7 +135,7 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ
// XInterface, XTypeProvider
//*****************************************************************************************************************
-ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) :
+ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) :
ThreadHelpBase(),
m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ),
m_aPropUIName( CONFIGURATION_PROPERTY_NAME ),
@@ -146,7 +146,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUStr
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" );
// Create configuration hierachical access name
m_aConfigCategoryAccess += aModuleName;
- m_aConfigCategoryAccess += rtl::OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS );
+ m_aConfigCategoryAccess += OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS );
m_xConfigProvider = theDefaultProvider::get( rxContext );
}
@@ -161,7 +161,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
}
// XNameAccess
-Any SAL_CALL ConfigurationAccess_UICategory::getByName( const ::rtl::OUString& rId )
+Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId )
throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getByName" );
@@ -182,14 +182,14 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
return a;
}
-Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames()
+Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames()
throw ( RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementNames" );
return getAllIds();
}
-sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const ::rtl::OUString& rId )
+sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId )
throw (::com::sun::star::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::hasByName" );
@@ -201,7 +201,7 @@ Type SAL_CALL ConfigurationAccess_UICategory::getElementType()
throw ( RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementType" );
- return( ::getCppuType( (const rtl::OUString*)NULL ) );
+ return( ::getCppuType( (const OUString*)NULL ) );
}
sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements()
@@ -221,8 +221,8 @@ sal_Bool ConfigurationAccess_UICategory::fillCache()
return sal_True;
sal_Int32 i( 0 );
- rtl::OUString aUIName;
- Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames();
+ OUString aUIName;
+ Sequence< OUString > aNameSeq = m_xConfigAccess->getElementNames();
for ( i = 0; i < aNameSeq.getLength(); i++ )
{
@@ -249,7 +249,7 @@ sal_Bool ConfigurationAccess_UICategory::fillCache()
return sal_True;
}
-Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId )
+Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromID" );
Any a;
@@ -285,7 +285,7 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId )
return a;
}
-Any ConfigurationAccess_UICategory::getUINameFromCache( const rtl::OUString& rId )
+Any ConfigurationAccess_UICategory::getUINameFromCache( const OUString& rId )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromCache" );
Any a;
@@ -297,7 +297,7 @@ Any ConfigurationAccess_UICategory::getUINameFromCache( const rtl::OUString& rId
return a;
}
-Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds()
+Sequence< OUString > ConfigurationAccess_UICategory::getAllIds()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getAllIds" );
// SAFE
@@ -317,18 +317,18 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds()
try
{
- Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames();
+ Sequence< OUString > aNameSeq = m_xConfigAccess->getElementNames();
if ( m_xGenericUICategories.is() )
{
// Create concat list of supported user interface commands of the module
- Sequence< ::rtl::OUString > aGenericNameSeq = m_xGenericUICategories->getElementNames();
+ Sequence< OUString > aGenericNameSeq = m_xGenericUICategories->getElementNames();
sal_uInt32 nCount1 = aNameSeq.getLength();
sal_uInt32 nCount2 = aGenericNameSeq.getLength();
aNameSeq.realloc( nCount1 + nCount2 );
- ::rtl::OUString* pNameSeq = aNameSeq.getArray();
- const ::rtl::OUString* pGenericSeq = aGenericNameSeq.getConstArray();
+ OUString* pNameSeq = aNameSeq.getArray();
+ const OUString* pGenericSeq = aGenericNameSeq.getConstArray();
for ( sal_uInt32 i = 0; i < nCount2; i++ )
pNameSeq[nCount1+i] = pGenericSeq[i];
}
@@ -343,7 +343,7 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds()
}
}
- return Sequence< rtl::OUString >();
+ return Sequence< OUString >();
}
sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
@@ -354,7 +354,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
try
{
- aPropValue.Name = rtl::OUString( "nodepath" );
+ aPropValue.Name = OUString( "nodepath" );
aPropValue.Value <<= m_aConfigCategoryAccess;
aArgs[0] <<= aPropValue;
@@ -427,12 +427,12 @@ UICategoryDescription::UICategoryDescription( const Reference< XComponentContext
UICommandDescription(rxContext,true)
{
Reference< XNameAccess > xEmpty;
- rtl::OUString aGenericCategories( "GenericCategories" );
+ OUString aGenericCategories( "GenericCategories" );
m_xGenericUICommands = new ConfigurationAccess_UICategory( aGenericCategories, xEmpty, rxContext );
// insert generic categories mappings
m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type(
- rtl::OUString(GENERIC_MODULE_NAME ), aGenericCategories ));
+ OUString(GENERIC_MODULE_NAME ), aGenericCategories ));
UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories );
if ( pCatIter != m_aUICommandsHashMap.end() )
@@ -444,7 +444,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XComponentContext
UICategoryDescription::~UICategoryDescription()
{
}
-Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const ::rtl::OUString& _sName)
+Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const OUString& _sName)
{
return new ConfigurationAccess_UICategory( _sName, m_xGenericUICommands, m_xContext );
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 199a89aeefcc..a2469e087cea 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -110,17 +110,17 @@ static const char* UIELEMENTTYPENAMES[] =
static const char RESOURCEURL_PREFIX[] = "private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
-static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL )
+static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
{
- rtl::OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE );
+ OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE );
sal_Int32 nIndex = aTmpStr.indexOf( '/' );
if (( nIndex > 0 ) && ( aTmpStr.getLength() > nIndex ))
{
- rtl::OUString aTypeStr( aTmpStr.copy( 0, nIndex ));
+ OUString aTypeStr( aTmpStr.copy( 0, nIndex ));
for ( int i = 0; i < UIElementType::COUNT; i++ )
{
if ( aTypeStr.equalsAscii( UIELEMENTTYPENAMES[i] ))
@@ -132,7 +132,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL
return UIElementType::UNKNOWN;
}
-static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL )
+static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
@@ -142,7 +142,7 @@ static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResource
return aResourceURL.copy( nIndex+1 );
}
- return rtl::OUString();
+ return OUString();
}
void UIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType )
@@ -159,7 +159,7 @@ void UIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIElementInfo
if ( pDataSettings && !pDataSettings->bDefault )
{
// Retrieve user interface name from XPropertySet interface
- rtl::OUString aUIName;
+ OUString aUIName;
Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY );
if ( xPropSet.is() )
{
@@ -183,15 +183,15 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage;
if ( xElementTypeStorage.is() )
{
- rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
+ OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE );
aBuf.appendAscii( RESOURCEURL_PREFIX );
aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] );
aBuf.appendAscii( "/" );
- rtl::OUString aResURLPrefix( aBuf.makeStringAndClear() );
+ OUString aResURLPrefix( aBuf.makeStringAndClear() );
UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap;
Reference< XNameAccess > xNameAccess( xElementTypeStorage, UNO_QUERY );
- Sequence< rtl::OUString > aUIElementNames = xNameAccess->getElementNames();
+ Sequence< OUString > aUIElementNames = xNameAccess->getElementNames();
for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ )
{
UIElementData aUIElementData;
@@ -200,8 +200,8 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' );
if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() ))
{
- rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 ));
- rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
+ OUString aExtension( aUIElementNames[n].copy( nIndex+1 ));
+ OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
if (!aUIElementName.isEmpty() &&
( aExtension.equalsIgnoreAsciiCase("xml")))
@@ -325,7 +325,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType,
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer()), UNO_QUERY );
}
-UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
+UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad )
{
// preload list of element types on demand
impl_preloadUIElementTypeList( nElementType );
@@ -549,7 +549,7 @@ void UIConfigurationManager::impl_Initialize()
Reference< XStorage > xElementTypeStorage;
try
{
- xElementTypeStorage = m_xDocConfigStorage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
+ xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
}
catch ( const com::sun::star::container::NoSuchElementException& )
{
@@ -697,7 +697,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt
{
bool bCommitSubStorage( false );
Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY );
- Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames();
+ Sequence< OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames();
for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ )
{
xSubStorage->removeElement( aUIElementStreamNames[j] );
@@ -808,7 +808,7 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t
return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer()), UNO_QUERY );
}
-sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL )
+sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -826,7 +826,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
return sal_False;
}
-Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable )
+Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -855,7 +855,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw NoSuchElementException();
}
-void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData )
+void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -914,7 +914,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
}
}
-void SAL_CALL UIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL )
+void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL )
throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -972,7 +972,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
}
}
-void SAL_CALL UIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
+void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException )
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
@@ -1061,10 +1061,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
Sequence< Any > aPropSeq( 2 );
PropertyValue aPropValue;
- aPropValue.Name = rtl::OUString( "UserConfigStorage" );
+ aPropValue.Name = OUString( "UserConfigStorage" );
aPropValue.Value = makeAny( m_xDocConfigStorage );
aPropSeq[0] = makeAny( aPropValue );
- aPropValue.Name = rtl::OUString( "ModuleIdentifier" );
+ aPropValue.Name = OUString( "ModuleIdentifier" );
aPropValue.Value = makeAny( m_aModuleIdentifier );
aPropSeq[1] = makeAny( aPropValue );
@@ -1092,7 +1092,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th
Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW);
PropertyValue aProp;
- aProp.Name = ::rtl::OUString("DocumentRoot");
+ aProp.Name = OUString("DocumentRoot");
aProp.Value <<= xDocumentRoot;
Sequence< Any > lArgs(1);
@@ -1159,7 +1159,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
try
{
long nOpenMode = 0;
- Any a = xPropSet->getPropertyValue( rtl::OUString( "OpenMode" ));
+ Any a = xPropSet->getPropertyValue( OUString( "OpenMode" ));
if ( a >>= nOpenMode )
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
}
@@ -1273,7 +1273,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage
try
{
Reference< XStorage > xElementTypeStorage( Storage->openStorageElement(
- rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE ));
+ OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE ));
UIElementType& rElementType = m_aUIElements[i];
if ( rElementType.bModified && xElementTypeStorage.is() )
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index fc61fa68a00a..6f426bc69d12 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -133,7 +133,7 @@ class ConfigurationAccess_WindowState : // interfaces
public ::cppu::OWeakObject
{
public:
- ConfigurationAccess_WindowState( const ::rtl::OUString& aWindowStateConfigFile, const Reference< XComponentContext >& rxContext );
+ ConfigurationAccess_WindowState( const OUString& aWindowStateConfigFile, const Reference< XComponentContext >& rxContext );
virtual ~ConfigurationAccess_WindowState();
// XInterface, XTypeProvider
@@ -141,24 +141,24 @@ class ConfigurationAccess_WindowState : // interfaces
FWK_DECLARE_XTYPEPROVIDER
// 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);
// XNameContainer
- virtual void SAL_CALL removeByName( const ::rtl::OUString& sName )
+ virtual void SAL_CALL removeByName( const OUString& sName )
throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
- virtual void SAL_CALL insertByName( const ::rtl::OUString& sName, const css::uno::Any& aPropertySet )
+ virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any& aPropertySet )
throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException );
// XNameReplace
- virtual void SAL_CALL replaceByName( const ::rtl::OUString& sName, const css::uno::Any& aPropertySet )
+ virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet )
throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
// XElementAccess
@@ -222,34 +222,34 @@ class ConfigurationAccess_WindowState : // interfaces
com::sun::star::awt::Size aDockSize;
com::sun::star::awt::Point aPos;
com::sun::star::awt::Size aSize;
- rtl::OUString aUIName;
+ OUString aUIName;
sal_uInt32 nInternalState;
sal_uInt16 nStyle;
sal_uInt32 nMask; // see WindowStateMask
};
void impl_putPropertiesFromStruct( const WindowStateInfo& rWinStateInfo, Reference< XPropertySet >& xPropSet );
- Any impl_insertCacheAndReturnSequence( const rtl::OUString& rResourceURL, Reference< XNameAccess >& rNameAccess );
- WindowStateInfo& impl_insertCacheAndReturnWinState( const rtl::OUString& rResourceURL, Reference< XNameAccess >& rNameAccess );
+ Any impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess );
+ WindowStateInfo& impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess );
Any impl_getSequenceFromStruct( const WindowStateInfo& rWinStateInfo );
void impl_fillStructFromSequence( WindowStateInfo& rWinStateInfo, const Sequence< PropertyValue >& rSeq );
- Any impl_getWindowStateFromResourceURL( const rtl::OUString& rResourceURL );
+ Any impl_getWindowStateFromResourceURL( const OUString& rResourceURL );
sal_Bool impl_initializeConfigAccess();
private:
- typedef ::boost::unordered_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< OUString,
WindowStateInfo,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache;
+ OUStringHash,
+ ::std::equal_to< OUString > > ResourceURLToInfoCache;
- rtl::OUString m_aConfigWindowAccess;
+ OUString m_aConfigWindowAccess;
Reference< XMultiServiceFactory > m_xConfigProvider;
Reference< XNameAccess > m_xConfigAccess;
Reference< XContainerListener > m_xConfigListener;
ResourceURLToInfoCache m_aResourceURLToInfoCache;
sal_Bool m_bConfigAccessInitialized : 1,
m_bModified : 1;
- std::vector< ::rtl::OUString > m_aPropArray;
+ std::vector< OUString > m_aPropArray;
};
//*****************************************************************************************************************
@@ -276,7 +276,7 @@ DEFINE_XTYPEPROVIDER_7 ( ConfigurationAccess_WindowState ,
css::lang::XTypeProvider
)
-ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const rtl::OUString& aModuleName, const Reference< XComponentContext >& rxContext ) :
+ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) :
ThreadHelpBase(),
m_aConfigWindowAccess( CONFIGURATION_ROOT_ACCESS ),
m_bConfigAccessInitialized( sal_False ),
@@ -284,14 +284,14 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const rtl::OUS
{
// Create configuration hierachical access name
m_aConfigWindowAccess += aModuleName;
- m_aConfigWindowAccess += rtl::OUString( CONFIGURATION_WINDOWSTATE_ACCESS );
+ m_aConfigWindowAccess += OUString( CONFIGURATION_WINDOWSTATE_ACCESS );
m_xConfigProvider = theDefaultProvider::get( rxContext );
// Initialize access array with property names.
sal_Int32 n = 0;
while ( CONFIGURATION_PROPERTIES[n] )
{
- m_aPropArray.push_back( ::rtl::OUString::createFromAscii( CONFIGURATION_PROPERTIES[n] ));
+ m_aPropArray.push_back( OUString::createFromAscii( CONFIGURATION_PROPERTIES[n] ));
++n;
}
}
@@ -306,7 +306,7 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState()
}
// XNameAccess
-Any SAL_CALL ConfigurationAccess_WindowState::getByName( const ::rtl::OUString& rResourceURL )
+Any SAL_CALL ConfigurationAccess_WindowState::getByName( const OUString& rResourceURL )
throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
{
// SAFE
@@ -325,7 +325,7 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
}
}
-Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames()
+Sequence< OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames()
throw ( RuntimeException )
{
// SAFE
@@ -340,10 +340,10 @@ throw ( RuntimeException )
if ( m_xConfigAccess.is() )
return m_xConfigAccess->getElementNames();
else
- return Sequence< ::rtl::OUString > ();
+ return Sequence< OUString > ();
}
-sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const ::rtl::OUString& rResourceURL )
+sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL )
throw (::com::sun::star::uno::RuntimeException)
{
// SAFE
@@ -388,7 +388,7 @@ throw ( RuntimeException )
}
// XNameContainer
-void SAL_CALL ConfigurationAccess_WindowState::removeByName( const ::rtl::OUString& rResourceURL )
+void SAL_CALL ConfigurationAccess_WindowState::removeByName( const OUString& rResourceURL )
throw( NoSuchElementException, WrappedTargetException, RuntimeException )
{
// SAFE
@@ -423,7 +423,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException )
}
}
-void SAL_CALL ConfigurationAccess_WindowState::insertByName( const ::rtl::OUString& rResourceURL, const css::uno::Any& aPropertySet )
+void SAL_CALL ConfigurationAccess_WindowState::insertByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet )
throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
{
// SAFE
@@ -488,7 +488,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException,
}
// XNameReplace
-void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const ::rtl::OUString& rResourceURL, const css::uno::Any& aPropertySet )
+void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet )
throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
{
// SAFE
@@ -533,7 +533,7 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException,
if ( xNameContainer.is() )
{
WindowStateInfo aWinStateInfo( pIter->second );
- ::rtl::OUString aResourceURL( pIter->first );
+ OUString aResourceURL( pIter->first );
m_bModified = sal_False;
aLock.unlock();
@@ -645,7 +645,7 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta
return makeAny( aPropSeq );
}
-Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rtl::OUString& rResourceURL, Reference< XNameAccess >& xNameAccess )
+Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess >& xNameAccess )
{
sal_Int32 nMask( 0 );
sal_Int32 nCount( m_aPropArray.size() );
@@ -720,11 +720,11 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
case PROPERTY_POS:
case PROPERTY_DOCKPOS:
{
- ::rtl::OUString aString;
+ OUString aString;
if ( a >>= aString )
{
sal_Int32 nToken( 0 );
- ::rtl::OUString aXStr = aString.getToken( 0, ',', nToken );
+ OUString aXStr = aString.getToken( 0, ',', nToken );
if ( nToken > 0 )
{
com::sun::star::awt::Point aPos;
@@ -752,11 +752,11 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
case PROPERTY_SIZE:
case PROPERTY_DOCKSIZE:
{
- ::rtl::OUString aString;
+ OUString aString;
if ( a >>= aString )
{
sal_Int32 nToken( 0 );
- ::rtl::OUString aStr = aString.getToken( 0, ',', nToken );
+ OUString aStr = aString.getToken( 0, ',', nToken );
if ( nToken > 0 )
{
com::sun::star::awt::Size aSize;
@@ -782,7 +782,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
case PROPERTY_UINAME:
{
- ::rtl::OUString aValue;
+ OUString aValue;
if ( a >>= aValue )
{
nMask |= WINDOWSTATE_MASK_UINAME;
@@ -842,7 +842,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
return makeAny( aPropSeq );
}
-ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const rtl::OUString& rResourceURL, Reference< XNameAccess >& rNameAccess )
+ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess )
{
sal_Int32 nMask( 0 );
sal_Int32 nCount( m_aPropArray.size() );
@@ -914,11 +914,11 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
case PROPERTY_POS:
case PROPERTY_DOCKPOS:
{
- ::rtl::OUString aString;
+ OUString aString;
if ( a >>= aString )
{
sal_Int32 nToken( 0 );
- ::rtl::OUString aXStr = aString.getToken( 0, ',', nToken );
+ OUString aXStr = aString.getToken( 0, ',', nToken );
if ( nToken > 0 )
{
com::sun::star::awt::Point aPos;
@@ -943,11 +943,11 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
case PROPERTY_SIZE:
case PROPERTY_DOCKSIZE:
{
- ::rtl::OUString aString;
+ OUString aString;
if ( a >>= aString )
{
sal_Int32 nToken( 0 );
- ::rtl::OUString aStr = aString.getToken( 0, ',', nToken );
+ OUString aStr = aString.getToken( 0, ',', nToken );
if ( nToken > 0 )
{
com::sun::star::awt::Size aSize;
@@ -970,7 +970,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
case PROPERTY_UINAME:
{
- ::rtl::OUString aValue;
+ OUString aValue;
if ( a >>= aValue )
{
nMask |= WINDOWSTATE_MASK_UINAME;
@@ -1017,7 +1017,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
return pIter->second;
}
-Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const rtl::OUString& rResourceURL )
+Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const OUString& rResourceURL )
{
if ( !m_bConfigAccessInitialized )
{
@@ -1160,7 +1160,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn
case PROPERTY_UINAME:
{
- ::rtl::OUString aValue;
+ OUString aValue;
if ( rSeq[i].Value >>= aValue )
{
rWinStateInfo.aUIName = aValue;
@@ -1206,7 +1206,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
sal_Int32 i( 0 );
sal_Int32 nCount( m_aPropArray.size() );
Sequence< PropertyValue > aPropSeq;
- ::rtl::OUString aDelim( "," );
+ OUString aDelim( "," );
for ( i = 0; i < nCount; i++ )
{
@@ -1238,32 +1238,32 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
case PROPERTY_POS:
case PROPERTY_DOCKPOS:
{
- ::rtl::OUString aPosStr;
+ OUString aPosStr;
if ( i == PROPERTY_POS )
- aPosStr = ::rtl::OUString::valueOf( rWinStateInfo.aPos.X );
+ aPosStr = OUString::valueOf( rWinStateInfo.aPos.X );
else
- aPosStr = ::rtl::OUString::valueOf( rWinStateInfo.aDockPos.X );
+ aPosStr = OUString::valueOf( rWinStateInfo.aDockPos.X );
aPosStr += aDelim;
if ( i == PROPERTY_POS )
- aPosStr += ::rtl::OUString::valueOf( rWinStateInfo.aPos.Y );
+ aPosStr += OUString::valueOf( rWinStateInfo.aPos.Y );
else
- aPosStr += ::rtl::OUString::valueOf( rWinStateInfo.aDockPos.Y );
+ aPosStr += OUString::valueOf( rWinStateInfo.aDockPos.Y );
xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aPosStr ) );
break;
}
case PROPERTY_SIZE:
case PROPERTY_DOCKSIZE:
{
- ::rtl::OUString aSizeStr;
+ OUString aSizeStr;
if ( i == PROPERTY_SIZE )
- aSizeStr = ( ::rtl::OUString::valueOf( rWinStateInfo.aSize.Width ));
+ aSizeStr = ( OUString::valueOf( rWinStateInfo.aSize.Width ));
else
- aSizeStr = ( ::rtl::OUString::valueOf( rWinStateInfo.aDockSize.Width ));
+ aSizeStr = ( OUString::valueOf( rWinStateInfo.aDockSize.Width ));
aSizeStr += aDelim;
if ( i == PROPERTY_SIZE )
- aSizeStr += ::rtl::OUString::valueOf( rWinStateInfo.aSize.Height );
+ aSizeStr += OUString::valueOf( rWinStateInfo.aSize.Height );
else
- aSizeStr += ::rtl::OUString::valueOf( rWinStateInfo.aDockSize.Height );
+ aSizeStr += OUString::valueOf( rWinStateInfo.aDockSize.Height );
xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aSizeStr ) );
break;
}
@@ -1291,10 +1291,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
try
{
- aPropValue.Name = rtl::OUString( "nodepath" );
+ aPropValue.Name = OUString( "nodepath" );
aPropValue.Value <<= m_aConfigWindowAccess;
aArgs[0] <<= aPropValue;
- aPropValue.Name = rtl::OUString( "lazywrite" );
+ aPropValue.Name = OUString( "lazywrite" );
aPropValue.Value <<= sal_True;
aArgs[1] <<= aPropValue;
@@ -1357,7 +1357,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentC
{
m_xModuleManager = ModuleManager::create( m_xContext );
Reference< XNameAccess > xEmptyNameAccess;
- Sequence< rtl::OUString > aElementNames;
+ Sequence< OUString > aElementNames;
try
{
aElementNames = m_xModuleManager->getElementNames();
@@ -1366,14 +1366,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentC
{
}
Sequence< PropertyValue > aSeq;
- ::rtl::OUString aModuleIdentifier;
+ OUString aModuleIdentifier;
for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
{
aModuleIdentifier = aElementNames[i];
if ( m_xModuleManager->getByName( aModuleIdentifier ) >>= aSeq )
{
- ::rtl::OUString aWindowStateFileStr;
+ OUString aWindowStateFileStr;
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
if ( aSeq[y].Name == "ooSetupFactoryWindowStateConfigRef" )
@@ -1404,7 +1404,7 @@ WindowStateConfiguration::~WindowStateConfiguration()
m_aModuleToWindowStateHashMap.clear();
}
-Any SAL_CALL WindowStateConfiguration::getByName( const ::rtl::OUString& aModuleIdentifier )
+Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
@@ -1413,7 +1413,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
if ( pIter != m_aModuleToFileHashMap.end() )
{
Any a;
- ::rtl::OUString aWindowStateConfigFile( pIter->second );
+ OUString aWindowStateConfigFile( pIter->second );
ModuleToWindowStateConfigHashMap::iterator pModuleIter = m_aModuleToWindowStateHashMap.find( aWindowStateConfigFile );
if ( pModuleIter != m_aModuleToWindowStateHashMap.end() )
@@ -1436,12 +1436,12 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
throw NoSuchElementException();
}
-Sequence< ::rtl::OUString > SAL_CALL WindowStateConfiguration::getElementNames()
+Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames()
throw (::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
- Sequence< rtl::OUString > aSeq( m_aModuleToFileHashMap.size() );
+ Sequence< OUString > aSeq( m_aModuleToFileHashMap.size() );
sal_Int32 n = 0;
ModuleToWindowStateFileMap::const_iterator pIter = m_aModuleToFileHashMap.begin();
@@ -1454,7 +1454,7 @@ throw (::com::sun::star::uno::RuntimeException)
return aSeq;
}
-sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName )
throw (::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 270fd3e64f29..6c1c8c145b33 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -57,7 +57,7 @@ namespace framework
ButtonToolbarController::ButtonToolbarController(
const uno::Reference< lang::XMultiServiceFactory >& rServiceManager,
ToolBox* pToolBar,
- const rtl::OUString& aCommand ) :
+ const OUString& aCommand ) :
cppu::OWeakObject(),
m_bInitialized( sal_False ),
m_bDisposed( sal_False ),
@@ -209,7 +209,7 @@ throw (::com::sun::star::uno::RuntimeException)
uno::Reference< frame::XDispatch > xDispatch;
uno::Reference< frame::XFrame > xFrame;
uno::Reference< util::XURLTransformer > xURLTransformer;
- rtl::OUString aCommandURL;
+ OUString aCommandURL;
::com::sun::star::util::URL aTargetURL;
{
@@ -239,7 +239,7 @@ throw (::com::sun::star::uno::RuntimeException)
{
aTargetURL.Complete = aCommandURL;
xURLTransformer->parseStrict( aTargetURL );
- xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
if ( xDispatch.is() )
@@ -249,7 +249,7 @@ throw (::com::sun::star::uno::RuntimeException)
Sequence<PropertyValue> aArgs( 1 );
// Provide key modifier information to dispatch function
- aArgs[0].Name = rtl::OUString( "KeyModifier" );
+ aArgs[0].Name = OUString( "KeyModifier" );
aArgs[0].Value <<= KeyModifier;
xDispatch->dispatch( aTargetURL, aArgs );
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 5f2fbb9919ac..499e1b47e146 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -57,7 +57,7 @@ ComplexToolbarController::ComplexToolbarController(
const Reference< XFrame >& rFrame,
ToolBox* pToolbar,
sal_uInt16 nID,
- const ::rtl::OUString& aCommand ) :
+ const OUString& aCommand ) :
svt::ToolboxController( rServiceManager, rFrame, aCommand )
, m_pToolbar( pToolbar )
, m_nID( nID )
@@ -93,7 +93,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo
Sequence<PropertyValue> aArgs( 1 );
// Add key modifier to argument list
- aArgs[0].Name = rtl::OUString( "KeyModifier" );
+ aArgs[0].Name = OUString( "KeyModifier" );
aArgs[0].Value <<= KeyModifier;
return aArgs;
}
@@ -103,7 +103,7 @@ throw ( RuntimeException )
{
Reference< XDispatch > xDispatch;
Reference< XURLTransformer > xURLTransformer;
- ::rtl::OUString aCommandURL;
+ OUString aCommandURL;
::com::sun::star::util::URL aTargetURL;
Sequence<PropertyValue> aArgs;
@@ -156,7 +156,7 @@ throw ( RuntimeException )
TriState eTri = STATE_NOCHECK;
sal_Bool bValue = sal_Bool();
- rtl::OUString aStrValue;
+ OUString aStrValue;
ItemStatus aItemState;
Visibility aItemVisibility;
ControlCommand aControlCommand;
@@ -173,7 +173,7 @@ throw ( RuntimeException )
}
else if ( Event.State >>= aStrValue )
{
- ::rtl::OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) );
+ OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) );
m_pToolbar->SetItemText( m_nID, aText );
m_pToolbar->SetQuickHelpText( m_nID, aText );
@@ -256,7 +256,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*,
// ------------------------------------------------------------------
void ComplexToolbarController::addNotifyInfo(
- const rtl::OUString& aEventName,
+ const OUString& aEventName,
const uno::Reference< frame::XDispatch >& xDispatch,
const uno::Sequence< beans::NamedValue >& rInfo )
{
@@ -275,7 +275,7 @@ void ComplexToolbarController::addNotifyInfo(
sal_Int32 nCount = rInfo.getLength();
uno::Sequence< beans::NamedValue > aInfoSeq( rInfo );
aInfoSeq.realloc( nCount+1 );
- aInfoSeq[nCount].Name = ::rtl::OUString( "Source" );
+ aInfoSeq[nCount].Name = OUString( "Source" );
aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() );
pNotifyInfo->aInfoSeq = aInfoSeq;
@@ -297,7 +297,7 @@ sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow )
// --------------------------------------------------------
-uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const rtl::OUString& aCommand ) const
+uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const OUString& aCommand ) const
{
uno::Reference< frame::XDispatch > xDispatch;
@@ -327,7 +327,7 @@ void ComplexToolbarController::notifyFocusGet()
{
// send focus get notification
uno::Sequence< beans::NamedValue > aInfo;
- addNotifyInfo( rtl::OUString( "FocusSet" ),
+ addNotifyInfo( OUString( "FocusSet" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
}
@@ -336,18 +336,18 @@ void ComplexToolbarController::notifyFocusLost()
{
// send focus lost notification
uno::Sequence< beans::NamedValue > aInfo;
- addNotifyInfo( rtl::OUString( "FocusLost" ),
+ addNotifyInfo( OUString( "FocusLost" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
}
-void ComplexToolbarController::notifyTextChanged( const ::rtl::OUString& aText )
+void ComplexToolbarController::notifyTextChanged( const OUString& aText )
{
// send text changed notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = rtl::OUString( "Text" );
+ aInfo[0].Name = OUString( "Text" );
aInfo[0].Value <<= aText;
- addNotifyInfo( rtl::OUString( "TextChanged" ),
+ addNotifyInfo( OUString( "TextChanged" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
}
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 42de11ea3ffa..4c1276e8bbb6 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -380,10 +380,10 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i)
{
- aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] );
+ aTargetURL.Complete = OUString::createFromAscii( aCommands[i] );
m_xURLTransformer->parseStrict( aTargetURL );
- Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
if ( xDispatch.is() )
{
xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
@@ -399,7 +399,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen
{
osl::ResettableMutexGuard aLock( m_aMutex );
svt::PopupMenuControllerBase::initialize(aArguments);
- m_aBaseURL = ::rtl::OUString();
+ m_aBaseURL = OUString();
}
}
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 5d7a3e35d25d..714332cb5a12 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -47,7 +47,7 @@ using namespace com::sun::star::util;
using namespace std;
-static bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr2)
+static bool lcl_I18nCompareString(const OUString& rStr1, const OUString& rStr2)
{
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
return rI18nHelper.CompareString( rStr1, rStr2 ) < 0 ? true : false;
@@ -74,9 +74,9 @@ FontMenuController::~FontMenuController()
}
// private function
-void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFontNameSeq, Reference< css::awt::XPopupMenu >& rPopupMenu )
+void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq, Reference< css::awt::XPopupMenu >& rPopupMenu )
{
- const rtl::OUString* pFontNameArray = rFontNameSeq.getConstArray();
+ const OUString* pFontNameArray = rFontNameSeq.getConstArray();
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
PopupMenu* pVCLPopupMenu = 0;
@@ -88,7 +88,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
if ( pVCLPopupMenu )
{
- vector<rtl::OUString> aVector;
+ vector<OUString> aVector;
aVector.reserve(rFontNameSeq.getLength());
for ( sal_uInt16 i = 0; i < rFontNameSeq.getLength(); i++ )
{
@@ -96,18 +96,18 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
}
sort(aVector.begin(), aVector.end(), lcl_I18nCompareString );
- const rtl::OUString aFontNameCommandPrefix( ".uno:CharFontName?CharFontName.FamilyName:string=" );
+ const OUString aFontNameCommandPrefix( ".uno:CharFontName?CharFontName.FamilyName:string=" );
const sal_Int16 nCount = (sal_Int16)aVector.size();
for ( sal_Int16 i = 0; i < nCount; i++ )
{
- const rtl::OUString& rName = aVector[i];
+ const OUString& rName = aVector[i];
m_xPopupMenu->insertItem( i+1, rName, css::awt::MenuItemStyle::RADIOCHECK | css::awt::MenuItemStyle::AUTOCHECK, i );
if ( rName == m_aFontFamilyName )
m_xPopupMenu->checkItem( i+1, sal_True );
// use VCL popup menu pointer to set vital information that are not part of the awt implementation
- rtl::OUStringBuffer aCommandBuffer( aFontNameCommandPrefix );
+ OUStringBuffer aCommandBuffer( aFontNameCommandPrefix );
aCommandBuffer.append( INetURLObject::encode( rName, INetURLObject::PART_HTTP_QUERY, '%', INetURLObject::ENCODE_ALL ));
- rtl::OUString aFontNameCommand = aCommandBuffer.makeStringAndClear();
+ OUString aFontNameCommand = aCommandBuffer.makeStringAndClear();
pVCLPopupMenu->SetItemCommand( i+1, aFontNameCommand ); // Store font name into item command.
}
@@ -134,7 +134,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim
void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
{
com::sun::star::awt::FontDescriptor aFontDescriptor;
- Sequence< rtl::OUString > aFontNameSeq;
+ Sequence< OUString > aFontNameSeq;
if ( Event.State >>= aFontDescriptor )
{
@@ -167,7 +167,7 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (
// find new font name and set check mark!
sal_uInt16 nChecked = 0;
sal_uInt16 nItemCount = m_xPopupMenu->getItemCount();
- rtl::OUString aEmpty;
+ OUString aEmpty;
for( sal_uInt16 i = 0; i < nItemCount; i++ )
{
sal_uInt16 nItemId = m_xPopupMenu->getItemId( i );
@@ -175,7 +175,7 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (
if ( m_xPopupMenu->isItemChecked( nItemId ) )
nChecked = nItemId;
- rtl::OUString aText = m_xPopupMenu->getItemText( nItemId );
+ OUString aText = m_xPopupMenu->getItemText( nItemId );
// TODO: must be replaced by implementation of VCL, when available
sal_Int32 nIndex = aText.indexOf( (sal_Unicode)'~' );
@@ -202,9 +202,9 @@ void FontMenuController::impl_setPopupMenu()
com::sun::star::util::URL aTargetURL;
// Register for font list updates to get the current font list from the controller
- aTargetURL.Complete = rtl::OUString( ".uno:FontNameList" );
+ aTargetURL.Complete = OUString( ".uno:FontNameList" );
m_xURLTransformer->parseStrict( aTargetURL );
- m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
@@ -214,7 +214,7 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un
osl::ClearableMutexGuard aLock( m_aMutex );
Reference< XDispatch > xDispatch( m_xFontListDispatch );
com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = rtl::OUString( ".uno:FontNameList" );
+ aTargetURL.Complete = OUString( ".uno:FontNameList" );
m_xURLTransformer->parseStrict( aTargetURL );
aLock.clear();
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 9defbc9965a1..22ddd7619601 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -71,9 +71,9 @@ FontSizeMenuController::~FontSizeMenuController()
}
// private function
-rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame )
+OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame )
{
- rtl::OUString aPrinterName;
+ OUString aPrinterName;
if ( rFrame.is() )
{
@@ -137,7 +137,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
{
FontList* pFontList = 0;
Printer* pInfoPrinter = 0;
- rtl::OUString aPrinterName;
+ OUString aPrinterName;
SolarMutexGuard aSolarMutexGuard;
@@ -166,13 +166,13 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
nSizeCount++;
sal_uInt16 nPos = 0;
- const rtl::OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" );
+ const OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" );
// first insert font size names (for simplified/traditional chinese)
float fPoint;
FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() );
m_pHeightArray = new long[nSizeCount+aFontSizeNames.Count()];
- rtl::OUString aCommand;
+ OUString aCommand;
if ( !aFontSizeNames.IsEmpty() )
{
@@ -190,7 +190,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
fPoint = float( m_pHeightArray[nPos-1] ) / 10;
// Create dispatchable .uno command and set it
- aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint );
+ aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
pVCLPopupMenu->SetItemCommand( nPos, aCommand );
}
}
@@ -209,7 +209,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
fPoint = float( m_pHeightArray[nPos-1] ) / 10;
// Create dispatchable .uno command and set it
- aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint );
+ aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
pVCLPopupMenu->SetItemCommand( nPos, aCommand );
}
pTempAry++;
@@ -228,7 +228,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
fPoint = float( m_pHeightArray[nPos-1] ) / 10;
// Create dispatchable .uno command and set it
- aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint );
+ aCommand = aFontHeightCommand + OUString::valueOf( fPoint );
pVCLPopupMenu->SetItemCommand( nPos, aCommand );
pTempAry++;
@@ -298,9 +298,9 @@ void FontSizeMenuController::impl_setPopupMenu()
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
com::sun::star::util::URL aTargetURL;
// Register for font name updates which gives us info about the current font!
- aTargetURL.Complete = rtl::OUString( ".uno:CharFontName" );
+ aTargetURL.Complete = OUString( ".uno:CharFontName" );
m_xURLTransformer->parseStrict( aTargetURL );
- m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException )
@@ -311,7 +311,7 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = rtl::OUString( ".uno:CharFontName" );
+ aTargetURL.Complete = OUString( ".uno:CharFontName" );
m_xURLTransformer->parseStrict( aTargetURL );
aLock.clear();
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index ef97fe10a586..a021b33471fe 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::container;
namespace framework
{
-static sal_Bool isEnumCommand( const rtl::OUString& rCommand )
+static sal_Bool isEnumCommand( const OUString& rCommand )
{
INetURLObject aURL( rCommand );
@@ -65,11 +65,11 @@ static sal_Bool isEnumCommand( const rtl::OUString& rCommand )
return sal_False;
}
-static rtl::OUString getEnumCommand( const rtl::OUString& rCommand )
+static OUString getEnumCommand( const OUString& rCommand )
{
INetURLObject aURL( rCommand );
- rtl::OUString aEnumCommand;
+ OUString aEnumCommand;
String aURLPath = aURL.GetURLPath();
xub_StrLen nIndex = aURLPath.Search( '.' );
if (( nIndex > 0 ) && ( nIndex < aURLPath.Len() ))
@@ -78,9 +78,9 @@ static rtl::OUString getEnumCommand( const rtl::OUString& rCommand )
return aEnumCommand;
}
-static rtl::OUString getMasterCommand( const rtl::OUString& rCommand )
+static OUString getMasterCommand( const OUString& rCommand )
{
- rtl::OUString aMasterCommand( rCommand );
+ OUString aMasterCommand( rCommand );
INetURLObject aURL( rCommand );
if ( aURL.GetProtocol() == INET_PROT_UNO )
{
@@ -105,7 +105,7 @@ GenericToolbarController::GenericToolbarController( const Reference< XMultiServi
const Reference< XFrame >& rFrame,
ToolBox* pToolbar,
sal_uInt16 nID,
- const ::rtl::OUString& aCommand ) :
+ const OUString& aCommand ) :
svt::ToolboxController( rServiceManager, rFrame, aCommand )
, m_pToolbar( pToolbar )
, m_nID( nID )
@@ -137,7 +137,7 @@ throw ( RuntimeException )
{
Reference< XDispatch > xDispatch;
Reference< XURLTransformer > xURLTransformer;
- ::rtl::OUString aCommandURL;
+ OUString aCommandURL;
{
SolarMutexGuard aSolarMutexGuard;
@@ -165,7 +165,7 @@ throw ( RuntimeException )
Sequence<PropertyValue> aArgs( 1 );
// Add key modifier to argument list
- aArgs[0].Name = rtl::OUString( "KeyModifier" );
+ aArgs[0].Name = OUString( "KeyModifier" );
aArgs[0].Value <<= KeyModifier;
aTargetURL.Complete = aCommandURL;
@@ -197,7 +197,7 @@ throw ( RuntimeException )
TriState eTri = STATE_NOCHECK;
sal_Bool bValue = sal_Bool();
- rtl::OUString aStrValue;
+ OUString aStrValue;
ItemStatus aItemState;
Visibility aItemVisibility;
@@ -231,26 +231,26 @@ throw ( RuntimeException )
if ( aStrValue.matchAsciiL( "($1)", 4 ))
{
String aResStr = String( FwkResId( STR_UPDATEDOC ));
- rtl::OUString aTmp( aResStr );
- aTmp += rtl::OUString( " " );
+ OUString aTmp( aResStr );
+ aTmp += OUString( " " );
aTmp += aStrValue.copy( 4 );
aStrValue = aTmp;
}
else if ( aStrValue.matchAsciiL( "($2)", 4 ))
{
String aResStr = String( FwkResId( STR_CLOSEDOC_ANDRETURN ));
- rtl::OUString aTmp( aResStr );
+ OUString aTmp( aResStr );
aTmp += aStrValue.copy( 4 );
aStrValue = aTmp;
}
else if ( aStrValue.matchAsciiL( "($3)", 4 ))
{
String aResStr = String( FwkResId( STR_SAVECOPYDOC ));
- rtl::OUString aTmp( aResStr );
+ OUString aTmp( aResStr );
aTmp += aStrValue.copy( 4 );
aStrValue = aTmp;
}
- ::rtl::OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) );
+ OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) );
m_pToolbar->SetItemText( m_nID, aText );
m_pToolbar->SetQuickHelpText( m_nID, aText );
}
@@ -297,7 +297,7 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
return 0;
}
-MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
+MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand, const OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
{
}
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index eb6ad5b1ee22..28a67b95a603 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -63,7 +63,6 @@ using namespace com::sun::star::frame;
using namespace com::sun::star::beans;
using namespace com::sun::star::util;
-using ::rtl::OUString;
namespace framework
{
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index cf9b635b998e..5b1059c0d513 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -67,7 +67,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::document;
-using ::rtl::OUString;
namespace framework
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index f33861399a98..f2032c79cf06 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -47,7 +47,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController
DEFINE_INIT_SERVICE ( LogoImageStatusbarController, {} )
LogoImageStatusbarController::LogoImageStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) :
- svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 )
+ svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 )
{
Image aImage( FwlResId( RID_IMAGE_STATUSBAR_LOGO ));
m_aLogoImage = aImage;
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index b85d3ed8330e..32259c20e9ef 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -48,7 +48,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController
DEFINE_INIT_SERVICE ( LogoTextStatusbarController, {} )
LogoTextStatusbarController::LogoTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) :
- svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 )
+ svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 )
{
m_aLogoText = String( FwlResId( STR_STATUSBAR_LOGOTEXT ));
}
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 58641d100d4d..0450d8646f64 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -86,7 +86,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
return;
// insert basic
- rtl::OUString aCommand(".uno:MacroDialog");
+ OUString aCommand(".uno:MacroDialog");
String aDisplayName = RetrieveLabelFromCommand( aCommand );
pPopupMenu->InsertItem( 2, aDisplayName );
pPopupMenu->SetItemCommand( 2, aCommand );
@@ -130,7 +130,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc
// need to requery, since we handle more than one type of Command
// if we don't do this only .uno:ScriptOrganizer commands are executed
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
- Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
if( xDispatch.is() )
{
ExecuteInfo* pExecuteInfo = new ExecuteInfo;
@@ -165,10 +165,10 @@ String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
{
- const rtl::OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
- const rtl::OUString ellipsis( "..." );
- const rtl::OUString providerKey("com.sun.star.script.provider.ScriptProviderFor");
- const rtl::OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider");
+ const OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
+ const OUString ellipsis( "..." );
+ const OUString providerKey("com.sun.star.script.provider.ScriptProviderFor");
+ const OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider");
sal_uInt16 itemId = startItemId;
Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
@@ -180,7 +180,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
{
break;
}
- Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames();
+ Sequence< OUString > serviceNames = xServiceInfo->getSupportedServiceNames();
if ( serviceNames.getLength() > 0 )
{
@@ -188,10 +188,10 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
{
if ( serviceNames[ index ].indexOf( providerKey ) == 0 )
{
- ::rtl::OUString serviceName = serviceNames[ index ];
+ OUString serviceName = serviceNames[ index ];
String aCommand = aCmdBase;
String aDisplayName = String( serviceName.copy( providerKey.getLength() ) );
- if( aDisplayName.Equals( rtl::OUString("Java") ) || aDisplayName.Equals( rtl::OUString("Basic") ) )
+ if( aDisplayName.Equals( OUString("Java") ) || aDisplayName.Equals( OUString("Basic") ) )
{
// no entries for Java & Basic added elsewhere
break;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 241f9275daa4..e90d85990836 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -127,7 +127,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt
virtual ~StringLength() {}
// XStringWidth
- sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString )
+ sal_Int32 SAL_CALL queryStringWidth( const OUString& aString )
throw (RuntimeException)
{
return aString.getLength();
@@ -170,7 +170,7 @@ MenuBarManager::MenuBarManager(
const Reference< XFrame >& rFrame,
const Reference< XURLTransformer >& _xURLTransformer,
const Reference< XDispatchProvider >& rDispatchProvider,
- const rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
: ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject()
, m_bDisposed( sal_False )
@@ -466,7 +466,7 @@ void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
throw ( RuntimeException )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" );
- ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete;
+ OUString aFeatureURL = Event.FeatureURL.Complete;
SolarMutexGuard aSolarGuard;
{
@@ -485,7 +485,7 @@ throw ( RuntimeException )
sal_Bool bCheckmark( sal_False );
sal_Bool bMenuItemEnabled( m_pVCLMenu->IsItemEnabled( pMenuItemHandler->nItemId ));
sal_Bool bEnabledItem( Event.IsEnabled );
- rtl::OUString aItemText;
+ OUString aItemText;
status::Visibility aVisibilityStatus;
#ifdef UNIX
@@ -518,22 +518,22 @@ throw ( RuntimeException )
if ( aItemText.matchAsciiL( "($1)", 4 ))
{
String aResStr = String( FwkResId( STR_UPDATEDOC ));
- rtl::OUString aTmp( aResStr );
- aTmp += rtl::OUString( " " );
+ OUString aTmp( aResStr );
+ aTmp += OUString( " " );
aTmp += aItemText.copy( 4 );
aItemText = aTmp;
}
else if ( aItemText.matchAsciiL( "($2)", 4 ))
{
String aResStr = String( FwkResId( STR_CLOSEDOC_ANDRETURN ));
- rtl::OUString aTmp( aResStr );
+ OUString aTmp( aResStr );
aTmp += aItemText.copy( 4 );
aItemText = aTmp;
}
else if ( aItemText.matchAsciiL( "($3)", 4 ))
{
String aResStr = String( FwkResId( STR_SAVECOPYDOC ));
- rtl::OUString aTmp( aResStr );
+ OUString aTmp( aResStr );
aTmp += aItemText.copy( 4 );
aItemText = aTmp;
}
@@ -758,7 +758,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
sal_uInt16 nNewItemId( 0 );
sal_uInt16 nInsertPos( MENU_APPEND );
sal_uInt16 nBeforePos( MENU_APPEND );
- String aCommandBefore( rtl::OUString(".uno:About"));
+ String aCommandBefore( OUString(".uno:About"));
for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ )
{
sal_uInt16 nItemId = pMenu->GetItemId( n );
@@ -802,7 +802,7 @@ private:
virtual ~QuietInteractionContext() {}
virtual com::sun::star::uno::Any SAL_CALL getValueByName(
- rtl::OUString const & Name)
+ OUString const & Name)
throw (com::sun::star::uno::RuntimeException)
{
return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is()
@@ -845,7 +845,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
m_bActive = sal_True;
- ::rtl::OUString aMenuCommand( m_aMenuItemCommand );
+ OUString aMenuCommand( m_aMenuItemCommand );
if ( m_aMenuItemCommand == aSpecialWindowMenu || m_aMenuItemCommand == aSlotSpecialWindowMenu || aMenuCommand == aSpecialWindowCommand )
MenuManager::UpdateSpecialWindowMenu( pMenu, comphelper::getComponentContext(getServiceFactory()), m_aLock );
@@ -926,11 +926,11 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
{
Reference< XDispatch > xMenuItemDispatch;
- ::rtl::OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId );
+ OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId );
if ( aItemCommand.isEmpty() )
{
- aItemCommand = ::rtl::OUString( "slot:" );
- aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId );
+ aItemCommand = OUString( "slot:" );
+ aItemCommand += OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId );
pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
}
@@ -947,11 +947,11 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
if ( m_bIsBookmarkMenu )
xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, pMenuItemHandler->aTargetFrame, 0 );
else
- xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
sal_Bool bPopupMenu( sal_False );
if ( !pMenuItemHandler->xPopupMenuController.is() &&
- m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ))
+ m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() ))
{
bPopupMenu = CreatePopupMenuController( pMenuItemHandler );
}
@@ -1104,8 +1104,8 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
{
// bookmark menu item selected
aArgs.realloc( 1 );
- aArgs[0].Name = ::rtl::OUString( "Referer" );
- aArgs[0].Value <<= ::rtl::OUString( SFX_REFERER_USER );
+ aArgs[0].Name = OUString( "Referer" );
+ aArgs[0].Value <<= OUString( SFX_REFERER_USER );
}
xDispatch = pMenuItemHandler->xMenuItemDispatch;
@@ -1183,16 +1183,16 @@ String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL )
sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CreatePopupMenuController" );
- rtl::OUString aItemCommand( pMenuItemHandler->aMenuItemURL );
+ OUString aItemCommand( pMenuItemHandler->aMenuItemURL );
// Try instantiate a popup menu controller. It is stored in the menu item handler.
Sequence< Any > aSeq( 2 );
PropertyValue aPropValue;
- aPropValue.Name = rtl::OUString( "ModuleName" );
+ aPropValue.Name = OUString( "ModuleName" );
aPropValue.Value <<= m_aModuleIdentifier;
aSeq[0] <<= aPropValue;
- aPropValue.Name = rtl::OUString( "Frame" );
+ aPropValue.Name = OUString( "Frame" );
aPropValue.Value <<= m_xFrame;
aSeq[1] <<= aPropValue;
@@ -1217,7 +1217,7 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa
return sal_False;
}
-void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const rtl::OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren )
+void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuManager" );
m_xFrame = rFrame;
@@ -1245,7 +1245,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
{
sal_uInt16 nItemId = pMenu->GetItemId( nPos );
- ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId );
+ OUString aCommand = pMenu->GetItemCommand( nItemId );
if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand)
{
// Retrieve addon popup menus and add them to our menu bar
@@ -1265,7 +1265,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
String aEmpty;
sal_Bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
sal_uInt16 nItemCount = pMenu->GetItemCount();
- ::rtl::OUString aItemCommand;
+ OUString aItemCommand;
m_aMenuItemHandlerVector.reserve(nItemCount);
for ( sal_uInt16 i = 0; i < nItemCount; i++ )
{
@@ -1298,7 +1298,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
if ( pPopup )
{
// Retrieve module identifier from Help Command entry
- rtl::OUString aModuleIdentifier( rModuleIdentifier );
+ OUString aModuleIdentifier( rModuleIdentifier );
if ( pMenu->GetHelpCommand( nItemId ).Len() > 0 )
{
aModuleIdentifier = pMenu->GetHelpCommand( nItemId );
@@ -1307,7 +1307,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
if ( m_xPopupMenuControllerRegistration.is() &&
pPopup->GetItemCount() == 0 &&
- m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() )
+ m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() )
)
{
// Check if we have to create a popup menu for a uno based popup menu controller.
@@ -1368,9 +1368,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
// Set item command for popup menu to enable it for GetImageFromURL
- const ::rtl::OUString aSlotString( "slot:" );
- ::rtl::OUString aNewItemCommand( aSlotString );
- aNewItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
+ const OUString aSlotString( "slot:" );
+ OUString aNewItemCommand( aSlotString );
+ aNewItemCommand += OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand );
}
else
@@ -1384,7 +1384,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
{
MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), m_xFrame, m_xURLTransformer,pSubMenu, sal_True, sal_False );
AddMenu(pSubMenuManager,aItemCommand,nItemId);
- pSubMenuManager->m_aMenuItemCommand = ::rtl::OUString();
+ pSubMenuManager->m_aMenuItemCommand = OUString();
// Set image for the addon popup menu item
if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
@@ -1411,7 +1411,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
{
// Add-Ons uses images from different places
Image aImage;
- rtl::OUString aImageId;
+ OUString aImageId;
MenuConfiguration::Attributes* pMenuAttributes =
(MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId );
@@ -1441,7 +1441,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
pItemHandler->aMenuItemURL = aItemCommand;
if ( m_xPopupMenuControllerRegistration.is() &&
- m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ))
+ m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() ))
{
// Check if we have to create a popup menu for a uno based popup menu controller.
// We have to set an empty popup menu into our menu structure so the controller also
@@ -1488,7 +1488,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
const Reference< XAcceleratorConfiguration >& rAccelCfg,
- const Sequence< rtl::OUString >& rCommands,
+ const Sequence< OUString >& rCommands,
std::vector< MenuItemHandler* >& aMenuShortCuts )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::impl_RetrieveShortcutsFromConfiguration" );
@@ -1590,7 +1590,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
}
KeyCode aEmptyKeyCode;
- Sequence< rtl::OUString > aSeq( aMenuShortCuts.size() );
+ Sequence< OUString > aSeq( aMenuShortCuts.size() );
const sal_uInt32 nCount = aMenuShortCuts.size();
for ( sal_uInt32 i = 0; i < nCount; ++i )
{
@@ -1659,7 +1659,7 @@ void MenuBarManager::RetrieveImageManagers()
void MenuBarManager::FillMenuWithConfiguration(
sal_uInt16& nId,
Menu* pMenu,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const Reference< XIndexAccess >& rItemContainer,
const Reference< XURLTransformer >& rTransformer )
{
@@ -1695,7 +1695,7 @@ void MenuBarManager::FillMenuWithConfiguration(
void MenuBarManager::FillMenu(
sal_uInt16& nId,
Menu* pMenu,
- const rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const Reference< XIndexAccess >& rItemContainer,
const Reference< XDispatchProvider >& rDispatchProvider )
{
@@ -1704,10 +1704,10 @@ void MenuBarManager::FillMenu(
for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
{
Sequence< PropertyValue > aProp;
- rtl::OUString aCommandURL;
- rtl::OUString aLabel;
- rtl::OUString aHelpURL;
- rtl::OUString aModuleIdentifier( rModuleIdentifier );
+ OUString aCommandURL;
+ OUString aLabel;
+ OUString aHelpURL;
+ OUString aModuleIdentifier( rModuleIdentifier );
sal_Bool bShow(sal_True);
sal_Bool bEnabled(sal_True);
sal_uInt16 nType = 0;
@@ -1720,7 +1720,7 @@ void MenuBarManager::FillMenu(
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- rtl::OUString aPropName = aProp[i].Name;
+ OUString aPropName = aProp[i].Name;
if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_COMMANDURL, LEN_DESCRIPTOR_COMMANDURL ))
aProp[i].Value >>= aCommandURL;
else if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, LEN_DESCRIPTOR_HELPURL ))
@@ -1806,7 +1806,7 @@ void MenuBarManager::FillMenu(
void MenuBarManager::MergeAddonMenus(
Menu* pMenuBar,
const MergeMenuInstructionContainer& aMergeInstructionContainer,
- const ::rtl::OUString& rModuleIdentifier )
+ const OUString& rModuleIdentifier )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MergeAddonMenus" );
// set start value for the item ID for the new addon menu items
@@ -1819,7 +1819,7 @@ void MenuBarManager::MergeAddonMenus(
if ( MenuBarMerger::IsCorrectContext( rMergeInstruction.aMergeContext, rModuleIdentifier ))
{
- ::std::vector< ::rtl::OUString > aMergePath;
+ ::std::vector< OUString > aMergePath;
// retrieve the merge path from the merge point string
MenuBarMerger::RetrieveReferencePath( rMergeInstruction.aMergePoint, aMergePath );
@@ -1939,8 +1939,8 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
// 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:" );
- rtl::OUString aMenuURL( pItemHandler->aMenuItemURL );
+ OUString aMainURL( "vnd.sun.star.popup:" );
+ OUString aMenuURL( pItemHandler->aMenuItemURL );
nSchemePart = aMenuURL.indexOf( ':' );
if (( nSchemePart > 0 ) &&
@@ -1970,7 +1970,7 @@ const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory()
return mxServiceFactory;
}
-void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId)
+void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::AddMenu" );
Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
@@ -1987,7 +1987,7 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUStri
m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
}
-sal_uInt16 MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const
+sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillItemCommand" );
sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
@@ -1995,9 +1995,9 @@ sal_uInt16 MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand, Menu*
_rItemCommand = _pMenu->GetItemCommand( nItemId );
if ( _rItemCommand.isEmpty() )
{
- const static ::rtl::OUString aSlotString( "slot:" );
+ const static OUString aSlotString( "slot:" );
_rItemCommand = aSlotString;
- _rItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId );
+ _rItemCommand += OUString::valueOf( (sal_Int32)nItemId );
_pMenu->SetItemCommand( nItemId, _rItemCommand );
}
return nItemId;
@@ -2013,13 +2013,13 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
m_bInitialized = sal_False;
m_bIsBookmarkMenu = sal_True;
- rtl::OUString aModuleIdentifier;
+ OUString aModuleIdentifier;
m_xPopupMenuControllerRegistration = PopupMenuControllerFactory::create( comphelper::getComponentContext(getServiceFactory()) );
Reference< XStatusListener > xStatusListener;
Reference< XDispatch > xDispatch;
sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
- ::rtl::OUString aItemCommand;
+ OUString aItemCommand;
m_aMenuItemHandlerVector.reserve(nItemCount);
for ( sal_uInt16 i = 0; i < nItemCount; i++ )
{
@@ -2062,7 +2062,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
// We have to set an empty popup menu into our menu structure so the controller also
// works with inplace OLE.
if ( m_xPopupMenuControllerRegistration.is() &&
- m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ))
+ m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() ))
{
VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu;
PopupMenu* pCtlPopupMenu = (PopupMenu *)pVCLXPopupMenu->GetMenu();
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 80fefdfbad11..8d5569fb3fa6 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -63,14 +63,14 @@ namespace framework
description of com::sun::star::frame::XModuleManager.
*/
-bool MenuBarMerger::IsCorrectContext( const ::rtl::OUString& rContext, const ::rtl::OUString& rModuleIdentifier )
+bool MenuBarMerger::IsCorrectContext( const OUString& rContext, const OUString& rModuleIdentifier )
{
return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 ));
}
void MenuBarMerger::RetrieveReferencePath(
- const ::rtl::OUString& rReferencePathString,
- ::std::vector< ::rtl::OUString >& rReferencePath )
+ const OUString& rReferencePathString,
+ ::std::vector< OUString >& rReferencePath )
{
const sal_Char aDelimiter = '\\';
@@ -78,7 +78,7 @@ void MenuBarMerger::RetrieveReferencePath(
sal_Int32 nIndex( 0 );
do
{
- ::rtl::OUString aToken = rReferencePathString.getToken( 0, aDelimiter, nIndex );
+ OUString aToken = rReferencePathString.getToken( 0, aDelimiter, nIndex );
if ( !aToken.isEmpty() )
rReferencePath.push_back( aToken );
}
@@ -86,7 +86,7 @@ void MenuBarMerger::RetrieveReferencePath(
}
ReferencePathInfo MenuBarMerger::FindReferencePath(
- const ::std::vector< ::rtl::OUString >& rReferencePath,
+ const ::std::vector< OUString >& rReferencePath,
Menu* pMenu )
{
sal_uInt32 i( 0 );
@@ -107,7 +107,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
do
{
++nLevel;
- ::rtl::OUString aCmd( rReferencePath[i] );
+ OUString aCmd( rReferencePath[i] );
if ( i == nCount-1 )
{
@@ -148,14 +148,14 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
return aResult;
}
-sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, Menu* pCurrMenu )
+sal_uInt16 MenuBarMerger::FindMenuItem( const OUString& rCmd, Menu* pCurrMenu )
{
for ( sal_uInt16 i = 0; i < pCurrMenu->GetItemCount(); i++ )
{
const sal_uInt16 nItemId = pCurrMenu->GetItemId( i );
if ( nItemId > 0 )
{
- if ( rCmd == ::rtl::OUString( pCurrMenu->GetItemCommand( nItemId )))
+ if ( rCmd == OUString( pCurrMenu->GetItemCommand( nItemId )))
return i;
}
}
@@ -166,7 +166,7 @@ sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, Menu* pCurr
bool MenuBarMerger::CreateSubMenu(
Menu* pSubMenu,
sal_uInt16& nItemId,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonSubMenu )
{
const sal_uInt32 nSize = rAddonSubMenu.size();
@@ -206,7 +206,7 @@ bool MenuBarMerger::MergeMenuItems(
sal_uInt16 nPos,
sal_uInt16 nModIndex,
sal_uInt16& nItemId,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems )
{
sal_uInt16 nIndex( 0 );
@@ -247,7 +247,7 @@ bool MenuBarMerger::ReplaceMenuItem(
Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16& rItemId,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems )
{
// There is no replace available. Therfore we first have to
@@ -260,7 +260,7 @@ bool MenuBarMerger::ReplaceMenuItem(
bool MenuBarMerger::RemoveMenuItems(
Menu* pMenu,
sal_uInt16 nPos,
- const ::rtl::OUString& rMergeCommandParameter )
+ const OUString& rMergeCommandParameter )
{
const sal_uInt16 nParam( sal_uInt16( rMergeCommandParameter.toInt32() ));
sal_uInt16 nCount( 1 );
@@ -281,9 +281,9 @@ bool MenuBarMerger::ProcessMergeOperation(
Menu* pMenu,
sal_uInt16 nPos,
sal_uInt16& nItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems )
{
sal_uInt16 nModIndex( 0 );
@@ -313,10 +313,10 @@ bool MenuBarMerger::ProcessMergeOperation(
bool MenuBarMerger::ProcessFallbackOperation(
const ReferencePathInfo& aRefPathInfo,
sal_uInt16& rItemId,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
- const ::std::vector< ::rtl::OUString >& rReferencePath,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,
+ const ::std::vector< OUString >& rReferencePath,
+ const OUString& rModuleIdentifier,
const AddonMenuContainer& rAddonMenuItems )
{
if (( rMergeFallback.equalsAsciiL( MERGEFALLBACK_IGNORE, MERGEFALLBACK_IGNORE_LEN )) ||
@@ -355,7 +355,7 @@ bool MenuBarMerger::ProcessFallbackOperation(
}
else
{
- const ::rtl::OUString aCmd( rReferencePath[nLevel] );
+ const OUString aCmd( rReferencePath[nLevel] );
sal_uInt16 nInsPos( MENU_APPEND );
PopupMenu* pPopupMenu( new PopupMenu );
@@ -397,7 +397,7 @@ void MenuBarMerger::GetMenuEntry(
for ( sal_Int32 i = 0; i < rAddonMenuEntry.getLength(); i++ )
{
- ::rtl::OUString aMenuEntryPropName = rAddonMenuEntry[i].Name;
+ OUString aMenuEntryPropName = rAddonMenuEntry[i].Name;
if ( aMenuEntryPropName.equalsAsciiL( ADDONSMENUITEM_STRING_URL, ADDONSMENUITEM_URL_LEN ))
rAddonMenuEntry[i].Value >>= rAddonMenuItem.aURL;
else if ( aMenuEntryPropName.equalsAsciiL( ADDONSMENUITEM_STRING_TITLE, ADDONSMENUITEM_TITLE_LEN ))
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 636d72846844..d41acc182b0d 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -124,7 +124,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
if ( !m_bInitialized )
{
- rtl::OUString aModuleIdentifier;
+ OUString aModuleIdentifier;
UIConfigElementWrapperBase::initialize( aArguments );
Reference< XFrame > xFrame( m_xWeakFrame );
@@ -276,7 +276,7 @@ throw (::com::sun::star::uno::RuntimeException)
// XNameAccess
Any SAL_CALL MenuBarWrapper::getByName(
- const ::rtl::OUString& aName )
+ const OUString& aName )
throw ( container::NoSuchElementException,
lang::WrappedTargetException,
uno::RuntimeException)
@@ -299,7 +299,7 @@ throw ( container::NoSuchElementException,
throw container::NoSuchElementException();
}
-Sequence< ::rtl::OUString > SAL_CALL MenuBarWrapper::getElementNames()
+Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames()
throw (::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
@@ -309,7 +309,7 @@ throw (::com::sun::star::uno::RuntimeException)
fillPopupControllerCache();
- Sequence< rtl::OUString > aSeq( m_aPopupControllerCache.size() );
+ Sequence< OUString > aSeq( m_aPopupControllerCache.size() );
sal_Int32 i( 0 );
PopupControllerCache::const_iterator pIter = m_aPopupControllerCache.begin();
@@ -323,7 +323,7 @@ throw (::com::sun::star::uno::RuntimeException)
}
::sal_Bool SAL_CALL MenuBarWrapper::hasByName(
- const ::rtl::OUString& aName )
+ const OUString& aName )
throw (::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index bddc886594b0..15c749548ef0 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -84,7 +84,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
if ( bSetImages )
{
sal_Bool bImageSet( sal_False );
- ::rtl::OUString aImageId;
+ OUString aImageId;
AddInfoForId::const_iterator pInfo = m_aAddInfoForItem.find( nItemId );
if ( pInfo != m_aAddInfoForItem.end() )
@@ -121,7 +121,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const
sal_uInt16 nCount( pPopupMenu->GetItemCount() );
sal_uInt16 nId( 0 );
sal_Bool bFound( sal_False );
- rtl::OUString aCommand;
+ OUString aCommand;
if ( !m_aEmptyDocURL.isEmpty() )
{
@@ -146,7 +146,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const
if ( !bFound )
{
// Search for the default module name
- rtl::OUString aDefaultModuleName( SvtModuleOptions().GetDefaultModuleName() );
+ OUString aDefaultModuleName( SvtModuleOptions().GetDefaultModuleName() );
if ( !aDefaultModuleName.isEmpty() )
{
for ( sal_uInt32 i = 0; i < sal_uInt32( nCount ); i++ )
@@ -223,7 +223,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
KeyCode aEmptyKeyCode;
sal_uInt32 nItemCount( pPopupMenu->GetItemCount() );
std::vector< KeyCode > aMenuShortCuts;
- std::vector< rtl::OUString > aCmds;
+ std::vector< OUString > aCmds;
std::vector< sal_uInt32 > aIds;
for ( sal_uInt32 i = 0; i < nItemCount; i++ )
{
@@ -241,7 +241,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
if ( m_bNewMenu )
nSeqCount+=1;
- Sequence< rtl::OUString > aSeq( nSeqCount );
+ Sequence< OUString > aSeq( nSeqCount );
// Add a special command for our "New" menu.
if ( m_bNewMenu )
@@ -277,7 +277,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
void NewMenuController::retrieveShortcutsFromConfiguration(
const Reference< XAcceleratorConfiguration >& rAccelCfg,
- const Sequence< rtl::OUString >& rCommands,
+ const Sequence< OUString >& rCommands,
std::vector< KeyCode >& aMenuShortCuts )
{
if ( rAccelCfg.is() )
@@ -418,10 +418,10 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
xURLTransformer->parseStrict( aTargetURL );
- aArgsList[0].Name = ::rtl::OUString( "Referer" );
- aArgsList[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER ));
+ aArgsList[0].Name = OUString( "Referer" );
+ aArgsList[0].Value = makeAny( OUString(SFX_REFERER_USER ));
- rtl::OUString aTargetFrame( m_aTargetFrame );
+ OUString aTargetFrame( m_aTargetFrame );
AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId );
if ( pItem != m_aAddInfoForItem.end() )
aTargetFrame = pItem->second.aTargetFrame;
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index ad6a0c1b5832..452667a23417 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -80,7 +80,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed:
if ( pVCLPopupMenu )
{
- const rtl::OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" );
+ const OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" );
for ( sal_uInt16 i = 0; i < rVerbCommandSeq.getLength(); i++ )
{
const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i];
@@ -89,8 +89,8 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed:
m_xPopupMenu->insertItem( i+1, rVerb.VerbName, 0, i );
// use VCL popup menu pointer to set vital information that are not part of the awt implementation
- rtl::OUString aCommand( aVerbCommand );
- aCommand += rtl::OUString::valueOf( rVerb.VerbID );
+ OUString aCommand( aVerbCommand );
+ aCommand += OUString::valueOf( rVerb.VerbID );
pVCLPopupMenu->SetItemCommand( i+1, aCommand ); // Store verb command
}
}
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 468f1512bf88..e22e79f44625 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -34,7 +34,6 @@
#include "uielement/popupmenucontroller.hxx"
#include "services.h"
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 6eaa200e0928..7d6a931adb1d 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -83,7 +83,7 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const
}
// wrapped methods of ::com::sun::star::task::XStatusIndicator
-void ProgressBarWrapper::start( const ::rtl::OUString& Text, ::sal_Int32 Range )
+void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
throw (uno::RuntimeException)
{
uno::Reference< awt::XWindow > xWindow;
@@ -152,7 +152,7 @@ throw (uno::RuntimeException)
}
}
-void ProgressBarWrapper::setText( const ::rtl::OUString& Text )
+void ProgressBarWrapper::setText( const OUString& Text )
throw (uno::RuntimeException)
{
uno::Reference< awt::XWindow > xWindow;
@@ -194,7 +194,7 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
throw (uno::RuntimeException)
{
uno::Reference< awt::XWindow > xWindow;
- rtl::OUString aText;
+ OUString aText;
sal_Bool bSetValue( sal_False );
{
@@ -239,7 +239,7 @@ throw (uno::RuntimeException)
void ProgressBarWrapper::reset()
throw (uno::RuntimeException)
{
- setText( rtl::OUString() );
+ setText( OUString() );
setValue( 0 );
}
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 59d6fe5c16d0..5e09180bde65 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -148,24 +148,24 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
aMenuShortCut.append( ": " );
}
- rtl::OUStringBuffer aStrBuffer;
+ OUStringBuffer aStrBuffer;
aStrBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( CMD_PREFIX ) );
aStrBuffer.append( sal_Int32( i ) );
- rtl::OUString aURLString( aStrBuffer.makeStringAndClear() );
+ OUString aURLString( aStrBuffer.makeStringAndClear() );
// Abbreviate URL
- rtl::OUString aTipHelpText;
- rtl::OUString aMenuTitle;
+ OUString aTipHelpText;
+ OUString aMenuTitle;
INetURLObject aURL( m_aRecentFilesItems[i].aURL );
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 aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
+ OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
aTipHelpText = aSystemPath;
- ::rtl::OUString aCompactedSystemPath;
+ OUString aCompactedSystemPath;
if ( osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, MAX_STR_WIDTH, NULL ) == osl_File_E_None )
aMenuTitle = aCompactedSystemPath;
else
@@ -190,7 +190,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ),
String( FwkResId( STR_CLEAR_RECENT_FILES ) ) );
pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) );
+ OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) );
pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ),
String( FwkResId( STR_CLEAR_RECENT_FILES_HELP ) ) );
}
@@ -290,9 +290,9 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve
if ( xMenuExt.is() )
{
- const rtl::OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) );
+ const OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) );
OSL_TRACE( "RecentFilesMenuController::select() - Command : %s",
- rtl::OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMD_CLEAR_LIST ) ) )
SvtHistoryOptions().Clear( ePICKLIST );
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index efccbf2a6fd5..4b295bf6458b 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -530,15 +530,15 @@ OUString SpinfieldToolbarController::impl_formatOutputString( double fValue )
// is 32 bit on Unix platform!
char aBuffer[128];
- ::rtl::OString aFormat = OUStringToOString( m_aOutFormat, osl_getThreadTextEncoding() );
+ OString aFormat = OUStringToOString( m_aOutFormat, osl_getThreadTextEncoding() );
if ( m_bFloat )
snprintf( aBuffer, 128, aFormat.getStr(), fValue );
else
snprintf( aBuffer, 128, aFormat.getStr(), static_cast<long>( fValue ));
sal_Int32 nSize = strlen( aBuffer );
- rtl::OString aTmp( aBuffer, nSize );
- return rtl::OStringToOUString( aTmp, osl_getThreadTextEncoding() );
+ OString aTmp( aBuffer, nSize );
+ return OStringToOUString( aTmp, osl_getThreadTextEncoding() );
#endif
}
}
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index e5250ed4486f..267f8c0a89af 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -45,7 +45,7 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper()
void SAL_CALL StatusIndicatorInterfaceWrapper::start(
- const ::rtl::OUString& sText,
+ const OUString& sText,
sal_Int32 nRange )
throw( ::com::sun::star::uno::RuntimeException )
{
@@ -83,7 +83,7 @@ throw( ::com::sun::star::uno::RuntimeException )
}
void SAL_CALL StatusIndicatorInterfaceWrapper::setText(
- const ::rtl::OUString& sText )
+ const OUString& sText )
throw( ::com::sun::star::uno::RuntimeException )
{
Reference< XComponent > xComp( m_xStatusIndicatorImpl );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 661942c9ee5c..58cc63824790 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -77,7 +77,6 @@
// namespaces
//_________________________________________________________________________________________________________________
-using rtl::OUString;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
@@ -172,7 +171,7 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager
{
try
{
- xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )) >>= xLayoutManager;
+ xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager;
}
catch (const RuntimeException&)
{
@@ -210,7 +209,7 @@ DEFINE_XTYPEPROVIDER_6 ( ToolBarManager
ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServiceManager,
const Reference< XFrame >& rFrame,
- const rtl::OUString& rResourceName,
+ const OUString& rResourceName,
ToolBar* pToolBar ) :
ThreadHelpBase( &Application::GetSolarMutex() ),
OWeakObject(),
@@ -259,7 +258,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
// enables a menu for clipped items and customization
SvtCommandOptions aCmdOptions;
sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
- if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString("CreateDialog")))
+ if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, OUString("CreateDialog")))
nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) );
@@ -271,9 +270,9 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
// set name for testtool, the useful part is after the last '/'
sal_Int32 idx = rResourceName.lastIndexOf('/');
idx++; // will become 0 if '/' not found: use full string
- ::rtl::OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL );
- ::rtl::OUString aToolbarName = rResourceName.copy( idx );
- aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );;
+ OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL );
+ OUString aToolbarName = rResourceName.copy( idx );
+ aHelpIdAsString += OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );;
m_pToolBar->SetHelpId( aHelpIdAsString );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
@@ -375,7 +374,7 @@ void ToolBarManager::RefreshImages()
if ( nId > 0 )
{
- ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+ OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages );
// Try also to query for add-on images before giving up and use an
// empty image.
@@ -397,24 +396,24 @@ void ToolBarManager::UpdateImageOrientation()
if ( m_xUICommandLabels.is() )
{
sal_Int32 i;
- Sequence< rtl::OUString > aSeqMirrorCmd;
- Sequence< rtl::OUString > aSeqRotateCmd;
+ Sequence< OUString > aSeqMirrorCmd;
+ Sequence< OUString > aSeqRotateCmd;
m_xUICommandLabels->getByName(
- rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aSeqMirrorCmd;
+ OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aSeqMirrorCmd;
m_xUICommandLabels->getByName(
- rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aSeqRotateCmd;
+ OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aSeqRotateCmd;
CommandToInfoMap::iterator pIter;
for ( i = 0; i < aSeqMirrorCmd.getLength(); i++ )
{
- rtl::OUString aMirrorCmd = aSeqMirrorCmd[i];
+ OUString aMirrorCmd = aSeqMirrorCmd[i];
pIter = m_aCommandMap.find( aMirrorCmd );
if ( pIter != m_aCommandMap.end() )
pIter->second.bMirrored = sal_True;
}
for ( i = 0; i < aSeqRotateCmd.getLength(); i++ )
{
- rtl::OUString aRotateCmd = aSeqRotateCmd[i];
+ OUString aRotateCmd = aSeqRotateCmd[i];
pIter = m_aCommandMap.find( aRotateCmd );
if ( pIter != m_aCommandMap.end() )
pIter->second.bRotated = sal_True;
@@ -426,7 +425,7 @@ void ToolBarManager::UpdateImageOrientation()
sal_uInt16 nId = m_pToolBar->GetItemId( nPos );
if ( nId > 0 )
{
- rtl::OUString aCmd = m_pToolBar->GetItemCommand( nId );
+ OUString aCmd = m_pToolBar->GetItemCommand( nId );
CommandToInfoMap::const_iterator pIter = m_aCommandMap.find( aCmd );
if ( pIter != m_aCommandMap.end() )
@@ -455,7 +454,7 @@ void ToolBarManager::UpdateControllers()
Reference< XLayoutManager > xLayoutManager;
Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY );
if ( xFramePropSet.is() )
- a = xFramePropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ));
+ a = xFramePropSet->getPropertyValue( OUString( "LayoutManager" ));
a >>= xLayoutManager;
Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
if ( xLayoutManager.is() && xDockable.is() )
@@ -723,7 +722,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
if ( xIfacDocImgMgr == Event.Source )
nImageInfo = 0;
- Sequence< rtl::OUString > aSeq = xNameAccess->getElementNames();
+ Sequence< OUString > aSeq = xNameAccess->getElementNames();
for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
{
CommandToInfoMap::iterator pIter = m_aCommandMap.find( aSeq[i] );
@@ -737,7 +736,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
// Special case: An image from the document image manager has been removed.
// It is possible that we have a image at our module image manager. Before
// we can remove our image we have to ask our module image manager.
- Sequence< rtl::OUString > aCmdURLSeq( 1 );
+ Sequence< OUString > aCmdURLSeq( 1 );
Sequence< Reference< XGraphic > > aGraphicSeq;
aCmdURLSeq[0] = pIter->first;
aGraphicSeq = m_xModuleImageManager->getImages( nImageType, aCmdURLSeq );
@@ -809,7 +808,7 @@ void ToolBarManager::RemoveControllers()
m_aControllerMap.clear();
}
-uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL )
+uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const OUString& rCmdURL )
{
Sequence< PropertyValue > aPropSeq;
@@ -844,9 +843,9 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
return aPropSeq;
}
-::rtl::OUString ToolBarManager::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL )
+OUString ToolBarManager::RetrieveLabelFromCommand( const OUString& aCmdURL )
{
- ::rtl::OUString aLabel;
+ OUString aLabel;
Sequence< PropertyValue > aPropSeq;
// Retrieve popup menu labels
@@ -862,7 +861,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
return aLabel;
}
-sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString& aCmdURL )
+sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const OUString& aCmdURL )
{
sal_Int32 nProperties(0);
Sequence< PropertyValue > aPropSeq;
@@ -899,8 +898,8 @@ void ToolBarManager::CreateControllers()
if ( nId == 0 )
continue;
- rtl::OUString aLoadURL( ".uno:OpenUrl" );
- rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId ));
+ OUString aLoadURL( ".uno:OpenUrl" );
+ OUString aCommandURL( m_pToolBar->GetItemCommand( nId ));
sal_Bool bInit( sal_True );
sal_Bool bCreate( sal_True );
Reference< XStatusListener > xController;
@@ -929,22 +928,22 @@ void ToolBarManager::CreateControllers()
PropertyValue aPropValue;
std::vector< Any > aPropertyVector;
- aPropValue.Name = rtl::OUString( "ModuleName" );
+ aPropValue.Name = OUString( "ModuleName" );
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( "Frame" );
+ aPropValue.Name = OUString( "Frame" );
aPropValue.Value <<= m_xFrame;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( "ServiceManager" );
+ aPropValue.Name = OUString( "ServiceManager" );
aPropValue.Value <<= m_xServiceManager;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( "ParentWindow" );
+ aPropValue.Name = OUString( "ParentWindow" );
aPropValue.Value <<= xToolbarWindow;
aPropertyVector.push_back( makeAny( aPropValue ));
if ( nWidth > 0 )
{
- aPropValue.Name = rtl::OUString( "Width" );
+ aPropValue.Name = OUString( "Width" );
aPropValue.Value <<= nWidth;
aPropertyVector.push_back( makeAny( aPropValue ));
}
@@ -968,7 +967,7 @@ void ToolBarManager::CreateControllers()
if ( m_pToolBar->GetItemData( nId ) != 0 )
{
// retrieve additional parameters
- ::rtl::OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType;
+ OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType;
Reference< XStatusListener > xStatusListener(
ToolBarMerger::CreateController( m_xServiceManager,
@@ -1013,7 +1012,7 @@ void ToolBarManager::CreateControllers()
Reference< XSubToolbarController > xSubToolBar( xController, UNO_QUERY );
if ( xSubToolBar.is() && xSubToolBar->opensSubToolbar() )
{
- rtl::OUString aSubToolBarName = xSubToolBar->getSubToolbarName();
+ OUString aSubToolBarName = xSubToolBar->getSubToolbarName();
if ( !aSubToolBarName.isEmpty() )
{
SubToolBarToSubToolBarControllerMap::iterator pIter =
@@ -1039,25 +1038,25 @@ void ToolBarManager::CreateControllers()
PropertyValue aPropValue;
std::vector< Any > aPropertyVector;
- aPropValue.Name = ::rtl::OUString( "Frame" );
+ aPropValue.Name = OUString( "Frame" );
aPropValue.Value <<= m_xFrame;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = ::rtl::OUString( "CommandURL" );
+ aPropValue.Name = OUString( "CommandURL" );
aPropValue.Value <<= aCommandURL;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = ::rtl::OUString( "ServiceManager" );
+ aPropValue.Name = OUString( "ServiceManager" );
aPropValue.Value <<= m_xServiceManager;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( "ParentWindow" );
+ aPropValue.Name = OUString( "ParentWindow" );
aPropValue.Value <<= xToolbarWindow;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( "ModuleName" );
+ aPropValue.Name = OUString( "ModuleName" );
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
if ( nWidth > 0 )
{
- aPropValue.Name = rtl::OUString( "Width" );
+ aPropValue.Name = OUString( "Width" );
aPropValue.Value <<= nWidth;
aPropertyVector.push_back( makeAny( aPropValue ));
}
@@ -1067,10 +1066,10 @@ void ToolBarManager::CreateControllers()
if (pController)
{
- if(aCommandURL == rtl::OUString( ".uno:SwitchXFormsDesignMode" ) ||
- aCommandURL == rtl::OUString( ".uno:ViewDataSourceBrowser" ) ||
- aCommandURL == rtl::OUString( ".uno:ParaLeftToRight" ) ||
- aCommandURL == rtl::OUString( ".uno:ParaRightToLeft" )
+ if(aCommandURL == OUString( ".uno:SwitchXFormsDesignMode" ) ||
+ aCommandURL == OUString( ".uno:ViewDataSourceBrowser" ) ||
+ aCommandURL == OUString( ".uno:ParaLeftToRight" ) ||
+ aCommandURL == OUString( ".uno:ParaRightToLeft" )
)
pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True));
}
@@ -1102,7 +1101,7 @@ void ToolBarManager::CreateControllers()
try
{
sal_Bool bSupportVisible = sal_True;
- Any a( xPropSet->getPropertyValue( ::rtl::OUString( "SupportsVisible" )) );
+ Any a( xPropSet->getPropertyValue( OUString( "SupportsVisible" )) );
a >>= bSupportVisible;
if (bSupportVisible)
{
@@ -1146,7 +1145,7 @@ void ToolBarManager::AddImageOrientationListener()
m_xImageOrientationListener = Reference< XComponent >( static_cast< ::cppu::OWeakObject *>(
pImageOrientation ), UNO_QUERY );
pImageOrientation->addStatusListener(
- rtl::OUString( ".uno:ImageOrientation" ));
+ OUString( ".uno:ImageOrientation" ));
pImageOrientation->bindListener();
}
}
@@ -1176,7 +1175,7 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle )
void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContainer )
{
- ::rtl::OString aTbxName = rtl::OUStringToOString( m_aResourceName, RTL_TEXTENCODING_ASCII_US );
+ OString aTbxName = OUStringToOString( m_aResourceName, RTL_TEXTENCODING_ASCII_US );
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::FillToolbar" );
RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) ::ToolBarManager::FillToolbar %s", aTbxName.getStr() );
@@ -1237,10 +1236,10 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
{
Sequence< PropertyValue > aProp;
- rtl::OUString aCommandURL;
- rtl::OUString aLabel;
- rtl::OUString aHelpURL;
- rtl::OUString aTooltip;
+ OUString aCommandURL;
+ OUString aLabel;
+ OUString aHelpURL;
+ OUString aTooltip;
sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT );
sal_uInt16 nWidth( 0 );
sal_Bool bIsVisible( sal_True );
@@ -1306,7 +1305,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() )
{
- ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
+ OUString aString( RetrieveLabelFromCommand( aCommandURL ));
sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle );
if ( aMenuDesc.is() )
@@ -1319,13 +1318,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
else
{
- ::rtl::OUString sQuickHelp( aString );
- ::rtl::OUString sShortCut;
+ OUString sQuickHelp( aString );
+ OUString sShortCut;
if( RetrieveShortcut( aCommandURL, sShortCut ) )
{
- sQuickHelp += rtl::OUString( " (" );
+ sQuickHelp += OUString( " (" );
sQuickHelp += sShortCut;
- sQuickHelp += rtl::OUString( ")" );
+ sQuickHelp += OUString( ")" );
}
m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
@@ -1390,7 +1389,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
MergeToolbarInstructionContainer aMergeInstructionContainer;
// Retrieve the toolbar name from the resource name
- ::rtl::OUString aToolbarName( m_aResourceName );
+ OUString aToolbarName( m_aResourceName );
sal_Int32 nIndex = aToolbarName.lastIndexOf( '/' );
if (( nIndex > 0 ) && ( nIndex < aToolbarName.getLength() ))
aToolbarName = aToolbarName.copy( nIndex+1 );
@@ -1463,8 +1462,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
{
try
{
- rtl::OUString aUIName;
- xPropSet->getPropertyValue( rtl::OUString( "UIName" )) >>= aUIName;
+ OUString aUIName;
+ xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName;
if ( !aUIName.isEmpty() )
m_pToolBar->SetText( aUIName );
}
@@ -1479,7 +1478,7 @@ void ToolBarManager::RequestImages()
RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::RequestImages" );
// Request images from image manager
- Sequence< rtl::OUString > aCmdURLSeq( m_aCommandMap.size() );
+ Sequence< OUString > aCmdURLSeq( m_aCommandMap.size() );
Sequence< Reference< XGraphic > > aDocGraphicSeq;
Sequence< Reference< XGraphic > > aModGraphicSeq;
@@ -1526,7 +1525,7 @@ void ToolBarManager::RequestImages()
}
}
-void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElementName, const rtl::OUString& aCommand )
+void ToolBarManager::notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand )
{
ResetableGuard aGuard( m_aLock );
if ( !m_aSubToolBarControllerMap.empty() )
@@ -1707,10 +1706,10 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
if ( m_xFrame.is() )
{
Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY );
- aURL.Complete = ::rtl::OUString( ".uno:ConfigureDialog" );
+ aURL.Complete = OUString( ".uno:ConfigureDialog" );
m_xURLTransformer->parseStrict( aURL );
if ( xProv.is() )
- xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
+ xDisp = xProv->queryDispatch( aURL, OUString(), 0 );
if ( !xDisp.is() || IsPluginMode() )
return 0;
@@ -1758,7 +1757,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
{
sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
- ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+ OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MIB_CHECKABLE );
pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
@@ -1867,10 +1866,10 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
if ( m_xFrame.is() )
{
Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY );
- aURL.Complete = ::rtl::OUString( ".uno:ConfigureDialog" );
+ aURL.Complete = OUString( ".uno:ConfigureDialog" );
m_xURLTransformer->parseStrict( aURL );
if ( xProv.is() )
- xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
+ xDisp = xProv->queryDispatch( aURL, OUString(), 0 );
}
if ( xDisp.is() )
@@ -1878,7 +1877,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
Sequence< PropertyValue > aPropSeq( 1 );
aPropSeq[ 0 ].Name =
- rtl::OUString( "ResourceURL");
+ OUString( "ResourceURL");
aPropSeq[ 0 ].Value <<= m_aResourceName;
xDisp->dispatch( aURL, aPropSeq );
@@ -1943,7 +1942,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
if(( nId > 0 ) && ( nId < TOOLBOX_MENUITEM_START ))
{
// toggle toolbar button visibility
- rtl::OUString aCommand = pMenu->GetItemCommand( nId );
+ OUString aCommand = pMenu->GetItemCommand( nId );
Reference< XLayoutManager > xLayoutManager = getLayoutManagerFromFrame( m_xFrame );
if ( xLayoutManager.is() )
@@ -1957,7 +1956,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
{
Sequence< PropertyValue > aProp;
sal_Int32 nVisibleIndex( -1 );
- rtl::OUString aCommandURL;
+ OUString aCommandURL;
sal_Bool bVisible( sal_False );
if ( xItemContainer->getByIndex( i ) >>= aProp )
@@ -1988,7 +1987,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
if ( xPropSet.is() )
{
Reference< XUIConfigurationPersistence > xUICfgMgr;
- if (( xPropSet->getPropertyValue( rtl::OUString( "ConfigurationSource" )) >>= xUICfgMgr ) && ( xUICfgMgr.is() ))
+ if (( xPropSet->getPropertyValue( OUString( "ConfigurationSource" )) >>= xUICfgMgr ) && ( xUICfgMgr.is() ))
xUICfgMgr->store();
}
}
@@ -2162,7 +2161,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
return 0;
}
-Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages )
+Image ToolBarManager::QueryAddonsImage( const OUString& aCommandURL, bool bBigImages )
{
Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages );
return aImage;
@@ -2170,8 +2169,8 @@ Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool
bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration(
const Reference< XAcceleratorConfiguration >& rAccelCfg,
- const rtl::OUString& rCommand,
- rtl::OUString& rShortCut )
+ const OUString& rCommand,
+ OUString& rShortCut )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ToolBarManager::impl_RetrieveShortcutsFromConfiguration" );
if ( rAccelCfg.is() )
@@ -2200,7 +2199,7 @@ bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration(
return false;
}
-bool ToolBarManager::RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut )
+bool ToolBarManager::RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ToolBarManager::RetrieveShortcuts" );
if ( m_bModuleIdentified )
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index dcb40869651b..9d714711d421 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -104,8 +104,8 @@ using namespace ::com::sun::star;
*/
bool ToolBarMerger::IsCorrectContext(
- const ::rtl::OUString& rContext,
- const ::rtl::OUString& rModuleIdentifier )
+ const OUString& rContext,
+ const OUString& rModuleIdentifier )
{
return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 ));
}
@@ -204,12 +204,12 @@ bool ToolBarMerger::ConvertSeqSeqToVector(
*/
void ToolBarMerger::ConvertSequenceToValues(
const uno::Sequence< beans::PropertyValue > rSequence,
- ::rtl::OUString& rCommandURL,
- ::rtl::OUString& rLabel,
- ::rtl::OUString& rImageIdentifier,
- ::rtl::OUString& rTarget,
- ::rtl::OUString& rContext,
- ::rtl::OUString& rControlType,
+ OUString& rCommandURL,
+ OUString& rLabel,
+ OUString& rImageIdentifier,
+ OUString& rTarget,
+ OUString& rContext,
+ OUString& rControlType,
sal_uInt16& rWidth )
{
for ( sal_Int32 i = 0; i < rSequence.getLength(); i++ )
@@ -257,7 +257,7 @@ void ToolBarMerger::ConvertSequenceToValues(
*/
ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
ToolBox* pToolbar,
- const ::rtl::OUString& rReferencePoint )
+ const OUString& rReferencePoint )
{
ReferenceToolbarPathInfo aResult;
aResult.bResult = false;
@@ -271,7 +271,7 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
const sal_uInt16 nItemId = pToolbar->GetItemId( i );
if ( nItemId > 0 )
{
- const ::rtl::OUString rCmd = pToolbar->GetItemCommand( nItemId );
+ const OUString rCmd = pToolbar->GetItemCommand( nItemId );
if ( rCmd == rReferencePoint )
{
aResult.bResult = true;
@@ -341,9 +341,9 @@ bool ToolBarMerger::ProcessMergeOperation(
sal_uInt16 nPos,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeCommandParameter,
+ const OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeCommandParameter,
const AddonToolbarItemContainer& rItems )
{
if ( rMergeCommand.equalsAsciiL( MERGECOMMAND_ADDAFTER, MERGECOMMAND_ADDAFTER_LEN ))
@@ -410,9 +410,9 @@ bool ToolBarMerger::ProcessMergeFallback(
sal_uInt16 /*nPos*/,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
- const ::rtl::OUString& rMergeCommand,
- const ::rtl::OUString& rMergeFallback,
+ const OUString& rModuleIdentifier,
+ const OUString& rMergeCommand,
+ const OUString& rMergeFallback,
const AddonToolbarItemContainer& rItems )
{
if (( rMergeFallback.equalsAsciiL( MERGEFALLBACK_IGNORE, MERGEFALLBACK_IGNORE_LEN )) ||
@@ -481,7 +481,7 @@ bool ToolBarMerger::MergeItems(
sal_uInt16 nModIndex,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonToolbarItemContainer& rAddonToolbarItems )
{
const sal_Int32 nSize( rAddonToolbarItems.size() );
@@ -574,7 +574,7 @@ bool ToolBarMerger::ReplaceItem(
sal_uInt16 nPos,
sal_uInt16& rItemId,
CommandToInfoMap& rCommandMap,
- const ::rtl::OUString& rModuleIdentifier,
+ const OUString& rModuleIdentifier,
const AddonToolbarItemContainer& rAddonToolbarItems )
{
pToolbar->RemoveItem( nPos );
@@ -609,7 +609,7 @@ bool ToolBarMerger::ReplaceItem(
bool ToolBarMerger::RemoveItems(
ToolBox* pToolbar,
sal_uInt16 nPos,
- const ::rtl::OUString& rMergeCommandParameter )
+ const OUString& rMergeCommandParameter )
{
sal_Int32 nCount = rMergeCommandParameter.toInt32();
if ( nCount > 0 )
@@ -652,10 +652,10 @@ bool ToolBarMerger::RemoveItems(
uno::Reference< lang::XMultiServiceFactory > xSMGR,
uno::Reference< frame::XFrame > xFrame,
ToolBox* pToolbar,
- const ::rtl::OUString& rCommandURL,
+ const OUString& rCommandURL,
sal_uInt16 nId,
sal_uInt16 nWidth,
- const ::rtl::OUString& rControlType )
+ const OUString& rControlType )
{
::cppu::OWeakObject* pResult( 0 );
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 8d25b03c6f89..d82d183f8428 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -275,8 +275,8 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c
//XUIFunctionExecute
void SAL_CALL ToolBarWrapper::functionExecute(
- const ::rtl::OUString& aUIElementName,
- const ::rtl::OUString& aCommand )
+ const OUString& aUIElementName,
+ const OUString& aCommand )
throw (::com::sun::star::uno::RuntimeException)
{
ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 7c16b83ea369..f48fb94167ca 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -95,17 +95,17 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
{
public:
- ConfigurationAccess_UICommand( const ::rtl::OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext );
+ ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext );
virtual ~ConfigurationAccess_UICommand();
// 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
@@ -124,7 +124,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
protected:
- virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const ::rtl::OUString& aName );
+ virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName );
struct CmdToInfoMap
{
@@ -132,55 +132,55 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
bCommandNameCreated( false ),
nProperties( 0 ) {}
- rtl::OUString aLabel;
- rtl::OUString aContextLabel;
- rtl::OUString aCommandName;
+ OUString aLabel;
+ OUString aContextLabel;
+ OUString aCommandName;
bool bPopup : 1,
bCommandNameCreated : 1;
sal_Int32 nProperties;
};
- Any getSequenceFromCache( const rtl::OUString& aCommandURL );
- Any getInfoFromCommand( const rtl::OUString& rCommandURL );
- void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const rtl::OUString& aLabel );
- Any getUILabelFromCommand( const rtl::OUString& rCommandURL );
- Sequence< rtl::OUString > getAllCommands();
+ Any getSequenceFromCache( const OUString& aCommandURL );
+ Any getInfoFromCommand( const OUString& rCommandURL );
+ void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel );
+ Any getUILabelFromCommand( const OUString& rCommandURL );
+ Sequence< OUString > getAllCommands();
sal_Bool fillCache();
sal_Bool addGenericInfoToCache();
void impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup,
- std::vector< ::rtl::OUString >& aImageCommandVector,
- std::vector< ::rtl::OUString >& aImageRotateVector,
- std::vector< ::rtl::OUString >& aImageMirrorVector);
+ std::vector< OUString >& aImageCommandVector,
+ std::vector< OUString >& aImageRotateVector,
+ std::vector< OUString >& aImageMirrorVector);
private:
- typedef ::boost::unordered_map< ::rtl::OUString,
+ typedef ::boost::unordered_map< OUString,
CmdToInfoMap,
- rtl::OUStringHash,
- ::std::equal_to< ::rtl::OUString > > CommandToInfoCache;
+ OUStringHash,
+ ::std::equal_to< OUString > > CommandToInfoCache;
sal_Bool initializeConfigAccess();
- rtl::OUString m_aConfigCmdAccess;
- rtl::OUString m_aConfigPopupAccess;
- rtl::OUString m_aPropUILabel;
- rtl::OUString m_aPropUIContextLabel;
- rtl::OUString m_aPropLabel;
- rtl::OUString m_aPropName;
- rtl::OUString m_aPropPopup;
- rtl::OUString m_aPropProperties;
- rtl::OUString m_aXMLFileFormatVersion;
- rtl::OUString m_aVersion;
- rtl::OUString m_aExtension;
- rtl::OUString m_aPrivateResourceURL;
+ OUString m_aConfigCmdAccess;
+ OUString m_aConfigPopupAccess;
+ OUString m_aPropUILabel;
+ OUString m_aPropUIContextLabel;
+ OUString m_aPropLabel;
+ OUString m_aPropName;
+ OUString m_aPropPopup;
+ OUString m_aPropProperties;
+ OUString m_aXMLFileFormatVersion;
+ OUString m_aVersion;
+ OUString m_aExtension;
+ OUString m_aPrivateResourceURL;
Reference< XNameAccess > m_xGenericUICommands;
Reference< XMultiServiceFactory > m_xConfigProvider;
Reference< XNameAccess > m_xConfigAccess;
Reference< XContainerListener > m_xConfigListener;
Reference< XNameAccess > m_xConfigAccessPopups;
Reference< XContainerListener > m_xConfigAccessListener;
- Sequence< rtl::OUString > m_aCommandImageList;
- Sequence< rtl::OUString > m_aCommandRotateImageList;
- Sequence< rtl::OUString > m_aCommandMirrorImageList;
+ Sequence< OUString > m_aCommandImageList;
+ Sequence< OUString > m_aCommandRotateImageList;
+ Sequence< OUString > m_aCommandMirrorImageList;
CommandToInfoCache m_aCmdInfoCache;
sal_Bool m_bConfigAccessInitialized;
sal_Bool m_bCacheFilled;
@@ -190,7 +190,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
//*****************************************************************************************************************
// XInterface, XTypeProvider
//*****************************************************************************************************************
-ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) :
+ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) :
ThreadHelpBase(),
m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS ),
m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS ),
@@ -208,12 +208,12 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUStrin
{
// Create configuration hierachical access name
m_aConfigCmdAccess += aModuleName;
- m_aConfigCmdAccess += rtl::OUString( CONFIGURATION_CMD_ELEMENT_ACCESS );
+ m_aConfigCmdAccess += OUString( CONFIGURATION_CMD_ELEMENT_ACCESS );
m_xConfigProvider = theDefaultProvider::get( rxContext );
m_aConfigPopupAccess += aModuleName;
- m_aConfigPopupAccess += rtl::OUString( CONFIGURATION_POP_ELEMENT_ACCESS );
+ m_aConfigPopupAccess += OUString( CONFIGURATION_POP_ELEMENT_ACCESS );
}
ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
@@ -230,7 +230,7 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
// XNameAccess
-Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const ::rtl::OUString& rCommandURL )
+Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL )
{
static sal_Int32 nRequests = 0;
@@ -265,7 +265,7 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const ::rtl::OUString
}
}
-Any SAL_CALL ConfigurationAccess_UICommand::getByName( const ::rtl::OUString& rCommandURL )
+Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL )
throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
{
Any aRet( getByNameImpl( rCommandURL ) );
@@ -275,13 +275,13 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
return aRet;
}
-Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames()
+Sequence< OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames()
throw ( RuntimeException )
{
return getAllCommands();
}
-sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const ::rtl::OUString& rCommandURL )
+sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL )
throw (::com::sun::star::uno::RuntimeException)
{
return getByNameImpl( rCommandURL ).hasValue();
@@ -301,18 +301,18 @@ throw ( RuntimeException )
return sal_True;
}
-void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo, const rtl::OUString& aLabel )
+void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel )
{
String rStr( aLabel );
rStr.SearchAndReplaceAllAscii(
"%PRODUCTNAME", utl::ConfigManager::getProductName() );
- rCmdInfo.aLabel = ::rtl::OUString( rStr );
+ rCmdInfo.aLabel = OUString( rStr );
rStr = comphelper::string::stripEnd(rStr, '.'); // Remove "..." from string
- rCmdInfo.aCommandName = ::rtl::OUString( MnemonicGenerator::EraseAllMnemonicChars( rStr ));
+ rCmdInfo.aCommandName = OUString( MnemonicGenerator::EraseAllMnemonicChars( rStr ));
rCmdInfo.bCommandNameCreated = sal_True;
}
-Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString& aCommandURL )
+Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aCommandURL )
{
CommandToInfoCache::iterator pIter = m_aCmdInfoCache.find( aCommandURL );
if ( pIter != m_aCmdInfoCache.end() )
@@ -336,13 +336,13 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString&
return Any();
}
void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup,
- std::vector< ::rtl::OUString >& aImageCommandVector,
- std::vector< ::rtl::OUString >& aImageRotateVector,
- std::vector< ::rtl::OUString >& aImageMirrorVector)
+ std::vector< OUString >& aImageCommandVector,
+ std::vector< OUString >& aImageRotateVector,
+ std::vector< OUString >& aImageMirrorVector)
{
if ( _xConfigAccess.is() )
{
- Sequence< ::rtl::OUString> aNameSeq = _xConfigAccess->getElementNames();
+ Sequence< OUString> aNameSeq = _xConfigAccess->getElementNames();
const sal_Int32 nCount = aNameSeq.getLength();
for ( sal_Int32 i = 0; i < nCount; i++ )
{
@@ -384,9 +384,9 @@ sal_Bool ConfigurationAccess_UICommand::fillCache()
if ( m_bCacheFilled )
return sal_True;
- std::vector< ::rtl::OUString > aImageCommandVector;
- std::vector< ::rtl::OUString > aImageRotateVector;
- std::vector< ::rtl::OUString > aImageMirrorVector;
+ std::vector< OUString > aImageCommandVector;
+ std::vector< OUString > aImageRotateVector;
+ std::vector< OUString > aImageMirrorVector;
impl_fill(m_xConfigAccess,sal_False,aImageCommandVector,aImageRotateVector,aImageMirrorVector);
impl_fill(m_xConfigAccessPopups,sal_True,aImageCommandVector,aImageRotateVector,aImageMirrorVector);
@@ -404,12 +404,12 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache()
{
if ( m_xGenericUICommands.is() && !m_bGenericDataRetrieved )
{
- Sequence< rtl::OUString > aCommandNameSeq;
+ Sequence< OUString > aCommandNameSeq;
try
{
if ( m_xGenericUICommands->getByName(
- rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aCommandNameSeq )
- m_aCommandRotateImageList = comphelper::concatSequences< rtl::OUString >( m_aCommandRotateImageList, aCommandNameSeq );
+ OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aCommandNameSeq )
+ m_aCommandRotateImageList = comphelper::concatSequences< OUString >( m_aCommandRotateImageList, aCommandNameSeq );
}
catch (const RuntimeException&)
{
@@ -422,8 +422,8 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache()
try
{
if ( m_xGenericUICommands->getByName(
- rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aCommandNameSeq )
- m_aCommandMirrorImageList = comphelper::concatSequences< rtl::OUString >( m_aCommandMirrorImageList, aCommandNameSeq );
+ OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aCommandNameSeq )
+ m_aCommandMirrorImageList = comphelper::concatSequences< OUString >( m_aCommandMirrorImageList, aCommandNameSeq );
}
catch (const RuntimeException&)
{
@@ -439,7 +439,7 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache()
return sal_True;
}
-Any ConfigurationAccess_UICommand::getInfoFromCommand( const rtl::OUString& rCommandURL )
+Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rCommandURL )
{
Any a;
@@ -475,7 +475,7 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand( const rtl::OUString& rCom
return a;
}
-Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands()
+Sequence< OUString > ConfigurationAccess_UICommand::getAllCommands()
{
// SAFE
ResetableGuard aLock( m_aLock );
@@ -493,18 +493,18 @@ Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands()
try
{
- Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames();
+ Sequence< OUString > aNameSeq = m_xConfigAccess->getElementNames();
if ( m_xGenericUICommands.is() )
{
// Create concat list of supported user interface commands of the module
- Sequence< ::rtl::OUString > aGenericNameSeq = m_xGenericUICommands->getElementNames();
+ Sequence< OUString > aGenericNameSeq = m_xGenericUICommands->getElementNames();
sal_uInt32 nCount1 = aNameSeq.getLength();
sal_uInt32 nCount2 = aGenericNameSeq.getLength();
aNameSeq.realloc( nCount1 + nCount2 );
- ::rtl::OUString* pNameSeq = aNameSeq.getArray();
- const ::rtl::OUString* pGenericSeq = aGenericNameSeq.getConstArray();
+ OUString* pNameSeq = aNameSeq.getArray();
+ const OUString* pGenericSeq = aGenericNameSeq.getConstArray();
for ( sal_uInt32 i = 0; i < nCount2; i++ )
pNameSeq[nCount1+i] = pGenericSeq[i];
}
@@ -519,7 +519,7 @@ Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands()
}
}
- return Sequence< rtl::OUString >();
+ return Sequence< OUString >();
}
sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
@@ -529,7 +529,7 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
try
{
- aPropValue.Name = rtl::OUString( "nodepath" );
+ aPropValue.Name = OUString( "nodepath" );
aPropValue.Value <<= m_aConfigCmdAccess;
aArgs[0] <<= aPropValue;
@@ -630,7 +630,7 @@ UICommandDescription::UICommandDescription( const Reference< XComponentContext >
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" );
Reference< XNameAccess > xEmpty;
- rtl::OUString aGenericUICommand( "GenericCommands" );
+ OUString aGenericUICommand( "GenericCommands" );
m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, m_xContext );
impl_fillElements("ooSetupFactoryCommandConfigRef");
@@ -655,16 +655,16 @@ UICommandDescription::~UICommandDescription()
void UICommandDescription::impl_fillElements(const sal_Char* _pName)
{
m_xModuleManager.set( ModuleManager::create( m_xContext ) );
- Sequence< rtl::OUString > aElementNames = m_xModuleManager->getElementNames();
+ Sequence< OUString > aElementNames = m_xModuleManager->getElementNames();
Sequence< PropertyValue > aSeq;
- ::rtl::OUString aModuleIdentifier;
+ OUString aModuleIdentifier;
for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
{
aModuleIdentifier = aElementNames[i];
if ( m_xModuleManager->getByName( aModuleIdentifier ) >>= aSeq )
{
- ::rtl::OUString aCommandStr;
+ OUString aCommandStr;
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
if ( aSeq[y].Name.equalsAscii(_pName) )
@@ -684,12 +684,12 @@ void UICommandDescription::impl_fillElements(const sal_Char* _pName)
}
} // for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
}
-Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const ::rtl::OUString& _sName)
+Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const OUString& _sName)
{
return new ConfigurationAccess_UICommand( _sName, m_xGenericUICommands, m_xContext );
}
-Any SAL_CALL UICommandDescription::getByName( const ::rtl::OUString& aName )
+Any SAL_CALL UICommandDescription::getByName( const OUString& aName )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getByName" );
@@ -700,7 +700,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
ModuleToCommandFileMap::const_iterator pM2CIter = m_aModuleToCommandFileMap.find( aName );
if ( pM2CIter != m_aModuleToCommandFileMap.end() )
{
- ::rtl::OUString aCommandFile( pM2CIter->second );
+ OUString aCommandFile( pM2CIter->second );
UICommandsHashMap::iterator pIter = m_aUICommandsHashMap.find( aCommandFile );
if ( pIter != m_aUICommandsHashMap.end() )
{
@@ -731,13 +731,13 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
return a;
}
-Sequence< ::rtl::OUString > SAL_CALL UICommandDescription::getElementNames()
+Sequence< OUString > SAL_CALL UICommandDescription::getElementNames()
throw (::com::sun::star::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getElementNames" );
ResetableGuard aLock( m_aLock );
- Sequence< rtl::OUString > aSeq( m_aModuleToCommandFileMap.size() );
+ Sequence< OUString > aSeq( m_aModuleToCommandFileMap.size() );
sal_Int32 n = 0;
ModuleToCommandFileMap::const_iterator pIter = m_aModuleToCommandFileMap.begin();
@@ -750,7 +750,7 @@ throw (::com::sun::star::uno::RuntimeException)
return aSeq;
}
-sal_Bool SAL_CALL UICommandDescription::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName )
throw (::com::sun::star::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::hasByName" );
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index dd5448915b75..83ba7402c9ca 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -67,7 +67,7 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co
// XUIElementFactory
Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
- const ::rtl::OUString& ResourceURL,
+ const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index 2a2f790ed2fc..993987ee3608 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
@@ -65,7 +65,7 @@ ToolBoxFactory::ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::s
// XUIElementFactory
Reference< XUIElement > SAL_CALL ToolBoxFactory::createUIElement(
- const ::rtl::OUString& ResourceURL,
+ const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 1a6a38a19e9a..f61d574fa4e6 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -46,7 +46,7 @@ namespace framework{
*/
#define THROW_PARSEEXCEPTION(COMMENT) \
{ \
- ::rtl::OUStringBuffer sMessage(256); \
+ OUStringBuffer sMessage(256); \
sMessage.append (implts_getErrorLineString()); \
sMessage.appendAscii(COMMENT ); \
\
@@ -102,7 +102,7 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument()
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString& sElement ,
+void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& sElement ,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
@@ -119,15 +119,15 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.")
m_bInsideAcceleratorItem = sal_True;
- ::rtl::OUString sCommand;
+ OUString sCommand;
css::awt::KeyEvent aEvent ;
sal_Int16 c = xAttributeList->getLength();
sal_Int16 i = 0;
for (i=0; i<c; ++i)
{
- ::rtl::OUString sAttribute = xAttributeList->getNameByIndex(i);
- ::rtl::OUString sValue = xAttributeList->getValueByIndex(i);
+ OUString sAttribute = xAttributeList->getNameByIndex(i);
+ OUString sValue = xAttributeList->getValueByIndex(i);
EXMLAttribute eAttribute = AcceleratorConfigurationReader::implst_classifyAttribute(sAttribute);
switch(eAttribute)
{
@@ -175,7 +175,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
// Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains
// multiple registrations for the same key :-) Show a warning ... and ignore the second item.
// THROW_PARSEEXCEPTION("Command is registered for the same key more then once.")
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("Double registration detected.\nCommand = \"");
sMsg.append (sCommand );
sMsg.appendAscii("\"\nKeyCode = " );
@@ -198,7 +198,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& sElement)
+void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
@@ -222,22 +222,22 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString&
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::characters(const ::rtl::OUString&)
+void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const ::rtl::OUString&)
+void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&)
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
}
//-----------------------------------------------
-void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const ::rtl::OUString& /*sTarget*/,
- const ::rtl::OUString& /*sData*/ )
+void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/,
+ const OUString& /*sData*/ )
throw(css::xml::sax::SAXException,
css::uno::RuntimeException )
{
@@ -252,7 +252,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno:
}
//-----------------------------------------------
-AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const ::rtl::OUString& sElement)
+AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const OUString& sElement)
{
AcceleratorConfigurationReader::EXMLElement eElement;
@@ -269,7 +269,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl
}
//-----------------------------------------------
-AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const ::rtl::OUString& sAttribute)
+AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const OUString& sAttribute)
{
AcceleratorConfigurationReader::EXMLAttribute eAttribute;
@@ -294,12 +294,12 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
}
//-----------------------------------------------
-::rtl::OUString AcceleratorConfigurationReader::implts_getErrorLineString()
+OUString AcceleratorConfigurationReader::implts_getErrorLineString()
{
if (!m_xLocator.is())
return DECLARE_ASCII("Error during parsing XML. (No further info available ...)");
- ::rtl::OUStringBuffer sMsg(256);
+ OUStringBuffer sMsg(256);
sMsg.appendAscii("Error during parsing XML in\nline = ");
sMsg.append (m_xLocator->getLineNumber() );
sMsg.appendAscii("\ncolumn = " );
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 136373580dfb..70fa9ab70adf 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -72,10 +72,10 @@ void AcceleratorConfigurationWriter::flush()
xCFG->startDocument();
xExtendedCFG->unknown(DOCTYPE_ACCELERATORS);
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
xCFG->startElement(AL_ELEMENT_ACCELERATORLIST, xAttribs);
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
// TODO think about threadsafe using of cache
AcceleratorCache::TKeyList lKeys = m_rContainer.getAllKeys();
@@ -85,7 +85,7 @@ void AcceleratorConfigurationWriter::flush()
++pKey )
{
const css::awt::KeyEvent& rKey = *pKey;
- const ::rtl::OUString& rCommand = m_rContainer.getCommandByKey(rKey);
+ const OUString& rCommand = m_rContainer.getCommandByKey(rKey);
impl_ts_writeKeyCommandPair(rKey, rCommand, xCFG);
}
@@ -95,43 +95,43 @@ void AcceleratorConfigurationWriter::flush()
WriteAcceleratorItem( *p );
*/
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
xCFG->endElement(AL_ELEMENT_ACCELERATORLIST);
- xCFG->ignorableWhitespace(::rtl::OUString());
+ xCFG->ignorableWhitespace(OUString());
xCFG->endDocument();
}
//-----------------------------------------------
void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey ,
- const ::rtl::OUString& sCommand,
+ const OUString& sCommand,
const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig )
{
::comphelper::AttributeList* pAttribs = new ::comphelper::AttributeList;
css::uno::Reference< css::xml::sax::XAttributeList > xAttribs (static_cast< css::xml::sax::XAttributeList* >(pAttribs) , css::uno::UNO_QUERY_THROW);
- ::rtl::OUString sKey = m_rKeyMapping->mapCodeToIdentifier(aKey.KeyCode);
+ OUString sKey = m_rKeyMapping->mapCodeToIdentifier(aKey.KeyCode);
// TODO check if key is empty!
pAttribs->AddAttribute(AL_ATTRIBUTE_KEYCODE, ATTRIBUTE_TYPE_CDATA, sKey );
pAttribs->AddAttribute(AL_ATTRIBUTE_URL , ATTRIBUTE_TYPE_CDATA, sCommand);
if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, OUString("true"));
if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, OUString("true"));
if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, OUString("true"));
if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3)
- pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true"));
+ pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, OUString("true"));
- xConfig->ignorableWhitespace(::rtl::OUString());
+ xConfig->ignorableWhitespace(OUString());
xConfig->startElement(AL_ELEMENT_ITEM, xAttribs);
- xConfig->ignorableWhitespace(::rtl::OUString());
+ xConfig->ignorableWhitespace(OUString());
xConfig->endElement(AL_ELEMENT_ITEM);
- xConfig->ignorableWhitespace(::rtl::OUString());
+ xConfig->ignorableWhitespace(OUString());
}
} // namespace framework
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index 0ee28019e2dd..60fd2778b2d5 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -63,36 +63,36 @@ namespace fs
class path
{
public:
- ::rtl::OUString data;
+ OUString data;
public:
path() {}
path(const path &rOther) : data(rOther.data) {}
path(const std::string &in, convert)
{
- rtl::OUString sWorkingDir;
+ OUString sWorkingDir;
osl_getProcessWorkingDir(&sWorkingDir.pData);
- rtl::OString tmp(in.c_str());
- rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
+ OString tmp(in.c_str());
+ OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
osl::File::getFileURLFromSystemPath(ustrSystemPath, data);
osl::File::getAbsoluteFileURL(sWorkingDir, data, data);
}
path(const std::string &FileURL)
{
- rtl::OString tmp(FileURL.c_str());
- data = rtl::OStringToOUString(tmp, getThreadTextEncoding());
+ OString tmp(FileURL.c_str());
+ data = OStringToOUString(tmp, getThreadTextEncoding());
}
std::string native_file_string() const
{
- ::rtl::OUString ustrSystemPath;
+ OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
- rtl::OString tmp(rtl::OUStringToOString(ustrSystemPath, getThreadTextEncoding()));
+ OString tmp(OUStringToOString(ustrSystemPath, getThreadTextEncoding()));
HCDBG(std::cerr << "native_file_string is " << tmp.getStr() << std::endl);
return std::string(tmp.getStr());
}
#ifdef WNT
wchar_t const * native_file_string_w() const
{
- ::rtl::OUString ustrSystemPath;
+ OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
return (wchar_t const *) ustrSystemPath.getStr();
}
@@ -100,7 +100,7 @@ namespace fs
std::string native_directory_string() const { return native_file_string(); }
std::string toUTF8() const
{
- rtl::OString tmp(rtl::OUStringToOString(data, RTL_TEXTENCODING_UTF8));
+ OString tmp(OUStringToOString(data, RTL_TEXTENCODING_UTF8));
return std::string(tmp.getStr());
}
bool empty() const { return data.isEmpty(); }
@@ -108,19 +108,19 @@ namespace fs
{
path ret(*this);
HCDBG(std::cerr << "orig was " <<
- rtl::OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
- rtl::OString tmp(in.c_str());
- rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
- ret.data += rtl::OUString(sal_Unicode('/'));
+ OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
+ OString tmp(in.c_str());
+ OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
+ ret.data += OUString(sal_Unicode('/'));
ret.data += ustrSystemPath;
HCDBG(std::cerr << "final is " <<
- rtl::OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
+ OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
return ret;
}
void append(const char *in)
{
- rtl::OString tmp(in);
- rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
+ OString tmp(in);
+ OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
data = data + ustrSystemPath;
}
void append(const std::string &in) { append(in.c_str()); }
diff --git a/helpcompiler/inc/HelpIndexer.hxx b/helpcompiler/inc/HelpIndexer.hxx
index 0a2fb9421719..68bae8d825f2 100644
--- a/helpcompiler/inc/HelpIndexer.hxx
+++ b/helpcompiler/inc/HelpIndexer.hxx
@@ -51,13 +51,13 @@ class Reader;
class L10N_DLLPUBLIC HelpIndexer {
private:
- rtl::OUString d_lang;
- rtl::OUString d_module;
- rtl::OUString d_captionDir;
- rtl::OUString d_contentDir;
- rtl::OUString d_indexDir;
- rtl::OUString d_error;
- std::set<rtl::OUString> d_files;
+ OUString d_lang;
+ OUString d_module;
+ OUString d_captionDir;
+ OUString d_contentDir;
+ OUString d_indexDir;
+ OUString d_error;
+ std::set<OUString> d_files;
public:
@@ -67,8 +67,8 @@ class L10N_DLLPUBLIC HelpIndexer {
* @param srcDir The help directory to index
* @param outDir The directory to write the "module".idxl directory to
*/
- HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module,
- rtl::OUString const &srcDir, rtl::OUString const &outDir);
+ HelpIndexer(OUString const &lang, OUString const &module,
+ OUString const &srcDir, OUString const &outDir);
/**
* Run the indexer.
@@ -79,7 +79,7 @@ class L10N_DLLPUBLIC HelpIndexer {
/**
* Get the error string (empty if no error occurred).
*/
- rtl::OUString const & getErrorMessage();
+ OUString const & getErrorMessage();
private:
@@ -91,17 +91,17 @@ class L10N_DLLPUBLIC HelpIndexer {
/**
* Scan for files in the given directory.
*/
- bool scanForFiles(rtl::OUString const &path);
+ bool scanForFiles(OUString const &path);
/**
* Fill the Document with information on the given help file.
*/
- bool helpDocument(rtl::OUString const & fileName, lucene::document::Document *doc);
+ bool helpDocument(OUString const & fileName, lucene::document::Document *doc);
/**
* Create a reader for the given file, and create an "empty" reader in case the file doesn't exist.
*/
- lucene::util::Reader *helpFileReader(rtl::OUString const & path);
+ lucene::util::Reader *helpFileReader(OUString const & path);
};
#endif
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index b7e88932fcb3..4cafeec706c8 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -52,7 +52,7 @@ public:
void main(std::vector<std::string> &args,
std::string* pExtensionPath = NULL,
std::string* pDestination = NULL,
- const rtl::OUString* pOfficeHelpPath = NULL )
+ const OUString* pOfficeHelpPath = NULL )
throw( HelpProcessingException );
diff --git a/helpcompiler/inc/HelpSearch.hxx b/helpcompiler/inc/HelpSearch.hxx
index e232b5ad2ff8..a8192bb1351c 100644
--- a/helpcompiler/inc/HelpSearch.hxx
+++ b/helpcompiler/inc/HelpSearch.hxx
@@ -37,8 +37,8 @@
class L10N_DLLPUBLIC HelpSearch{
private:
- rtl::OUString d_lang;
- rtl::OString d_indexDir;
+ OUString d_lang;
+ OString d_indexDir;
public:
@@ -46,7 +46,7 @@ class L10N_DLLPUBLIC HelpSearch{
* @param lang Help files language.
* @param indexDir The directory where the index files are stored.
*/
- HelpSearch(rtl::OUString const &lang, rtl::OUString const &indexDir);
+ HelpSearch(OUString const &lang, OUString const &indexDir);
/**
* Query the index for a certain query string.
@@ -55,8 +55,8 @@ class L10N_DLLPUBLIC HelpSearch{
* @param rDocuments Vector to write the paths of the found documents.
* @param rScores Vector to write the scores to.
*/
- bool query(rtl::OUString const &queryStr, bool captionOnly,
- std::vector<rtl::OUString> &rDocuments, std::vector<float> &rScores);
+ bool query(OUString const &queryStr, bool captionOnly,
+ std::vector<OUString> &rDocuments, std::vector<float> &rScores);
};
#endif
diff --git a/helpcompiler/inc/compilehelp.hxx b/helpcompiler/inc/compilehelp.hxx
index cbac6e6c87b9..4ef706d32388 100644
--- a/helpcompiler/inc/compilehelp.hxx
+++ b/helpcompiler/inc/compilehelp.hxx
@@ -42,8 +42,8 @@ enum HelpProcessingErrorClass
struct HelpProcessingErrorInfo
{
HelpProcessingErrorClass m_eErrorClass;
- rtl::OUString m_aErrorMsg;
- rtl::OUString m_aXMLParsingFile;
+ OUString m_aErrorMsg;
+ OUString m_aXMLParsingFile;
sal_Int32 m_nXMLParsingLine;
HelpProcessingErrorInfo( void )
@@ -58,11 +58,11 @@ struct HelpProcessingErrorInfo
// Returns true in case of success, false in case of error
HELPLINKER_DLLPUBLIC bool compileExtensionHelp
(
- const rtl::OUString& aOfficeHelpPath,
- const rtl::OUString& aExtensionName,
- const rtl::OUString& aExtensionLanguageRoot,
- sal_Int32 nXhpFileCount, const rtl::OUString* pXhpFiles,
- const rtl::OUString& aDestination,
+ const OUString& aOfficeHelpPath,
+ const OUString& aExtensionName,
+ const OUString& aExtensionLanguageRoot,
+ sal_Int32 nXhpFileCount, const OUString* pXhpFiles,
+ const OUString& aDestination,
HelpProcessingErrorInfo& o_rHelpProcessingErrorInfo
);
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index e679d60e739b..628560508910 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -497,7 +497,7 @@ namespace fs
{
HCDBG(
std::cerr << "creating " <<
- rtl::OUStringToOString(indexDirName.data, RTL_TEXTENCODING_UTF8).getStr()
+ OUStringToOString(indexDirName.data, RTL_TEXTENCODING_UTF8).getStr()
<< std::endl
);
osl::Directory::createPath(indexDirName.data);
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 06e542a57c61..325a9840ce78 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -41,14 +41,14 @@
using namespace lucene::document;
-HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module,
- rtl::OUString const &srcDir, rtl::OUString const &outDir)
+HelpIndexer::HelpIndexer(OUString const &lang, OUString const &module,
+ OUString const &srcDir, OUString const &outDir)
: d_lang(lang), d_module(module)
{
- d_indexDir = rtl::OUStringBuffer(outDir).append('/').
+ d_indexDir = OUStringBuffer(outDir).append('/').
append(module).appendAscii(RTL_CONSTASCII_STRINGPARAM(".idxl")).toString();
- d_captionDir = srcDir + rtl::OUString("/caption");
- d_contentDir = srcDir + rtl::OUString("/content");
+ d_captionDir = srcDir + OUString("/caption");
+ d_contentDir = srcDir + OUString("/content");
}
bool HelpIndexer::indexDocuments()
@@ -58,7 +58,7 @@ bool HelpIndexer::indexDocuments()
try
{
- rtl::OUString sLang = d_lang.getToken(0, '-');
+ OUString sLang = d_lang.getToken(0, '-');
bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh";
// Construct the analyzer appropriate for the given language
@@ -68,10 +68,10 @@ bool HelpIndexer::indexDocuments()
else
analyzer.reset(new lucene::analysis::standard::StandardAnalyzer());
- rtl::OUString ustrSystemPath;
+ OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(d_indexDir, ustrSystemPath);
- rtl::OString indexDirStr = rtl::OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
+ OString indexDirStr = OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
lucene::index::IndexWriter writer(indexDirStr.getStr(), analyzer.get(), true);
//Double limit of tokens allowed, otherwise we'll get a too-many-tokens
//exception for ja help. Could alternative ignore the exception and get
@@ -80,7 +80,7 @@ bool HelpIndexer::indexDocuments()
// Index the identified help files
Document doc;
- for (std::set<rtl::OUString>::iterator i = d_files.begin(); i != d_files.end(); ++i) {
+ for (std::set<OUString>::iterator i = d_files.begin(); i != d_files.end(); ++i) {
helpDocument(*i, &doc);
writer.addDocument(&doc);
doc.clear();
@@ -92,14 +92,14 @@ bool HelpIndexer::indexDocuments()
}
catch (CLuceneError &e)
{
- d_error = rtl::OUString::createFromAscii(e.what());
+ d_error = OUString::createFromAscii(e.what());
return false;
}
return true;
}
-rtl::OUString const & HelpIndexer::getErrorMessage() {
+OUString const & HelpIndexer::getErrorMessage() {
return d_error;
}
@@ -113,11 +113,11 @@ bool HelpIndexer::scanForFiles() {
return true;
}
-bool HelpIndexer::scanForFiles(rtl::OUString const & path) {
+bool HelpIndexer::scanForFiles(OUString const & path) {
osl::Directory dir(path);
if (osl::FileBase::E_None != dir.open()) {
- d_error = rtl::OUString("Error reading directory ") + path;
+ d_error = OUString("Error reading directory ") + path;
return true;
}
@@ -133,36 +133,36 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) {
return true;
}
-bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) {
+bool HelpIndexer::helpDocument(OUString const & fileName, Document *doc) {
// Add the help path as an indexed, untokenized field.
- rtl::OUString path = rtl::OUString("#HLP#") +
- d_module + rtl::OUString("/") + fileName;
+ OUString path = OUString("#HLP#") +
+ d_module + OUString("/") + fileName;
std::vector<TCHAR> aPath(OUStringToTCHARVec(path));
doc->add(*_CLNEW Field(_T("path"), &aPath[0], Field::STORE_YES | Field::INDEX_UNTOKENIZED));
- rtl::OUString sEscapedFileName =
+ OUString sEscapedFileName =
rtl::Uri::encode(fileName,
rtl_UriCharClassUric, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8);
// Add the caption as a field.
- rtl::OUString captionPath = d_captionDir + rtl::OUString("/") + sEscapedFileName;
+ OUString captionPath = d_captionDir + OUString("/") + sEscapedFileName;
doc->add(*_CLNEW Field(_T("caption"), helpFileReader(captionPath), Field::STORE_NO | Field::INDEX_TOKENIZED));
// Add the content as a field.
- rtl::OUString contentPath = d_contentDir + rtl::OUString("/") + sEscapedFileName;
+ OUString contentPath = d_contentDir + OUString("/") + sEscapedFileName;
doc->add(*_CLNEW Field(_T("content"), helpFileReader(contentPath), Field::STORE_NO | Field::INDEX_TOKENIZED));
return true;
}
-lucene::util::Reader *HelpIndexer::helpFileReader(rtl::OUString const & path) {
+lucene::util::Reader *HelpIndexer::helpFileReader(OUString const & path) {
osl::File file(path);
if (osl::FileBase::E_None == file.open(osl_File_OpenFlag_Read)) {
file.close();
- rtl::OUString ustrSystemPath;
+ OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(path, ustrSystemPath);
- rtl::OString pathStr = rtl::OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
+ OString pathStr = OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
return _CLNEW lucene::util::FileReader(pathStr.getStr(), "UTF-8");
} else {
return _CLNEW lucene::util::StringReader(L"");
diff --git a/helpcompiler/source/HelpIndexer_main.cxx b/helpcompiler/source/HelpIndexer_main.cxx
index e5ff2aaf9a90..a384bb68243f 100644
--- a/helpcompiler/source/HelpIndexer_main.cxx
+++ b/helpcompiler/source/HelpIndexer_main.cxx
@@ -79,24 +79,24 @@ int main(int argc, char **argv) {
return 1;
}
- rtl::OUString sDir;
+ OUString sDir;
osl::File::getFileURLFromSystemPath(
- rtl::OUString(dir.c_str(), dir.size(), osl_getThreadTextEncoding()),
+ OUString(dir.c_str(), dir.size(), osl_getThreadTextEncoding()),
sDir);
- rtl::OUString cwd;
+ OUString cwd;
osl_getProcessWorkingDir(&cwd.pData);
osl::File::getAbsoluteFileURL(cwd, sDir, sDir);
HelpIndexer indexer(
- rtl::OUString(lang.c_str(), lang.size(), osl_getThreadTextEncoding()),
- rtl::OUString(module.c_str(), module.size(), osl_getThreadTextEncoding()),
+ OUString(lang.c_str(), lang.size(), osl_getThreadTextEncoding()),
+ OUString(module.c_str(), module.size(), osl_getThreadTextEncoding()),
sDir, sDir);
if (!indexer.indexDocuments()) {
- std::cerr << rtl::OUStringToOString(indexer.getErrorMessage(), osl_getThreadTextEncoding()).getStr() << std::endl;
+ std::cerr << OUStringToOString(indexer.getErrorMessage(), osl_getThreadTextEncoding()).getStr() << std::endl;
return 2;
}
return 0;
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 15061f30384e..cf5ef12b6dba 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -65,12 +65,12 @@ IndexerPreProcessor::~IndexerPreProcessor()
std::string getEncodedPath( const std::string& Path )
{
- rtl::OString aOStr_Path( Path.c_str() );
- rtl::OUString aOUStr_Path( rtl::OStringToOUString
+ OString aOStr_Path( Path.c_str() );
+ OUString aOUStr_Path( OStringToOUString
( aOStr_Path, fs::getThreadTextEncoding() ) );
- rtl::OUString aPathURL;
+ OUString aPathURL;
osl::File::getFileURLFromSystemPath( aOUStr_Path, aPathURL );
- rtl::OString aOStr_PathURL( rtl::OUStringToOString
+ OString aOStr_PathURL( OUStringToOString
( aPathURL, fs::getThreadTextEncoding() ) );
std::string aStdStr_PathURL( aOStr_PathURL.getStr() );
return aStdStr_PathURL;
@@ -550,7 +550,7 @@ void HelpLinker::link() throw( HelpProcessingException )
void HelpLinker::main( std::vector<std::string> &args,
std::string* pExtensionPath, std::string* pDestination,
- const rtl::OUString* pOfficeHelpPath )
+ const OUString* pOfficeHelpPath )
throw( HelpProcessingException )
{
bExtensionMode = false;
@@ -809,10 +809,10 @@ void HelpLinker::main( std::vector<std::string> &args,
{
//This part is used when compileExtensionHelp is called from the extensions manager.
//If extension help is compiled using helplinker in the build process
- rtl::OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
- aIdxCaptionPathFileURL += rtl::OUString("/idxcaption.xsl");
+ OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
+ aIdxCaptionPathFileURL += OUString("/idxcaption.xsl");
- rtl::OString aOStr_IdxCaptionPathFileURL( rtl::OUStringToOString
+ OString aOStr_IdxCaptionPathFileURL( OUStringToOString
( aIdxCaptionPathFileURL, fs::getThreadTextEncoding() ) );
std::string aStdStr_IdxCaptionPathFileURL( aOStr_IdxCaptionPathFileURL.getStr() );
@@ -834,10 +834,10 @@ void HelpLinker::main( std::vector<std::string> &args,
//If extension help is compiled using helplinker in the build process
//then -idxcontent must be supplied
//This part is used when compileExtensionHelp is called from the extensions manager.
- rtl::OUString aIdxContentPathFileURL( *pOfficeHelpPath );
- aIdxContentPathFileURL += rtl::OUString("/idxcontent.xsl");
+ OUString aIdxContentPathFileURL( *pOfficeHelpPath );
+ aIdxContentPathFileURL += OUString("/idxcontent.xsl");
- rtl::OString aOStr_IdxContentPathFileURL( rtl::OUStringToOString
+ OString aOStr_IdxContentPathFileURL( OUStringToOString
( aIdxContentPathFileURL, fs::getThreadTextEncoding() ) );
std::string aStdStr_IdxContentPathFileURL( aOStr_IdxContentPathFileURL.getStr() );
@@ -899,10 +899,10 @@ extern "C" void StructuredXMLErrorFunction(void *userData, xmlErrorPtr error)
HelpProcessingErrorInfo& HelpProcessingErrorInfo::operator=( const struct HelpProcessingException& e )
{
m_eErrorClass = e.m_eErrorClass;
- rtl::OString tmpErrorMsg( e.m_aErrorMsg.c_str() );
- m_aErrorMsg = rtl::OStringToOUString( tmpErrorMsg, fs::getThreadTextEncoding() );
- rtl::OString tmpXMLParsingFile( e.m_aXMLParsingFile.c_str() );
- m_aXMLParsingFile = rtl::OStringToOUString( tmpXMLParsingFile, fs::getThreadTextEncoding() );
+ OString tmpErrorMsg( e.m_aErrorMsg.c_str() );
+ m_aErrorMsg = OStringToOUString( tmpErrorMsg, fs::getThreadTextEncoding() );
+ OString tmpXMLParsingFile( e.m_aXMLParsingFile.c_str() );
+ m_aXMLParsingFile = OStringToOUString( tmpXMLParsingFile, fs::getThreadTextEncoding() );
m_nXMLParsingLine = e.m_nXMLParsingLine;
return *this;
}
@@ -911,11 +911,11 @@ HelpProcessingErrorInfo& HelpProcessingErrorInfo::operator=( const struct HelpPr
// Returns true in case of success, false in case of error
HELPLINKER_DLLPUBLIC bool compileExtensionHelp
(
- const rtl::OUString& aOfficeHelpPath,
- const rtl::OUString& aExtensionName,
- const rtl::OUString& aExtensionLanguageRoot,
- sal_Int32 nXhpFileCount, const rtl::OUString* pXhpFiles,
- const rtl::OUString& aDestination,
+ const OUString& aOfficeHelpPath,
+ const OUString& aExtensionName,
+ const OUString& aExtensionLanguageRoot,
+ sal_Int32 nXhpFileCount, const OUString* pXhpFiles,
+ const OUString& aDestination,
HelpProcessingErrorInfo& o_rHelpProcessingErrorInfo
)
{
@@ -924,21 +924,21 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
std::vector<std::string> args;
args.reserve(nXhpFileCount + 2);
args.push_back(std::string("-mod"));
- rtl::OString aOExtensionName = rtl::OUStringToOString( aExtensionName, fs::getThreadTextEncoding() );
+ OString aOExtensionName = OUStringToOString( aExtensionName, fs::getThreadTextEncoding() );
args.push_back(std::string(aOExtensionName.getStr()));
for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
{
- rtl::OUString aXhpFile = pXhpFiles[iXhp];
+ OUString aXhpFile = pXhpFiles[iXhp];
- rtl::OString aOXhpFile = rtl::OUStringToOString( aXhpFile, fs::getThreadTextEncoding() );
+ OString aOXhpFile = OUStringToOString( aXhpFile, fs::getThreadTextEncoding() );
args.push_back(std::string(aOXhpFile.getStr()));
}
- rtl::OString aOExtensionLanguageRoot = rtl::OUStringToOString( aExtensionLanguageRoot, fs::getThreadTextEncoding() );
+ OString aOExtensionLanguageRoot = OUStringToOString( aExtensionLanguageRoot, fs::getThreadTextEncoding() );
const char* pExtensionPath = aOExtensionLanguageRoot.getStr();
std::string aStdStrExtensionPath = pExtensionPath;
- rtl::OString aODestination = rtl::OUStringToOString(aDestination, fs::getThreadTextEncoding());
+ OString aODestination = OUStringToOString(aDestination, fs::getThreadTextEncoding());
const char* pDestination = aODestination.getStr();
std::string aStdStrDestination = pDestination;
@@ -968,8 +968,8 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
xmlSetStructuredErrorFunc( NULL, NULL );
// i83624: Tree files
- ::rtl::OUString aTreeFileURL = aExtensionLanguageRoot;
- aTreeFileURL += rtl::OUString("/help.tree");
+ OUString aTreeFileURL = aExtensionLanguageRoot;
+ aTreeFileURL += OUString("/help.tree");
osl::DirectoryItem aTreeFileItem;
osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
@@ -991,7 +991,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
{
XML_Error nError = XML_GetErrorCode( parser );
o_rHelpProcessingErrorInfo.m_eErrorClass = HELPPROCESSING_XMLPARSING_ERROR;
- o_rHelpProcessingErrorInfo.m_aErrorMsg = rtl::OUString::createFromAscii( XML_ErrorString( nError ) );;
+ o_rHelpProcessingErrorInfo.m_aErrorMsg = OUString::createFromAscii( XML_ErrorString( nError ) );;
o_rHelpProcessingErrorInfo.m_aXMLParsingFile = aTreeFileURL;
// CRAHSES!!! o_rHelpProcessingErrorInfo.m_nXMLParsingLine = XML_GetCurrentLineNumber( parser );
bSuccess = false;
diff --git a/helpcompiler/source/HelpSearch.cxx b/helpcompiler/source/HelpSearch.cxx
index 40022c22b505..cb33d8afd9d2 100644
--- a/helpcompiler/source/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -33,16 +33,16 @@
#include "LuceneHelper.hxx"
-HelpSearch::HelpSearch(rtl::OUString const &lang, rtl::OUString const &indexDir)
+HelpSearch::HelpSearch(OUString const &lang, OUString const &indexDir)
: d_lang(lang)
{
- rtl::OUString ustrSystemPath;
+ OUString ustrSystemPath;
osl::File::getSystemPathFromFileURL(indexDir, ustrSystemPath);
- d_indexDir = rtl::OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
+ d_indexDir = OUStringToOString(ustrSystemPath, osl_getThreadTextEncoding());
}
-bool HelpSearch::query(rtl::OUString const &queryStr, bool captionOnly,
- std::vector<rtl::OUString> &rDocuments, std::vector<float> &rScores) {
+bool HelpSearch::query(OUString const &queryStr, bool captionOnly,
+ std::vector<OUString> &rDocuments, std::vector<float> &rScores) {
lucene::index::IndexReader *reader = lucene::index::IndexReader::open(d_indexDir.getStr());
lucene::search::IndexSearcher searcher(reader);
diff --git a/helpcompiler/source/LuceneHelper.cxx b/helpcompiler/source/LuceneHelper.cxx
index bee9090cc2b7..e11eecad10a4 100644
--- a/helpcompiler/source/LuceneHelper.cxx
+++ b/helpcompiler/source/LuceneHelper.cxx
@@ -29,7 +29,7 @@
#include "LuceneHelper.hxx"
-std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr)
+std::vector<TCHAR> OUStringToTCHARVec(OUString const &rStr)
{
//UTF-16
if (sizeof(TCHAR) == sizeof(sal_Unicode))
@@ -46,14 +46,14 @@ std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr)
return aRet;
}
-rtl::OUString TCHARArrayToOUString(TCHAR const *str)
+OUString TCHARArrayToOUString(TCHAR const *str)
{
// UTF-16
if (sizeof(TCHAR) == sizeof(sal_Unicode))
- return rtl::OUString((const sal_Unicode*)(str));
+ return OUString((const sal_Unicode*)(str));
// UTF-32
- return rtl::OUString((const sal_uInt32*)str, wcslen(str));
+ return OUString((const sal_uInt32*)str, wcslen(str));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/helpcompiler/source/LuceneHelper.hxx b/helpcompiler/source/LuceneHelper.hxx
index a0248f836a1f..59a21965fda8 100644
--- a/helpcompiler/source/LuceneHelper.hxx
+++ b/helpcompiler/source/LuceneHelper.hxx
@@ -53,8 +53,8 @@
#include <rtl/ustring.hxx>
#include <vector>
-std::vector<TCHAR> OUStringToTCHARVec(rtl::OUString const &rStr);
-rtl::OUString TCHARArrayToOUString(TCHAR const *str);
+std::vector<TCHAR> OUStringToTCHARVec(OUString const &rStr);
+OUString TCHARArrayToOUString(TCHAR const *str);
#endif
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
index b96f4a0110de..f512ea8ce224 100644
--- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx
+++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
@@ -46,8 +46,8 @@ namespace
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();
@@ -64,26 +64,26 @@ namespace
test::BootstrapFixture::setUp();
m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance(
- ::rtl::OUString(
+ OUString(
"com.sun.comp.hwpimport.HwpImportFilter")),
uno::UNO_QUERY_THROW);
}
- bool HwpFilterTest::load(const rtl::OUString &,
- const rtl::OUString &rURL, const rtl::OUString &,
+ bool HwpFilterTest::load(const OUString &,
+ const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
uno::Sequence< beans::PropertyValue > aDescriptor(1);
- aDescriptor[0].Name = rtl::OUString("URL");
+ aDescriptor[0].Name = OUString("URL");
aDescriptor[0].Value <<= rURL;
return m_xFilter->filter(aDescriptor);
}
void HwpFilterTest::test()
{
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/hwpfilter/qa/cppunit/data/"),
- rtl::OUString());
+ OUString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(HwpFilterTest);
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 80d3ec6d6c01..bb04fdd4ba6e 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -271,7 +271,7 @@ sal_Bool HwpImportFilter::supportsService( const OUString& ServiceName ) throw(:
//XExtendedFilterDetection
OUString HwpImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw (::com::sun::star::uno::RuntimeException)
{
- rtl::OUString sTypeName;
+ OUString sTypeName;
comphelper::MediaDescriptor aDescriptor(rDescriptor);
aDescriptor.addInputStream();
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx
index f47bfa4b67c2..a20a64dae1e2 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -108,7 +108,7 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
#endif
}
#else /* MACOSX */
- rtl::OString aUnxLang( (pGetLangFromEnv)() );
+ OString aUnxLang( (pGetLangFromEnv)() );
nLang = MsLangId::convertUnxByteStringToLanguage( aUnxLang );
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
rSystemLanguage = nLang;
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index e1eea3b75f04..68c3aebe9768 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -28,9 +28,6 @@
#include "simple-langtag.cxx"
#endif
-using rtl::OUString;
-using rtl::OString;
-using rtl::OUStringBuffer;
using namespace com::sun::star;
// The actual pointer type of mpImplLangtag that is declared void* to not
@@ -80,7 +77,7 @@ public:
teardown();
}
private:
- rtl::OString maDataPath; // path to liblangtag data, "|" if system
+ OString maDataPath; // path to liblangtag data, "|" if system
sal_uInt32 mnRef;
void setupDataPath();
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 7a6ef2ac439e..192400756382 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -50,63 +50,63 @@ public:
BreakIteratorImpl();
~BreakIteratorImpl();
- virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
- virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
- virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
- virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual sal_Bool SAL_CALL isEndWord( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual sal_Int16 SAL_CALL getWordType( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+ virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos,
sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos,
sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos,
sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos,
sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) 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 );
static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar);
@@ -125,11 +125,11 @@ private :
com::sun::star::uno::Reference < XBreakIterator > xBI;
com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
- sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const rtl::OUString& aLocaleName )
+ sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName )
throw( com::sun::star::uno::RuntimeException );
com::sun::star::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const com::sun::star::lang::Locale& rLocale )
throw( com::sun::star::uno::RuntimeException );
- const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& Text,
+ const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const OUString& Text,
sal_Int32 nStartPos, sal_Bool forward, sal_Bool skipWhiteSpace)
throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index d4189922bac5..1f1632618844 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -31,23 +31,23 @@ class BreakIterator_CJK : public BreakIterator_Unicode
public:
BreakIterator_CJK();
- Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+ Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType)
throw(com::sun::star::uno::RuntimeException);
- Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+ Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType)
throw(com::sun::star::uno::RuntimeException);
- Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
+ Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
throw(com::sun::star::uno::RuntimeException);
- LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+ LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
throw(com::sun::star::uno::RuntimeException);
protected:
xdictionary *dict;
- rtl::OUString hangingCharacters;
+ OUString hangingCharacters;
};
#define BREAKITERATOR_CJK( lang ) \
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index f4466b530af5..270f64b395e4 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -32,23 +32,23 @@ class BreakIterator_CTL : public BreakIterator_Unicode
public:
BreakIterator_CTL();
~BreakIterator_CTL();
- virtual sal_Int32 SAL_CALL previousCharacters(const rtl::OUString& text, sal_Int32 start,
+ virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL nextCharacters(const rtl::OUString& text, sal_Int32 start,
+ virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start,
const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException);
- virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
throw(com::sun::star::uno::RuntimeException);
protected:
- rtl::OUString cachedText; // for cell index
+ OUString cachedText; // for cell index
sal_Int32* nextCellIndex;
sal_Int32* previousCellIndex;
sal_Int32 cellIndexSize;
- virtual void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
};
} } } }
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index fed7ad6e7151..19dbeae87e30 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -32,7 +32,7 @@ public:
~BreakIterator_th();
protected:
- void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
+ void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
};
} } } }
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index fe226d4c5b41..2b45fb091f02 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -39,36 +39,36 @@ public:
BreakIterator_Unicode();
~BreakIterator_Unicode();
- virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
- virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
- virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
- virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
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 );
protected:
@@ -77,7 +77,7 @@ protected:
struct BI_Data
{
- rtl::OUString aICUText;
+ OUString aICUText;
UText *ut;
icu::BreakIterator *aBreakIterator;
com::sun::star::lang::Locale maLocale;
@@ -98,7 +98,7 @@ protected:
sal_Int16 aBreakType;
void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale,
- sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const rtl::OUString& rText) throw(com::sun::star::uno::RuntimeException);
+ sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(com::sun::star::uno::RuntimeException);
};
} } } }
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index baf0b600c71f..cc7cafcc3068 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -54,10 +54,10 @@ public:
// Methods
virtual void SAL_CALL loadDefaultCalendar(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException);
@@ -72,10 +72,10 @@ public:
virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
// Methods in XExtendedCalendar
- virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
// XCalendar3
virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException);
@@ -85,15 +85,15 @@ public:
virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() 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:
struct lookupTableItem {
- lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) :
+ lookupTableItem(const OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) :
uniqueID(_uniqueID), xCalendar(_xCalendar) {}
- rtl::OUString uniqueID;
+ OUString uniqueID;
com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 > xCalendar;
};
std::vector<lookupTableItem*> lookupTable;
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index 929f759b2a6b..691af7f9fca9 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -56,7 +56,7 @@ public:
~Calendar_gregorian();
// Methods in XCalendar
- virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException);
@@ -64,7 +64,7 @@ public:
virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException);
virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException);
@@ -73,10 +73,10 @@ public:
virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
// Methods in XExtendedCalendar
- virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
// XCalendar3
virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException);
@@ -86,9 +86,9 @@ public:
virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() 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:
Era *eraArray;
@@ -104,7 +104,7 @@ protected:
virtual void mapFromGregorian() throw(com::sun::star::uno::RuntimeException);
void getValue() throw(com::sun::star::uno::RuntimeException);
- rtl::OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException);
+ OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException);
private:
Calendar2 aCalendar;
@@ -136,8 +136,8 @@ class Calendar_hanja : public Calendar_gregorian
public:
// Constructors
Calendar_hanja();
- virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
};
// ----------------------------------------------------
@@ -170,7 +170,7 @@ public:
Calendar_buddhist();
// Methods in XExtendedCalendar
- virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
};
} } } }
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index f31003e93430..e76bdec4254a 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -34,7 +34,7 @@ public:
Calendar_jewish();
// Methods in XExtendedCalendar
- virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
protected:
void mapToGregorian() throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index d515cfd2b3d3..bace88f5592e 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -38,32 +38,32 @@ public:
cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
~cclass_Unicode();
- virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+ virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+ virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+ virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos )
+ virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos,
+ virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount,
+ virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos,
- const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart,
- sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
- virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text,
+ virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
+ const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
+ sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
+ virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text,
sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
- const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
- const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
+ const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
+ const OUString& userDefinedCharactersCont ) 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:
const sal_Char *cClass;
@@ -123,8 +123,8 @@ private:
com::sun::star::lang::Locale aParserLocale;
com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData;
com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup;
- rtl::OUString aStartChars;
- rtl::OUString aContChars;
+ OUString aStartChars;
+ OUString aContChars;
UPT_FLAG_TYPE* pTable;
UPT_FLAG_TYPE* pStart;
UPT_FLAG_TYPE* pCont;
@@ -151,26 +151,26 @@ private:
/// Setup parser table. Calls initParserTable() only if needed.
void setupParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType,
- const rtl::OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
- const rtl::OUString& userDefinedCharactersCont );
+ const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
+ const OUString& userDefinedCharactersCont );
/// Init parser table.
void initParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType,
- const rtl::OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
- const rtl::OUString& userDefinedCharactersCont );
+ const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
+ const OUString& userDefinedCharactersCont );
/// Destroy parser table.
void destroyParserTable();
/// Parse a text.
- void parseText( ParseResult& r, const rtl::OUString& rText, sal_Int32 nPos,
+ void parseText( ParseResult& r, const OUString& rText, sal_Int32 nPos,
sal_Int32 nTokenType = 0xffffffff );
/// Setup International class, new'ed only if different from existing.
sal_Bool setupInternational( const com::sun::star::lang::Locale& rLocale );
/// Implementation of getCharacterType() for one single character
- sal_Int32 SAL_CALL getCharType( const rtl::OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
+ sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
};
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 83518d64a812..c9723563c3dd 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -35,14 +35,14 @@ public:
// Destructor
~ChapterCollator();
- sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException);
+ sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+ sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) 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 :
// CharacterClassification Implementation
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 2c7d34bbeb47..141fcac04e93 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -39,53 +39,53 @@ public:
CharacterClassificationImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
virtual ~CharacterClassificationImpl();
- virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text,
+ virtual OUString SAL_CALL toUpper( const OUString& Text,
sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text,
+ virtual OUString SAL_CALL toLower( const OUString& Text,
sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos,
sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos )
+ virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos )
+ virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos )
+ virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos,
+ virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos,
+ virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos,
sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos,
+ virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
- const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
- const rtl::OUString& userDefinedCharactersCont )
+ const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
+ const OUString& userDefinedCharactersCont )
throw(com::sun::star::uno::RuntimeException);
virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
- const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale,
- sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart,
- sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont )
+ const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale,
+ sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
+ sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont )
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 );
private:
struct lookupTableItem {
- lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName,
+ lookupTableItem(const com::sun::star::lang::Locale& rLocale, const OUString& rName,
com::sun::star::uno::Reference < XCharacterClassification >& rxCI) :
aLocale(rLocale), aName(rName), xCI(rxCI) {};
com::sun::star::lang::Locale aLocale;
- rtl::OUString aName;
+ OUString aName;
com::sun::star::uno::Reference < XCharacterClassification > xCI;
sal_Bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) {
return aLocale.Language == rLocale.Language &&
@@ -102,7 +102,7 @@ private:
com::sun::star::uno::Reference < XCharacterClassification > SAL_CALL
getLocaleSpecificCharacterClassification(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL
- createLocaleSpecificCharacterClassification(const rtl::OUString& serviceName, const com::sun::star::lang::Locale& rLocale);
+ createLocaleSpecificCharacterClassification(const OUString& serviceName, const com::sun::star::lang::Locale& rLocale);
};
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 52409c59796f..b6ba6398f5df 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -47,43 +47,43 @@ public:
// Destructor
~CollatorImpl();
- virtual sal_Int32 SAL_CALL compareSubstring(const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL compareSubstring(const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1,
- const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL compareString( const OUString& s1,
+ const OUString& s2) throw(com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions)
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const rtl::OUString& impl, const lang::Locale& rLocale,
+ virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString& impl, const lang::Locale& rLocale,
+ virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale,
const com::sun::star::uno::Sequence< sal_Int32 >& collatorOptions) throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale )
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& collatorAlgorithmName )
+ virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName )
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:
lang::Locale nLocale;
private :
struct lookupTableItem {
lang::Locale aLocale;
- rtl::OUString algorithm;
- rtl::OUString service;
+ OUString algorithm;
+ OUString service;
com::sun::star::uno::Reference < XCollator > xC;
- lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service,
+ lookupTableItem(const lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service,
com::sun::star::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {}
- sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const rtl::OUString& _algorithm) {
+ sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) {
return aLocale.Language == rLocale.Language &&
aLocale.Country == rLocale.Country &&
aLocale.Variant == rLocale.Variant &&
@@ -98,9 +98,9 @@ private :
// lang::Locale Data
com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData;
- sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName,
- const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException);
- void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm)
+ sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName,
+ const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException);
+ void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm)
throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index c3a5491d45fa..daf99068e156 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -40,30 +40,30 @@ public:
// Destructor
~Collator_Unicode();
- sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+ sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+ sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
throw(com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL loadCollatorAlgorithm( const rtl::OUString& impl, const lang::Locale& rLocale,
+ sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException);
// following 4 methods are implemented in collatorImpl.
sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32)
throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
- void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString&, const lang::Locale&,
+ void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&,
const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&)
+ com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&)
throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
- com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& )
+ com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& )
throw(com::sun::star::uno::RuntimeException) {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:
const sal_Char *implementationName;
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 53f56e5158dd..94a18f8beb5c 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -39,9 +39,9 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper4
com::sun::star::lang::XServiceInfo
>
{
- void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
- void GetCharStr( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
- void GetRomanString( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
+ void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
+ void GetCharStr( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
+ void GetRomanString( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
void impl_loadTranslit();
public:
DefaultNumberingProvider(
@@ -60,7 +60,7 @@ public:
throw(com::sun::star::uno::RuntimeException);
//XNumberingFormatter
- virtual rtl::OUString SAL_CALL makeNumberingString(
+ virtual OUString SAL_CALL makeNumberingString(
const com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& aProperties,
const com::sun::star::lang::Locale& aLocale )
@@ -70,27 +70,27 @@ public:
//XNumberingTypeInfo
virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getNumberingType( const rtl::OUString& NumberingIdentifier )
+ virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier )
throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasNumberingType( const rtl::OUString& NumberingIdentifier )
+ virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier )
throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType )
+ virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType )
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 );
private:
com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
com::sun::star::uno::Reference < com::sun::star::container::XHierarchicalNameAccess > xHierarchicalNameAccess;
TransliterationImpl* translit;
- rtl::OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index )
+ OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index )
throw(com::sun::star::uno::RuntimeException);
- sal_Bool SAL_CALL isScriptFlagEnabled(const rtl::OUString& aName )
+ sal_Bool SAL_CALL isScriptFlagEnabled(const OUString& aName )
throw(com::sun::star::uno::RuntimeException);
};
} } } }
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 698e93df19ea..bda8f3f831da 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -42,60 +42,60 @@ public:
virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList(
+ virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL loadAlgorithm(
const com::sun::star::lang::Locale& rLocale,
- const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions )
throw (com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL usePhoneticEntry(
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry,
+ virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
- const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+ virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
+ const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
- const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
- const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+ virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
+ const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
+ const OUString& IndexEntry2, const OUString& PhoneticEntry2,
const com::sun::star::lang::Locale& rLocale2 )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& IndexEntry,
- const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm )
+ virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry,
+ const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
+ virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
const com::sun::star::lang::Locale& rLocale )
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:
- rtl::OUString aServiceName;
+ OUString aServiceName;
com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
- sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const rtl::OUString& name) throw( com::sun::star::uno::RuntimeException );
+ sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( com::sun::star::uno::RuntimeException );
com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL getLocaleSpecificIndexEntrySupplier(
- const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException);
+ const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException);
protected:
com::sun::star::lang::Locale aLocale;
- rtl::OUString aSortAlgorithm;
+ OUString aSortAlgorithm;
};
} } } }
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index d15ae9703655..687698e45af3 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -34,19 +34,19 @@ public:
IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
~IndexEntrySupplier_asian();
- rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
- const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm )
+ OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
+ const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm )
throw (com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry,
- const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale)
+ OUString SAL_CALL getIndexKey( const OUString& rIndexEntry,
+ const OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale)
throw (com::sun::star::uno::RuntimeException);
sal_Int16 SAL_CALL compareIndexEntry(
- const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1,
+ const OUString& rIndexEntry1, const OUString& rPhoneticEntry1,
const com::sun::star::lang::Locale& rLocale1,
- const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2,
+ const OUString& rIndexEntry2, const OUString& rPhoneticEntry2,
const com::sun::star::lang::Locale& rLocale2 )
throw (com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& rIndexEntry,
+ OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry,
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
#ifndef DISABLE_DYNLOADING
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index 65277c2b5220..c006ad64dc7d 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -44,7 +44,7 @@ public:
virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList(
+ virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
@@ -52,50 +52,50 @@ public:
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry,
+ virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL loadAlgorithm(
const com::sun::star::lang::Locale& rLocale,
- const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
- const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+ virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
+ const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
- const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
- const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+ virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
+ const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
+ const OUString& IndexEntry2, const OUString& PhoneticEntry2,
const com::sun::star::lang::Locale& rLocale2 )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
- const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm )
+ virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
+ const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
+ virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
const com::sun::star::lang::Locale& rLocale )
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 );
protected:
const sal_Char *implementationName;
sal_Bool usePhonetic;
CollatorImpl *collator;
- const rtl::OUString& SAL_CALL getEntry( const rtl::OUString& IndexEntry,
- const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+ const OUString& SAL_CALL getEntry( const OUString& IndexEntry,
+ const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
com::sun::star::lang::Locale aLocale;
- rtl::OUString aAlgorithm;
+ OUString aAlgorithm;
};
} } } }
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 757a849af46a..37fffddc3831 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -35,21 +35,21 @@ public:
virtual sal_Bool SAL_CALL loadAlgorithm(
const com::sun::star::lang::Locale& rLocale,
- const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
- const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+ virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
+ const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
throw (com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
- const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
- const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+ virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
+ const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
+ const OUString& IndexEntry2, const OUString& PhoneticEntry2,
const com::sun::star::lang::Locale& rLocale2 )
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
- const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm )
+ virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
+ const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm )
throw (com::sun::star::uno::RuntimeException);
private:
@@ -58,8 +58,8 @@ private:
struct IndexKey {
sal_Unicode key;
- rtl::OUString mkey;
- rtl::OUString desc;
+ OUString mkey;
+ OUString desc;
};
class IndexTable
@@ -84,11 +84,11 @@ public:
Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext);
~Index();
- void init(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm) throw (com::sun::star::uno::RuntimeException);
+ void init(const com::sun::star::lang::Locale& rLocale, const OUString& algorithm) throw (com::sun::star::uno::RuntimeException);
- void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const rtl::OUString &algorithm) throw (com::sun::star::uno::RuntimeException);
- sal_Int16 getIndexWeight(const rtl::OUString& rIndexEntry);
- rtl::OUString getIndexDescription(const rtl::OUString& rIndexEntry);
+ void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const OUString &algorithm) throw (com::sun::star::uno::RuntimeException);
+ sal_Int16 getIndexWeight(const OUString& rIndexEntry);
+ OUString getIndexDescription(const OUString& rIndexEntry);
IndexTable tables[MAX_TABLES];
sal_Int16 table_count;
@@ -96,7 +96,7 @@ public:
sal_Int16 key_count;
sal_Int16 mkeys[MAX_KEYS];
sal_Int16 mkey_count;
- rtl::OUString skipping_chars;
+ OUString skipping_chars;
CollatorImpl *collator;
sal_Int16 compare(sal_Unicode c1, sal_Unicode c2);
};
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 33c8f7378390..85204c805f8f 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -33,15 +33,15 @@ public:
IndexEntrySupplier_ja_phonetic( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) {
implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic";
};
- virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,\
- const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm ) \
+ virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,\
+ const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \
throw (com::sun::star::uno::RuntimeException);\
- virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, \
- const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\
+ virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, \
+ const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\
throw (com::sun::star::uno::RuntimeException);\
- virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,\
- const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\
- const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,\
+ virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,\
+ const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\
+ const OUString& IndexEntry2, const OUString& PhoneticEntry2,\
const com::sun::star::lang::Locale& rLocale2 )\
throw (com::sun::star::uno::RuntimeException);\
};
@@ -54,7 +54,7 @@ public:\
};\
virtual sal_Bool SAL_CALL loadAlgorithm(\
const com::sun::star::lang::Locale& rLocale,\
- const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) \
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \
throw (com::sun::star::uno::RuntimeException);\
};
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 780ffe8d402f..925b7d1daabd 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -43,17 +43,17 @@ public:
InputSequenceCheckerImpl();
~InputSequenceCheckerImpl();
- virtual sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos,
+ virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) 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 );
protected:
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 6ede14da2cad..c91a3f4750ee 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -35,10 +35,10 @@ public:
InputSequenceChecker_hi();
~InputSequenceChecker_hi();
- sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos,
+ sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos,
+ sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 679dd4fae269..a9e72b12c76d 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -32,10 +32,10 @@ public:
InputSequenceChecker_th();
~InputSequenceChecker_th();
- sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos,
+ sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
- sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos,
+ sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 350646ad8d83..dbab5ca6d32e 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -83,36 +83,36 @@ public:
virtual com::sun::star::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
virtual com::sun::star::uno::Sequence< com::sun::star::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
// XLocaleData4
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
// following methods are used by indexentry service
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getDefaultIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexKeysByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getDefaultIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getIndexKeysByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) 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 :
friend sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2);
@@ -120,13 +120,13 @@ private :
::std::auto_ptr< LocaleDataLookupTableItem > cachedItem;
oslGenericFunction SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException );
- oslGenericFunction SAL_CALL getFunctionSymbolByName( const rtl::OUString& localeName, const sal_Char* pFunction );
+ oslGenericFunction SAL_CALL getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction );
sal_Unicode ** SAL_CALL getIndexArray(const com::sun::star::lang::Locale& rLocale, sal_Int16& indexCount);
- sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm);
+ sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm);
com::sun::star::i18n::Calendar2 ref_cal;
- rtl::OUString ref_name;
+ OUString ref_name;
com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > &
- getCalendarItemByName(const rtl::OUString& name,
+ getCalendarItemByName(const OUString& name,
const com::sun::star::lang::Locale& rLocale,
const com::sun::star::uno::Sequence< com::sun::star::i18n::Calendar2 >& calendarsSeq,
sal_Int16 item) throw( com::sun::star::uno::RuntimeException );
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 510b10395f5a..58c7ec4ed85a 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -40,7 +40,7 @@ public:
NativeNumberSupplier(sal_Bool _useOffset = sal_False) : useOffset(_useOffset) {}
// Methods
- virtual ::rtl::OUString SAL_CALL getNativeNumberString( const ::rtl::OUString& aNumberString,
+ virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
throw (::com::sun::star::uno::RuntimeException);
@@ -57,15 +57,15 @@ 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 );
// following methods are not for XNativeNumberSupplier, they are for calling from transliterations
- ::rtl::OUString SAL_CALL getNativeNumberString( const ::rtl::OUString& aNumberString,
+ OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode,
com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index f89cbfeecbcd..5d6011f896c3 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -46,11 +46,11 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) 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 );
private:
@@ -62,10 +62,10 @@ private:
void setupLocale( const ::com::sun::star::lang::Locale& rLocale );
void getFormats( const ::com::sun::star::lang::Locale& rLocale );
- ::rtl::OUString mapElementTypeShortToString(sal_Int16 formatType);
- sal_Int16 mapElementTypeStringToShort(const ::rtl::OUString& formatType);
- ::rtl::OUString mapElementUsageShortToString(sal_Int16 formatUsage);
- sal_Int16 mapElementUsageStringToShort(const ::rtl::OUString& formatUsage);
+ OUString mapElementTypeShortToString(sal_Int16 formatType);
+ sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
+ OUString mapElementUsageShortToString(sal_Int16 formatUsage);
+ sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
void createLocaleDataObject();
};
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index fb746be4bd6f..17d4bc566aee 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -36,12 +36,12 @@ class OrdinalSuffix : public cppu::WeakImplHelper2
virtual ~OrdinalSuffix();
// XOrdinalSuffix
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) 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/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index e31c97dd7ec0..a6a3cf275a1b 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -41,17 +41,17 @@ public:
#endif
~TextToPronounce_zh();
- rtl::OUString SAL_CALL
- folding(const rtl::OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset)
+ OUString SAL_CALL
+ folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset)
throw (com::sun::star::uno::RuntimeException);
sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL
- equals( const rtl::OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const rtl::OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
+ equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
throw (com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL
+ OUString SAL_CALL
transliterateChar2String( sal_Unicode inChar)
throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 7e8535d6392c..c4c789729c48 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -44,21 +44,21 @@ public:
~TextConversion();
// Methods
virtual com::sun::star::i18n::TextConversionResult SAL_CALL
- getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException ) = 0;
- virtual rtl::OUString SAL_CALL
- getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ virtual OUString SAL_CALL
+ getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException ) = 0;
- virtual rtl::OUString SAL_CALL
- getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ virtual OUString SAL_CALL
+ getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw( com::sun::star::uno::RuntimeException,
@@ -72,13 +72,13 @@ public:
com::sun::star::lang::NoSupportException ) = 0;
//XServiceInfo
- rtl::OUString SAL_CALL
+ OUString SAL_CALL
getImplementationName()
throw( com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL
- supportsService(const rtl::OUString& ServiceName)
+ 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
getSupportedServiceNames()
throw( com::sun::star::uno::RuntimeException );
protected :
@@ -106,21 +106,21 @@ public:
// Methods
com::sun::star::i18n::TextConversionResult SAL_CALL
- getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException );
- rtl::OUString SAL_CALL
- getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ OUString SAL_CALL
+ getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException );
- rtl::OUString SAL_CALL
- getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ OUString SAL_CALL
+ getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw( com::sun::star::uno::RuntimeException,
@@ -141,8 +141,8 @@ private :
com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL;
sal_Int32 maxLeftLength;
sal_Int32 maxRightLength;
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
- getCharConversions(const rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja);
+ com::sun::star::uno::Sequence< OUString > SAL_CALL
+ getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja);
};
// ----------------------------------------------------
@@ -162,21 +162,21 @@ public:
// Methods
com::sun::star::i18n::TextConversionResult SAL_CALL
- getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException );
- rtl::OUString SAL_CALL
- getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ OUString SAL_CALL
+ getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException );
- rtl::OUString SAL_CALL
- getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ OUString SAL_CALL
+ getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw( com::sun::star::uno::RuntimeException,
@@ -192,7 +192,7 @@ public:
private :
// user defined dictionary list
com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL;
- rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText,
+ OUString SAL_CALL getWordConversion(const OUString& aText,
sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset);
rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions);
com::sun::star::lang::Locale aLocale;
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index a7fd9233c880..4d83cf23228b 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -41,21 +41,21 @@ public:
// Methods
com::sun::star::i18n::TextConversionResult SAL_CALL
- getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException );
- rtl::OUString SAL_CALL
- getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ OUString SAL_CALL
+ getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions )
throw( com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException );
- rtl::OUString SAL_CALL
- getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+ OUString SAL_CALL
+ getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw( com::sun::star::uno::RuntimeException,
@@ -69,13 +69,13 @@ public:
com::sun::star::lang::NoSupportException );
//XServiceInfo
- rtl::OUString SAL_CALL
+ OUString SAL_CALL
getImplementationName()
throw( com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL
- supportsService(const rtl::OUString& ServiceName)
+ 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
getSupportedServiceNames()
throw( com::sun::star::uno::RuntimeException );
private :
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index fd12616507d1..1e41c5066a67 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -49,54 +49,54 @@ public:
~TransliterationImpl();
// Methods
- virtual rtl::OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException) ;
+ virtual OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException) ;
virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException) ;
virtual void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException) ;
virtual void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
- virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName,
+ virtual void SAL_CALL loadModuleByImplName( const OUString& implName,
const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist,
+ virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist,
const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules(
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules(
const com::sun::star::lang::Locale& rLocale, sal_Int16 sType )
throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+ virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException) ;
- virtual rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+ virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException);
// Methods in XExtendedTransliteration
- virtual rtl::OUString SAL_CALL transliterateString2String( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
+ virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
throw(com::sun::star::uno::RuntimeException) ;
- virtual rtl::OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
+ virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
throw(com::sun::star::uno::RuntimeException) ;
virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar )
throw(com::sun::star::i18n::MultipleCharsOutputException,
com::sun::star::uno::RuntimeException) ;
- virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1,
- sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+ virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1,
+ sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
throw(com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1,
- const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ;
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
+ const OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ;
- virtual sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+ virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
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)
+ 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< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
throw( com::sun::star::uno::RuntimeException );
private:
@@ -108,18 +108,18 @@ private:
com::sun::star::uno::Reference< XLocaleData4 > mxLocaledata;
com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > caseignore;
- virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName,
+ virtual sal_Bool SAL_CALL loadModuleByName( const OUString& implName,
com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale)
throw(com::sun::star::uno::RuntimeException);
void clear();
- void loadBody( ::rtl::OUString &implName,
+ void loadBody( OUString &implName,
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration >& body )
throw (::com::sun::star::uno::RuntimeException);
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getRange(
- const com::sun::star::uno::Sequence< rtl::OUString > &inStrs,
+ com::sun::star::uno::Sequence< OUString > SAL_CALL getRange(
+ const com::sun::star::uno::Sequence< OUString > &inStrs,
sal_Int32 length, const sal_Int16 _nCascade)
throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index f76ac928c79f..26f92523c8d5 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -36,27 +36,27 @@ namespace com { namespace sun { namespace star { namespace i18n {
class transliteration_Ignore : public transliteration_commonclass
{
public:
- virtual rtl::OUString SAL_CALL
- folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
+ virtual OUString SAL_CALL
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
throw(com::sun::star::uno::RuntimeException);
// This method is shared.
sal_Bool SAL_CALL
- equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+ equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
throw(com::sun::star::uno::RuntimeException);
// This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used.
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
- transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+ com::sun::star::uno::Sequence< OUString > SAL_CALL
+ transliterateRange( const OUString& str1, const OUString& str2 )
throw(com::sun::star::uno::RuntimeException);
// Methods which are shared.
sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL
- transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+ OUString SAL_CALL
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw(com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL
@@ -64,8 +64,8 @@ public:
throw(com::sun::star::uno::RuntimeException,
com::sun::star::i18n::MultipleCharsOutputException);
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
- transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 )
+ com::sun::star::uno::Sequence< OUString > SAL_CALL
+ transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 )
throw(com::sun::star::uno::RuntimeException);
protected:
@@ -125,7 +125,7 @@ public:\
transliterationName = "ignore"#name;\
implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
};\
- rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
+ OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \
};
@@ -153,11 +153,11 @@ public:\
transliterationName = "ignore"#name;\
implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
};\
- rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
+ OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \
using transliteration_Ignore::transliterateRange;\
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1, \
- const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \
+ com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \
+ const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \
sal_Unicode SAL_CALL \
transliterateChar2Char( sal_Unicode inChar) \
throw(com::sun::star::uno::RuntimeException,\
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index 2658d0a05dec..585e6014c4b7 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -25,8 +25,8 @@ namespace com { namespace sun { namespace star { namespace i18n {
class transliteration_Numeric : public transliteration_commonclass {
public:
- virtual ::rtl::OUString SAL_CALL
- transliterate( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
+ virtual OUString SAL_CALL
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL
@@ -37,16 +37,16 @@ public:
// Methods which are shared.
virtual sal_Int16 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
- folding( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
+ virtual OUString SAL_CALL
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
- equals( const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+ equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
- transliterateRange( const ::rtl::OUString& str1, const ::rtl::OUString& str2 )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+ transliterateRange( const OUString& str1, const OUString& str2 )
throw(::com::sun::star::uno::RuntimeException);
protected:
sal_Int16 nNativeNumberMode;
@@ -54,8 +54,8 @@ protected:
sal_Unicode* table;
sal_Bool recycleSymbol;
private:
- rtl::OUString SAL_CALL
- transliterateBullet( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+ OUString SAL_CALL
+ transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index 838fe92219f3..36504c37f699 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -29,8 +29,8 @@ typedef sal_Unicode (*TransFunc)(const sal_Unicode);
class transliteration_OneToOne : public transliteration_commonclass
{
public:
- rtl::OUString SAL_CALL
- transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+ OUString SAL_CALL
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw(com::sun::star::uno::RuntimeException);
sal_Unicode SAL_CALL
@@ -41,17 +41,17 @@ public:
// Methods which are shared.
sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL
- folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
+ OUString SAL_CALL
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL
- equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+ equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
throw(com::sun::star::uno::RuntimeException);
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
- transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+ com::sun::star::uno::Sequence< OUString > SAL_CALL
+ transliterateRange( const OUString& str1, const OUString& str2 )
throw(com::sun::star::uno::RuntimeException);
protected:
@@ -64,8 +64,8 @@ class name : public transliteration_OneToOne \
{ \
public: \
name (); \
- rtl::OUString SAL_CALL \
- transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \
+ OUString SAL_CALL \
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \
throw(com::sun::star::uno::RuntimeException); \
sal_Unicode SAL_CALL \
transliterateChar2Char( sal_Unicode inChar) \
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index cddc9ed2acb7..9fb480038aab 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -32,10 +32,10 @@ public:
// Methods which are shared.
sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL transliterate(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+ OUString SAL_CALL transliterate(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException);
- rtl::OUString SAL_CALL
+ OUString SAL_CALL
transliterateChar2String( sal_Unicode inChar)
throw(com::sun::star::uno::RuntimeException);
@@ -44,16 +44,16 @@ public:
throw(com::sun::star::uno::RuntimeException,
com::sun::star::i18n::MultipleCharsOutputException);
- rtl::OUString SAL_CALL folding(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+ OUString SAL_CALL folding(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL equals(
- const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+ const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
throw(com::sun::star::uno::RuntimeException);
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1,
- const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
+ const OUString& str2 ) throw(com::sun::star::uno::RuntimeException);
protected:
sal_uInt8 nMappingType;
@@ -95,7 +95,7 @@ class Transliteration_titlecase : public Transliteration_body
public:
Transliteration_titlecase();
- virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException);
};
class Transliteration_sentencecase : public Transliteration_body
@@ -103,7 +103,7 @@ class Transliteration_sentencecase : public Transliteration_body
public:
Transliteration_sentencecase();
- virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException);
};
#endif
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index 56b243648ed8..bac9c614bf1e 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -35,31 +35,31 @@ public:
void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange(
- const rtl::OUString& str1, const rtl::OUString& str2 )
+ com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange(
+ const OUString& str1, const OUString& str2 )
throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL equals(
- const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const rtl::OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+ const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
throw(com::sun::star::uno::RuntimeException);
sal_Int32 SAL_CALL compareSubstring(
- const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2)
+ const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2)
throw(com::sun::star::uno::RuntimeException);
sal_Int32 SAL_CALL compareString(
- const rtl::OUString& s1,
- const rtl::OUString& s2)
+ const OUString& s1,
+ const OUString& s2)
throw(com::sun::star::uno::RuntimeException);
protected:
TransliterationModules moduleLoaded;
private:
sal_Int32 SAL_CALL compare(
- const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+ const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
throw(com::sun::star::uno::RuntimeException);
};
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 058973aa07f7..6e909eaad4f5 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -42,35 +42,35 @@ public:
throw(com::sun::star::uno::RuntimeException);
void SAL_CALL
- loadModuleByImplName( const rtl::OUString& implName, const com::sun::star::lang::Locale& rLocale )
+ loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale )
throw(com::sun::star::uno::RuntimeException);
void SAL_CALL
- loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale)
+ loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale)
throw(com::sun::star::uno::RuntimeException);
- com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ com::sun::star::uno::Sequence< OUString > SAL_CALL
getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType )
throw(com::sun::star::uno::RuntimeException);
// Methods which should be implemented in each transliteration module.
- virtual rtl::OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException) = 0;
- virtual rtl::OUString SAL_CALL
- transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset )
+ virtual OUString SAL_CALL
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset )
throw(com::sun::star::uno::RuntimeException) = 0;
- virtual rtl::OUString SAL_CALL
- folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
+ virtual OUString SAL_CALL
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
throw(com::sun::star::uno::RuntimeException) = 0;
// Methods in XExtendedTransliteration
- virtual rtl::OUString SAL_CALL
- transliterateString2String( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
+ virtual OUString SAL_CALL
+ transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
throw(com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
transliterateChar2String( sal_Unicode inChar)
throw(com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL
@@ -79,27 +79,27 @@ public:
com::sun::star::uno::RuntimeException) = 0;
virtual sal_Bool SAL_CALL
- equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+ equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
throw(com::sun::star::uno::RuntimeException) = 0;
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
- transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+ transliterateRange( const OUString& str1, const OUString& str2 )
throw(com::sun::star::uno::RuntimeException) = 0;
virtual sal_Int32 SAL_CALL
- compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2)
+ compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2)
throw(com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL
- compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+ compareString( const OUString& s1, const OUString& s2)
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 );
protected:
com::sun::star::lang::Locale aLocale;
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index 8823a5ed3799..60fe370b8fde 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -35,20 +35,20 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper2
{
public:
// Methods
- virtual sal_Int32 SAL_CALL beginOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL endOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL endOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) 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 );
};
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 12cc9088a957..847cb097a3f1 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -57,15 +57,15 @@ private:
public:
xdictionary(const sal_Char *lang);
~xdictionary();
- Boundary nextWord( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
- Boundary previousWord( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
- Boundary getWordBoundary( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection );
+ Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
+ Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
+ Boundary getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection );
void setJapaneseWordBreak();
private:
WordBreakCache cache[CACHE_MAX];
- sal_Bool seekSegment(const rtl::OUString& rText, sal_Int32 pos, Boundary& boundary);
+ sal_Bool seekSegment(const OUString& rText, sal_Int32 pos, Boundary& boundary);
WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
sal_Bool exists(const sal_uInt32 u);
sal_Int32 getLongestMatch(const sal_Unicode *text, sal_Int32 len);
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 1e47e9854521..190982b60495 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -91,10 +91,10 @@ void TestBreakIterator::testLineBreaking()
//See https://bugs.freedesktop.org/show_bug.cgi?id=31271
{
- rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
+ OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
{
//Here we want the line break to leave text here) on the next line
@@ -112,11 +112,11 @@ void TestBreakIterator::testLineBreaking()
//See https://bugs.freedesktop.org/show_bug.cgi?id=49849
{
const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
- rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
- rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
+ OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
+ OUString aTest(OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
- aLocale.Language = rtl::OUString("he");
- aLocale.Country = rtl::OUString("IL");
+ aLocale.Language = OUString("he");
+ aLocale.Country = OUString("IL");
{
//Here we want the line break to happen at the whitespace
@@ -127,10 +127,10 @@ void TestBreakIterator::testLineBreaking()
//See https://issues.apache.org/ooo/show_bug.cgi?id=17155
{
- rtl::OUString aTest("foo /bar/baz");
+ OUString aTest("foo /bar/baz");
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
{
//Here we want the line break to leave /bar/ba clumped together on the next line
@@ -142,10 +142,10 @@ void TestBreakIterator::testLineBreaking()
//See https://issues.apache.org/ooo/show_bug.cgi?id=19716
{
- rtl::OUString aTest("aaa]aaa");
+ OUString aTest("aaa]aaa");
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
{
//Here we want the line break to move the whole lot to the next line
@@ -160,14 +160,14 @@ void TestBreakIterator::testLineBreaking()
void TestBreakIterator::testWordBoundaries()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
i18n::Boundary aBounds;
//See https://issues.apache.org/ooo/show_bug.cgi?id=11993
{
- rtl::OUString aTest("abcd ef ghi??? KLM");
+ OUString aTest("abcd ef ghi??? KLM");
CPPUNIT_ASSERT(!m_xBreak->isBeginWord(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD));
CPPUNIT_ASSERT(m_xBreak->isEndWord(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD));
@@ -198,7 +198,7 @@ void TestBreakIterator::testWordBoundaries()
//See https://issues.apache.org/ooo/show_bug.cgi?id=21907
{
- rtl::OUString aTest("b a?");
+ OUString aTest("b a?");
CPPUNIT_ASSERT(m_xBreak->isBeginWord(aTest, 1, aLocale, i18n::WordType::ANY_WORD));
CPPUNIT_ASSERT(m_xBreak->isBeginWord(aTest, 2, aLocale, i18n::WordType::ANY_WORD));
@@ -226,7 +226,7 @@ void TestBreakIterator::testWordBoundaries()
't', ' ', 'e', 'v', 'e', 'n', ' ' , 0x00BF, 'r', 'e', 'a', 'l', '?', ' ',
'S', 'p', 'a', 'n', 'i', 's', 'h'
};
- rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
+ OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale, i18n::WordType::DICTIONARY_WORD, false);
CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 7);
@@ -257,8 +257,8 @@ void TestBreakIterator::testWordBoundaries()
//make sure that in all cases isBeginWord and isEndWord matches getWordBoundary
for (size_t i = 0; i < SAL_N_ELEMENTS(aBreakTests); ++i)
{
- rtl::OUString aTest("Word");
- aTest += rtl::OUString(aBreakTests[i]) + rtl::OUString("Word");
+ OUString aTest("Word");
+ aTest += OUString(aBreakTests[i]) + OUString("Word");
aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true);
switch (mode)
{
@@ -287,8 +287,8 @@ void TestBreakIterator::testWordBoundaries()
//make sure that in all cases isBeginWord and isEndWord matches getWordBoundary
for (size_t i = 0; i < SAL_N_ELEMENTS(aJoinTests); ++i)
{
- rtl::OUString aTest("Word");
- aTest += rtl::OUString(aJoinTests[i]) + rtl::OUString("Word");
+ OUString aTest("Word");
+ aTest += OUString(aJoinTests[i]) + OUString("Word");
aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true);
switch (mode)
{
@@ -313,7 +313,7 @@ void TestBreakIterator::testWordBoundaries()
//See https://issues.apache.org/ooo/show_bug.cgi?id=13494
{
- const rtl::OUString aBase("xxAAxxBBxxCCxx");
+ const OUString aBase("xxAAxxBBxxCCxx");
const sal_Unicode aTests[] =
{
'\'', ';', ',', '.', '!', '@', '#', '%', '&', '*',
@@ -324,7 +324,7 @@ void TestBreakIterator::testWordBoundaries()
const sal_Int32 aDoublePositions[] = {0, 2, 4, 6, 8, 10, 12, 14};
for (size_t j = 0; j < SAL_N_ELEMENTS(aTests); ++j)
{
- rtl::OUString aTest = aBase.replace('x', aTests[j]);
+ OUString aTest = aBase.replace('x', aTests[j]);
sal_Int32 nPos = -1;
size_t i = 0;
do
@@ -347,7 +347,7 @@ void TestBreakIterator::testWordBoundaries()
const sal_Int32 aSinglePositions[] = {0, 1, 3, 4, 6, 7, 9, 10};
for (size_t j = 1; j < SAL_N_ELEMENTS(aTests); ++j)
{
- rtl::OUString aTest = aBase.replaceAll(rtl::OUString("xx"), rtl::OUString(aTests[j]));
+ OUString aTest = aBase.replaceAll(OUString("xx"), OUString(aTests[j]));
sal_Int32 nPos = -1;
size_t i = 0;
do
@@ -370,7 +370,7 @@ void TestBreakIterator::testWordBoundaries()
const sal_Int32 aSingleQuotePositions[] = {0, 1, 9, 10};
CPPUNIT_ASSERT(aTests[0] == '\'');
{
- rtl::OUString aTest = aBase.replaceAll(rtl::OUString("xx"), rtl::OUString(aTests[0]));
+ OUString aTest = aBase.replaceAll(OUString("xx"), OUString(aTests[0]));
sal_Int32 nPos = -1;
size_t i = 0;
do
@@ -393,10 +393,10 @@ void TestBreakIterator::testWordBoundaries()
//See https://issues.apache.org/ooo/show_bug.cgi?id=13451
{
- aLocale.Language = rtl::OUString("ca");
- aLocale.Country = rtl::OUString("ES");
+ aLocale.Language = OUString("ca");
+ aLocale.Country = OUString("ES");
- rtl::OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!");
+ OUString aTest("mirar-se comprar-vos donem-nos les mans aneu-vos-en!");
sal_Int32 nPos = 0;
sal_Int32 aExpected[] = {8, 20, 30, 34, 39, 51, 52};
@@ -418,12 +418,12 @@ void TestBreakIterator::testWordBoundaries()
switch (j)
{
case 0:
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
break;
case 1:
- aLocale.Language = rtl::OUString("ca");
- aLocale.Country = rtl::OUString("ES");
+ aLocale.Language = OUString("ca");
+ aLocale.Country = OUString("ES");
break;
default:
CPPUNIT_ASSERT(false);
@@ -434,7 +434,7 @@ void TestBreakIterator::testWordBoundaries()
{
'I', 0x200B, 'w', 'a', 'n', 't', 0x200B, 't', 'o', 0x200B, 'g', 'o'
};
- rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
+ OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
sal_Int32 nPos = 0;
sal_Int32 aExpected[] = {1, 6, 9, 12};
@@ -456,12 +456,12 @@ void TestBreakIterator::testWordBoundaries()
switch (j)
{
case 0:
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
break;
case 1:
- aLocale.Language = rtl::OUString("grc");
- aLocale.Country = rtl::OUString();
+ aLocale.Language = OUString("grc");
+ aLocale.Country = OUString();
break;
default:
CPPUNIT_ASSERT(false);
@@ -475,7 +475,7 @@ void TestBreakIterator::testWordBoundaries()
0x03C2, 0x0020, 0x1F00, 0x03BB, 0x03BB, 0x0020, 0x1F24,
0x03C3, 0x03B8, 0x03B9, 0x03BF, 0x03BD
};
- rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
+ OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
sal_Int32 nPos = 0;
sal_Int32 aExpected[] = {5, 15, 19, 26};
@@ -496,7 +496,7 @@ void TestBreakIterator::testWordBoundaries()
aLocale.Language = "fi";
aLocale.Country = "FI";
- rtl::OUString aTest("Kuorma-auto kaakkois- ja Keski-Suomi");
+ OUString aTest("Kuorma-auto kaakkois- ja Keski-Suomi");
{
sal_Int32 nPos = 0;
@@ -533,14 +533,14 @@ void TestBreakIterator::testWordBoundaries()
//See https://issues.apache.org/ooo/show_bug.cgi?id=107843
{
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
const sal_Unicode TEST[] =
{
'r', 'u', 0xFB00, 'l', 'e', ' ', 0xFB01, 's', 'h'
};
- rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
+ OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale, i18n::WordType::DICTIONARY_WORD, false);
CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 5);
@@ -551,14 +551,14 @@ void TestBreakIterator::testWordBoundaries()
//See https://issues.apache.org/ooo/show_bug.cgi?id=113785
{
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
const sal_Unicode TEST[] =
{
'a', 0x2013, 'b', 0x2014, 'c'
};
- rtl::OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
+ OUString aTest(TEST, SAL_N_ELEMENTS(TEST));
aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT(aBounds.startPos == 0 && aBounds.endPos == 1);
@@ -578,12 +578,12 @@ void TestBreakIterator::testWordBoundaries()
void TestBreakIterator::testGraphemeIteration()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("bn");
- aLocale.Country = rtl::OUString("IN");
+ aLocale.Language = OUString("bn");
+ aLocale.Country = OUString("IN");
{
const sal_Unicode BA_HALANT_LA[] = { 0x09AC, 0x09CD, 0x09AF };
- rtl::OUString aTest(BA_HALANT_LA, SAL_N_ELEMENTS(BA_HALANT_LA));
+ OUString aTest(BA_HALANT_LA, SAL_N_ELEMENTS(BA_HALANT_LA));
sal_Int32 nDone=0;
sal_Int32 nPos;
@@ -597,7 +597,7 @@ void TestBreakIterator::testGraphemeIteration()
{
const sal_Unicode HA_HALANT_NA_VOWELSIGNI[] = { 0x09B9, 0x09CD, 0x09A3, 0x09BF };
- rtl::OUString aTest(HA_HALANT_NA_VOWELSIGNI, SAL_N_ELEMENTS(HA_HALANT_NA_VOWELSIGNI));
+ OUString aTest(HA_HALANT_NA_VOWELSIGNI, SAL_N_ELEMENTS(HA_HALANT_NA_VOWELSIGNI));
sal_Int32 nDone=0;
sal_Int32 nPos;
@@ -611,7 +611,7 @@ void TestBreakIterator::testGraphemeIteration()
{
const sal_Unicode TA_HALANT_MA_HALANT_YA [] = { 0x09A4, 0x09CD, 0x09AE, 0x09CD, 0x09AF };
- rtl::OUString aTest(TA_HALANT_MA_HALANT_YA, SAL_N_ELEMENTS(TA_HALANT_MA_HALANT_YA));
+ OUString aTest(TA_HALANT_MA_HALANT_YA, SAL_N_ELEMENTS(TA_HALANT_MA_HALANT_YA));
sal_Int32 nDone=0;
sal_Int32 nPos;
@@ -623,12 +623,12 @@ void TestBreakIterator::testGraphemeIteration()
CPPUNIT_ASSERT_MESSAGE("Should skip full grapheme", nPos == 0);
}
- aLocale.Language = rtl::OUString("ta");
- aLocale.Country = rtl::OUString("IN");
+ aLocale.Language = OUString("ta");
+ aLocale.Country = OUString("IN");
{
const sal_Unicode KA_VIRAMA_SSA[] = { 0x0B95, 0x0BCD, 0x0BB7 };
- rtl::OUString aTest(KA_VIRAMA_SSA, SAL_N_ELEMENTS(KA_VIRAMA_SSA));
+ OUString aTest(KA_VIRAMA_SSA, SAL_N_ELEMENTS(KA_VIRAMA_SSA));
sal_Int32 nDone=0;
sal_Int32 nPos = 0;
@@ -643,7 +643,7 @@ void TestBreakIterator::testGraphemeIteration()
{
const sal_Unicode KA_VOWELSIGNU[] = { 0x0B95, 0x0BC1 };
- rtl::OUString aTest(KA_VOWELSIGNU, SAL_N_ELEMENTS(KA_VOWELSIGNU));
+ OUString aTest(KA_VOWELSIGNU, SAL_N_ELEMENTS(KA_VOWELSIGNU));
sal_Int32 nDone=0;
sal_Int32 nPos = 0;
@@ -659,7 +659,7 @@ void TestBreakIterator::testGraphemeIteration()
{
const sal_Unicode CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI[] =
{ 0x0B9A, 0x0BBF, 0x0BA4, 0x0BCD, 0x0BA4, 0x0BBF, 0x0BB0, 0x0BC8 };
- rtl::OUString aTest(CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI,
+ OUString aTest(CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI,
SAL_N_ELEMENTS(CA_VOWELSIGNI_TA_VIRAMA_TA_VOWELSIGNI_RA_VOWELSIGNAI));
sal_Int32 nDone=0;
@@ -684,7 +684,7 @@ void TestBreakIterator::testGraphemeIteration()
{
const sal_Unicode ALEF_QAMATS [] = { 0x05D0, 0x05B8 };
- rtl::OUString aText(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS));
+ OUString aText(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS));
sal_Int32 nGraphemeCount = 0;
@@ -700,12 +700,12 @@ void TestBreakIterator::testGraphemeIteration()
CPPUNIT_ASSERT_MESSAGE("Should be considered 1 grapheme", nGraphemeCount == 1);
}
- aLocale.Language = rtl::OUString("hi");
- aLocale.Country = rtl::OUString("IN");
+ aLocale.Language = OUString("hi");
+ aLocale.Country = OUString("IN");
{
const sal_Unicode SHA_VOWELSIGNII[] = { 0x936, 0x940 };
- rtl::OUString aTest(SHA_VOWELSIGNII, SAL_N_ELEMENTS(SHA_VOWELSIGNII));
+ OUString aTest(SHA_VOWELSIGNII, SAL_N_ELEMENTS(SHA_VOWELSIGNII));
sal_Int32 nDone=0;
sal_Int32 nPos = 0;
@@ -725,8 +725,8 @@ void TestBreakIterator::testGraphemeIteration()
void TestBreakIterator::testWeak()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
{
const sal_Unicode WEAKS[] =
@@ -744,12 +744,12 @@ void TestBreakIterator::testWeak()
0x25A0, 0x25FF, //Geometric Shapes
0x2B30, 0x2B4C //Miscellaneous Symbols and Arrows
};
- rtl::OUString aWeaks(WEAKS, SAL_N_ELEMENTS(WEAKS));
+ OUString aWeaks(WEAKS, SAL_N_ELEMENTS(WEAKS));
for (sal_Int32 i = 0; i < aWeaks.getLength(); ++i)
{
sal_Int16 nScript = m_xBreak->getScriptType(aWeaks, i);
- rtl::OStringBuffer aMsg;
+ OStringBuffer aMsg;
aMsg.append(RTL_CONSTASCII_STRINGPARAM("Char 0x"));
aMsg.append(static_cast<sal_Int32>(aWeaks.getStr()[i]), 16);
aMsg.append(RTL_CONSTASCII_STRINGPARAM(" should have been weak"));
@@ -766,8 +766,8 @@ void TestBreakIterator::testWeak()
void TestBreakIterator::testAsian()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("en");
- aLocale.Country = rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
{
const sal_Unicode ASIANS[] =
@@ -783,12 +783,12 @@ void TestBreakIterator::testAsian()
//UAX25 as "Latin", i.e. by that logic LATIN
0xFF21, 0xFF5A
};
- rtl::OUString aAsians(ASIANS, SAL_N_ELEMENTS(ASIANS));
+ OUString aAsians(ASIANS, SAL_N_ELEMENTS(ASIANS));
for (sal_Int32 i = 0; i < aAsians.getLength(); ++i)
{
sal_Int16 nScript = m_xBreak->getScriptType(aAsians, i);
- rtl::OStringBuffer aMsg;
+ OStringBuffer aMsg;
aMsg.append(RTL_CONSTASCII_STRINGPARAM("Char 0x"));
aMsg.append(static_cast<sal_Int32>(aAsians.getStr()[i]), 16);
aMsg.append(RTL_CONSTASCII_STRINGPARAM(" should have been asian"));
@@ -802,13 +802,13 @@ void TestBreakIterator::testAsian()
void TestBreakIterator::testThai()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("th");
- aLocale.Country = rtl::OUString("TH");
+ aLocale.Language = OUString("th");
+ aLocale.Country = OUString("TH");
//See http://lists.freedesktop.org/archives/libreoffice/2012-February/025959.html
{
const sal_Unicode THAI[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
- rtl::OUString aTest(THAI, SAL_N_ELEMENTS(THAI));
+ OUString aTest(THAI, SAL_N_ELEMENTS(THAI));
i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_MESSAGE("Should skip full word",
@@ -827,7 +827,7 @@ void TestBreakIterator::testThai()
0x0E2B, 0x0E48, 0x0E07, 0x0E0A, 0x0E32, 0x0E15, 0x0E34,
0x0E19, 0x0E49, 0x0E33, 0x0E2B, 0x0E19, 0x0E32, 0x0E27
};
- rtl::OUString aTest(THAI, SAL_N_ELEMENTS(THAI));
+ OUString aTest(THAI, SAL_N_ELEMENTS(THAI));
std::stack<sal_Int32> aPositions;
sal_Int32 nPos = -1;
@@ -855,11 +855,11 @@ void TestBreakIterator::testThai()
void TestBreakIterator::testNorthernThai()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("nod");
- aLocale.Country = rtl::OUString("TH");
+ aLocale.Language = OUString("nod");
+ aLocale.Country = OUString("TH");
const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
- rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
+ OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_MESSAGE("Should skip full word",
@@ -876,12 +876,12 @@ void TestBreakIterator::testNorthernThai()
void TestBreakIterator::testKhmer()
{
lang::Locale aLocale;
- aLocale.Language = rtl::OUString("km");
- aLocale.Country = rtl::OUString("KH");
+ aLocale.Language = OUString("km");
+ aLocale.Country = OUString("KH");
const sal_Unicode KHMER[] = { 0x17B2, 0x17D2, 0x1799, 0x1782, 0x17C1 };
- rtl::OUString aTest(KHMER, SAL_N_ELEMENTS(KHMER));
+ OUString aTest(KHMER, SAL_N_ELEMENTS(KHMER));
i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
@@ -904,7 +904,7 @@ void TestBreakIterator::testJapanese()
{
const sal_Unicode JAPANESE[] = { 0x30B7, 0x30E3, 0x30C3, 0x30C8, 0x30C0, 0x30A6, 0x30F3 };
- rtl::OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
+ OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
aBounds = m_xBreak->getWordBoundary(aTest, 5, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
@@ -914,7 +914,7 @@ void TestBreakIterator::testJapanese()
{
const sal_Unicode JAPANESE[] = { 0x9EBB, 0x306E, 0x8449, 0x9EBB, 0x306E, 0x8449 };
- rtl::OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
+ OUString aTest(JAPANESE, SAL_N_ELEMENTS(JAPANESE));
aBounds = m_xBreak->getWordBoundary(aTest, 1, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx
index 7e99ec2fd419..c5857993d953 100644
--- a/i18npool/qa/cppunit/test_characterclassification.cxx
+++ b/i18npool/qa/cppunit/test_characterclassification.cxx
@@ -59,29 +59,29 @@ private:
void TestCharacterClassification::testTitleCase()
{
lang::Locale aLocale;
- aLocale.Language = ::rtl::OUString("en");
- aLocale.Country = ::rtl::OUString("US");
+ aLocale.Language = OUString("en");
+ aLocale.Country = OUString("US");
{
//basic example
- ::rtl::OUString sTest("Some text");
- ::rtl::OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), aLocale);
+ OUString sTest("Some text");
+ OUString sTitleCase = m_xCC->toTitle(sTest, 0, sTest.getLength(), aLocale);
CPPUNIT_ASSERT_MESSAGE("Should be title", sTitleCase == "Some Text");
- ::rtl::OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), aLocale);
+ OUString sUpperCase = m_xCC->toUpper(sTest, 0, sTest.getLength(), aLocale);
CPPUNIT_ASSERT_MESSAGE("Should be upper", sUpperCase == "SOME TEXT");
- ::rtl::OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), aLocale);
+ OUString sLowerCase = m_xCC->toLower(sTest, 0, sTest.getLength(), aLocale);
CPPUNIT_ASSERT_MESSAGE("Should be lower ", sLowerCase == "some text");
}
{
//tricky one
const sal_Unicode LATINSMALLLETTERDZ[] = { 0x01F3 };
- ::rtl::OUString aTest(LATINSMALLLETTERDZ, SAL_N_ELEMENTS(LATINSMALLLETTERDZ));
- ::rtl::OUString sTitleCase = m_xCC->toTitle(aTest, 0, aTest.getLength(), aLocale);
+ OUString aTest(LATINSMALLLETTERDZ, SAL_N_ELEMENTS(LATINSMALLLETTERDZ));
+ OUString sTitleCase = m_xCC->toTitle(aTest, 0, aTest.getLength(), aLocale);
CPPUNIT_ASSERT_MESSAGE("Should be title", sTitleCase.getLength() == 1 && sTitleCase[0] == 0x01F2);
- ::rtl::OUString sUpperCase = m_xCC->toUpper(aTest, 0, aTest.getLength(), aLocale);
+ OUString sUpperCase = m_xCC->toUpper(aTest, 0, aTest.getLength(), aLocale);
CPPUNIT_ASSERT_MESSAGE("Should be upper", sUpperCase.getLength() == 1 && sUpperCase[0] == 0x01F1);
- ::rtl::OUString sLowerCase = m_xCC->toLower(aTest, 0, aTest.getLength(), aLocale);
+ OUString sLowerCase = m_xCC->toLower(aTest, 0, aTest.getLength(), aLocale);
CPPUNIT_ASSERT_MESSAGE("Should be lower ", sLowerCase.getLength() == 1 && sLowerCase[0] == 0x01F3);
}
}
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 2bf2a03e3de3..72da09f87629 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -35,8 +35,6 @@
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace com { namespace sun { namespace star { namespace i18n {
@@ -228,7 +226,7 @@ sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) {
* @param pos : Position of the given character.
* @return true if CJK.
*/
-sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos,
+sal_Bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
Boundary& segBoundary)
{
sal_Int32 indexUtf16;
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 81a191b72e57..1d0e2b4e9575 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -24,7 +24,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index e01abaf0cf64..fa26966c0f24 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -120,7 +120,6 @@ static void debug_i18n_cal_dump( const ::icu::Calendar & r )
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
@@ -1173,7 +1172,7 @@ Calendar_gregorian::getImplementationName(void) throw( RuntimeException )
}
sal_Bool SAL_CALL
-Calendar_gregorian::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException )
+Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return !rServiceName.compareToAscii(cCalendar);
}
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 237047cbb2d3..634c414efd2e 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index d3ab35100bcf..65f8f9cc047c 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -24,8 +24,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace com { namespace sun { namespace star { namespace i18n {
@@ -210,7 +208,7 @@ CharacterClassificationImpl::getImplementationName(void)
}
sal_Bool SAL_CALL
-CharacterClassificationImpl::supportsService(const rtl::OUString& rServiceName)
+CharacterClassificationImpl::supportsService(const OUString& rServiceName)
throw( RuntimeException )
{
return !rServiceName.compareToAscii(cClass);
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index aeaa34ad1891..14857d6df5f3 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -25,62 +25,62 @@
// ----------------------------------------------------;
sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException)
{
return ScriptTypeDetector::getScriptDirection(Text, nPos, defaultScriptDirection);
}
// return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range.
sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
{
return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction);
}
sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
{
return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction);
}
sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
{
return ScriptTypeDetector::getCTLScriptType(Text, nPos);
}
// Begin of Script Type is inclusive.
sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
{
return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos);
}
// End of the Script Type is exclusive, the return value pointing to the begin of next script type
sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
{
return ScriptTypeDetector::endOfCTLScriptType(Text, nPos);
}
const sal_Char sDetector[] = "draft.com.sun.star.i18n.UnoScriptTypeDetector";
-rtl::OUString SAL_CALL
+OUString SAL_CALL
UnoScriptTypeDetector::getImplementationName() throw( ::com::sun::star::uno::RuntimeException )
{
- return rtl::OUString(sDetector);
+ return OUString(sDetector);
}
sal_Bool SAL_CALL
-UnoScriptTypeDetector::supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException )
+UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException )
{
return ServiceName != sDetector;
}
-::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException )
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
+ ::com::sun::star::uno::Sequence< OUString > aRet(1);
aRet[0] = sDetector;
return aRet;
}
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 23c936df4a12..a4630fa363b7 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -83,7 +83,7 @@ ChapterCollator::getImplementationName() throw( RuntimeException )
}
sal_Bool SAL_CALL
-ChapterCollator::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException )
+ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return !rServiceName.compareToAscii(cChapCollator);
}
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 35cfd3c91c7b..2a184523155f 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -28,8 +28,6 @@ using namespace com::sun::star;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 2ba089a43418..4e7990828dae 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -244,7 +244,7 @@ Collator_Unicode::getImplementationName() throw( RuntimeException )
}
sal_Bool SAL_CALL
-Collator_Unicode::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException )
+Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return !rServiceName.compareToAscii(implementationName);
}
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 61573a964996..4e962c8edccd 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1049,7 +1049,7 @@ OUString DefaultNumberingProvider::getImplementationName(void)
return OUString::createFromAscii(cDefaultNumberingProvider);
}
-sal_Bool DefaultNumberingProvider::supportsService(const rtl::OUString& rServiceName)
+sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName)
throw( RuntimeException )
{
return rServiceName.equalsAscii(cDefaultNumberingProvider);
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index a03fde10c4c3..9c7cd94c8cc4 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -20,7 +20,6 @@
#include <inputsequencechecker_hi.hxx>
-using ::rtl::OUString;
namespace com {
namespace sun {
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index e0ea3a9ebd67..488145573cac 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -21,7 +21,6 @@
#include <inputsequencechecker_th.hxx>
#include <wtt.h>
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 9ec83baaab5e..fc211343fe41 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -33,7 +33,7 @@
// NOTE: MUST match the Locale versionDTD attribute defined in data/locale.dtd
#define LOCALE_VERSION_DTD "2.0.3"
-typedef ::std::set< ::rtl::OUString > NameSet;
+typedef ::std::set< OUString > NameSet;
typedef ::std::set< sal_Int16 > ValueSet;
namespace cssi = ::com::sun::star::i18n;
@@ -59,7 +59,7 @@ int LocaleNode::getError() const
void LocaleNode::print () const {
printf ("<");
- ::rtl::OUString str (aName);
+ OUString str (aName);
for(sal_Int32 i = 0; i < str.getLength(); i++)
printf( "%c", str[i]);
printf (">\n");
@@ -224,7 +224,7 @@ void print_node( const LocaleNode* p, int depth=0 )
void LocaleNode :: generateCode (const OFileWriter &of) const
{
- ::rtl::OUString aDTD = getAttr().getValueByName("versionDTD");
+ OUString aDTD = getAttr().getValueByName("versionDTD");
if ( aDTD != LOCALE_VERSION_DTD )
{
++nError;
@@ -236,7 +236,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
}
-::rtl::OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
+OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
const char* pParameterName, const LocaleNode* pNode,
sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
{
@@ -272,7 +272,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
}
-::rtl::OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
+OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
const char* pNodeName, const char* pParameterName,
sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
{
@@ -296,7 +296,7 @@ void LocaleNode::incError( const char* pStr ) const
fprintf( stderr, "Error: %s\n", pStr);
}
-void LocaleNode::incError( const ::rtl::OUString& rStr ) const
+void LocaleNode::incError( const OUString& rStr ) const
{
incError( OSTR( rStr));
}
@@ -321,13 +321,13 @@ void LocaleNode::incErrorInt( const char* pStr, int nVal ) const
fprintf( stderr, prepareErrorFormat( pStr, ": %d"), nVal);
}
-void LocaleNode::incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const
+void LocaleNode::incErrorStr( const char* pStr, const OUString& rVal ) const
{
++nError;
fprintf( stderr, prepareErrorFormat( pStr, ": %s"), OSTR( rVal));
}
-void LocaleNode::incErrorStrStr( const char* pStr, const ::rtl::OUString& rVal1, const ::rtl::OUString& rVal2 ) const
+void LocaleNode::incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const
{
++nError;
fprintf( stderr, prepareErrorFormat( pStr, ": %s %s"), OSTR( rVal1), OSTR( rVal2));
@@ -361,7 +361,7 @@ void LCInfoNode::generateCode (const OFileWriter &of) const
"Variants are not supported by application.");
}
else
- of.writeParameter("Variant", ::rtl::OUString());
+ of.writeParameter("Variant", OUString());
of.writeAsciiString("\nstatic const sal_Unicode* LCInfoArray[] = {\n");
of.writeAsciiString("\tlangID,\n");
of.writeAsciiString("\tlangDefaultName,\n");
@@ -379,12 +379,12 @@ static OUString aDecSep;
void LCCTYPENode::generateCode (const OFileWriter &of) const
{
const LocaleNode * sepNode = 0;
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getLocaleItem_", useLocale);
return;
}
- ::rtl::OUString str = getAttr().getValueByName("unoid");
+ OUString str = getAttr().getValueByName("unoid");
of.writeAsciiString("\n\n");
of.writeParameter("LC_CTYPE_Unoid", str);;
@@ -627,7 +627,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
}
}
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty())
{
switch (mnSection)
@@ -876,7 +876,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
if (n)
of.writeParameter("FormatDefaultName", n->getValue(), formatCount);
else
- of.writeParameter("FormatDefaultName", ::rtl::OUString(), formatCount);
+ of.writeParameter("FormatDefaultName", OUString(), formatCount);
}
@@ -1265,7 +1265,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
void LCCollationNode::generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getCollatorImplementation_", useLocale);
of.writeRefFunction("getCollationOptions_", useLocale);
@@ -1279,7 +1279,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const
LocaleNode * currNode = getChildAt (j);
if( currNode->getName().compareToAscii("Collator") == 0 )
{
- ::rtl::OUString str;
+ OUString str;
str = currNode->getAttr().getValueByName("unoid");
of.writeParameter("CollatorID", str, j);
str = currNode->getValue();
@@ -1338,7 +1338,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const
void LCSearchNode::generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getSearchOptions_", useLocale);
return;
@@ -1376,7 +1376,7 @@ void LCSearchNode::generateCode (const OFileWriter &of) const
void LCIndexNode::generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getIndexAlgorithm_", useLocale);
of.writeRefFunction("getUnicodeScripts_", useLocale);
@@ -1391,7 +1391,7 @@ void LCIndexNode::generateCode (const OFileWriter &of) const
LocaleNode * currNode = getChildAt (i);
if( currNode->getName().compareToAscii("IndexKey") == 0 )
{
- ::rtl::OUString str;
+ OUString str;
str = currNode->getAttr().getValueByName("unoid");
of.writeParameter("IndexID", str, nbOfIndexs);
str = currNode->getAttr().getValueByName("module");
@@ -1536,13 +1536,13 @@ static void lcl_writeAbbrFullNarrArrays( const OFileWriter & of, sal_Int16 nCoun
void LCCalendarNode::generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getAllCalendars_", useLocale);
return;
}
sal_Int16 nbOfCalendars = sal::static_int_cast<sal_Int16>( getNumberOfChildren() );
- ::rtl::OUString str;
+ OUString str;
sal_Int16 * nbOfDays = new sal_Int16[nbOfCalendars];
sal_Int16 * nbOfMonths = new sal_Int16[nbOfCalendars];
sal_Int16 * nbOfGenitiveMonths = new sal_Int16[nbOfCalendars];
@@ -1568,7 +1568,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
// Generate Days of Week
const sal_Char *elementTag;
LocaleNode * daysNode = NULL;
- ::rtl::OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
+ OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
if (!ref_name.isEmpty() && i > 0) {
for (j = 0; j < i; j++) {
str = getChildAt(j)->getAttr().getValueByName("unoid");
@@ -1851,13 +1851,13 @@ bool isIso4217( const OUString& rStr )
void LCCurrencyNode :: generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getAllCurrencies_", useLocale);
return;
}
sal_Int16 nbOfCurrencies = 0;
- ::rtl::OUString str;
+ OUString str;
sal_Int16 i;
bool bTheDefault= false;
@@ -1952,13 +1952,13 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const
void LCTransliterationNode::generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getTransliterations_", useLocale);
return;
}
sal_Int16 nbOfModules = 0;
- ::rtl::OUString str;
+ OUString str;
sal_Int16 i;
for ( i = 0; i < getNumberOfChildren(); i++,nbOfModules++) {
@@ -2001,7 +2001,7 @@ static NameValuePair ReserveWord[] = {
void LCMiscNode::generateCode (const OFileWriter &of) const
{
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction("getForbiddenCharacters_", useLocale);
of.writeRefFunction("getBreakIteratorRules_", useLocale);
@@ -2017,7 +2017,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
bool bEnglishLocale = (strncmp( of.getLocale(), "en_", 3) == 0);
sal_Int16 nbOfWords = 0;
- ::rtl::OUString str;
+ OUString str;
sal_Int16 i;
for ( i = 0; i < sal_Int16(SAL_N_ELEMENTS(ReserveWord)); i++,nbOfWords++) {
@@ -2060,9 +2060,9 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
of.writeParameter( "forbiddenEnd", forbidNode -> getChildAt(1)->getValue());
of.writeParameter( "hangingChars", forbidNode -> getChildAt(2)->getValue());
} else {
- of.writeParameter( "forbiddenBegin", ::rtl::OUString());
- of.writeParameter( "forbiddenEnd", ::rtl::OUString());
- of.writeParameter( "hangingChars", ::rtl::OUString());
+ of.writeParameter( "forbiddenBegin", OUString());
+ of.writeParameter( "forbiddenEnd", OUString());
+ of.writeParameter( "hangingChars", OUString());
}
of.writeAsciiString("\nstatic const sal_Unicode* LCForbiddenCharactersArray[] = {\n");
of.writeAsciiString("\tforbiddenBegin,\n");
@@ -2078,11 +2078,11 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
of.writeParameter( "CharacterMode", breakNode -> getChildAt(3)->getValue());
of.writeParameter( "LineMode", breakNode -> getChildAt(4)->getValue());
} else {
- of.writeParameter( "EditMode", ::rtl::OUString());
- of.writeParameter( "DictionaryMode", ::rtl::OUString());
- of.writeParameter( "WordCountMode", ::rtl::OUString());
- of.writeParameter( "CharacterMode", ::rtl::OUString());
- of.writeParameter( "LineMode", ::rtl::OUString());
+ of.writeParameter( "EditMode", OUString());
+ of.writeParameter( "DictionaryMode", OUString());
+ of.writeParameter( "WordCountMode", OUString());
+ of.writeParameter( "CharacterMode", OUString());
+ of.writeParameter( "LineMode", OUString());
}
of.writeAsciiString("\nstatic const sal_Unicode* LCBreakIteratorRulesArray[] = {\n");
of.writeAsciiString("\tEditMode,\n");
@@ -2098,7 +2098,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
void LCNumberingLevelNode::generateCode (const OFileWriter &of) const
{
of.writeAsciiString("// ---> ContinuousNumbering\n");
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction2("getContinuousNumberingLevels_", useLocale);
return;
@@ -2168,7 +2168,7 @@ void LCNumberingLevelNode::generateCode (const OFileWriter &of) const
void LCOutlineNumberingLevelNode::generateCode (const OFileWriter &of) const
{
of.writeAsciiString("// ---> OutlineNumbering\n");
- ::rtl::OUString useLocale = getAttr().getValueByName("ref");
+ OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
of.writeRefFunction3("getOutlineNumberingLevels_", useLocale);
return;
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 3acc65525358..27b0027d5622 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -47,26 +47,26 @@ public:
OFileWriter(const char *pcFile, const char *locale );
virtual ~OFileWriter();
- virtual void writeStringCharacters(const ::rtl::OUString& str) const;
+ virtual void writeStringCharacters(const OUString& str) const;
virtual void writeAsciiString(const char *str)const ;
virtual void writeInt(sal_Int16 nb) const;
virtual void writeFunction(const char *func, const char *count, const char *array) const;
- virtual void writeRefFunction(const char *func, const ::rtl::OUString& useLocale) const;
+ virtual void writeRefFunction(const char *func, const OUString& useLocale) const;
virtual void writeFunction(const char *func, const char *count, const char *array, const char *from, const char *to) const;
- virtual void writeRefFunction(const char *func, const ::rtl::OUString& useLocale, const char *to) const;
+ virtual void writeRefFunction(const char *func, const OUString& useLocale, const char *to) const;
virtual void writeFunction2(const char *func, const char *style, const char* attr, const char *array) const;
- virtual void writeRefFunction2(const char *func, const ::rtl::OUString& useLocale) const;
+ virtual void writeRefFunction2(const char *func, const OUString& useLocale) const;
virtual void writeFunction3(const char *func, const char *style, const char* levels, const char* attr, const char *array) const;
- virtual void writeRefFunction3(const char *func, const ::rtl::OUString& useLocale) const;
+ virtual void writeRefFunction3(const char *func, const OUString& useLocale) const;
virtual void writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const;
- virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const;
- virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const;
- virtual void writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const;
- virtual void writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count) const;
- virtual void writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
- virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, const sal_Int16 count) const;
- virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const;
- virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+ virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const;
+ virtual bool writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const;
+ virtual void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const;
+ virtual void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const;
+ virtual void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+ virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const;
+ virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const;
+ virtual void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
virtual void flush(void) const ;
virtual void closeOutput(void) const;
/// Return the locale string, something like en_US or de_DE
@@ -132,14 +132,14 @@ public:
// ++nError with output to stderr
void incError( const char* pStr ) const;
// ++nError with output to stderr
- void incError( const ::rtl::OUString& rStr ) const;
+ void incError( const OUString& rStr ) const;
// ++nError with output to stderr, pStr should contain "%d", otherwise appended
void incErrorInt( const char* pStr, int nVal ) const;
// ++nError with output to stderr, pStr should contain "%s", otherwise appended
- void incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const;
+ void incErrorStr( const char* pStr, const OUString& rVal ) const;
// ++nError with output to stderr, pStr should contain "%s %s", otherwise
// appended
- void incErrorStrStr( const char* pStr, const ::rtl::OUString& rVal1, const ::rtl::OUString& rVal2 ) const;
+ void incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const;
// used by incError...(), returns a pointer to a static buffer,
// pDefaultConversion is appended if pFormat doesn't contain a %
// specification and should be something like ": %d" or ": %s" or similar.
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 8ea5c70478a0..7a9505a51c92 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -49,7 +49,7 @@ void OFileWriter::writeAsciiString(const char* str) const
fprintf(m_f, "%s", str);
}
-void OFileWriter::writeStringCharacters(const ::rtl::OUString& str) const
+void OFileWriter::writeStringCharacters(const OUString& str) const
{
for(int i = 0; i < str.getLength(); i++)
fprintf(m_f, "0x%x, ", str[i]);
@@ -62,7 +62,7 @@ void OFileWriter::writeFunction(const char *func, const char *count, const char
fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
}
-void OFileWriter::writeRefFunction(const char *func, const ::rtl::OUString& useLocale) const
+void OFileWriter::writeRefFunction(const char *func, const OUString& useLocale) const
{
OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
@@ -80,7 +80,7 @@ void OFileWriter::writeFunction(const char *func, const char *count, const char
fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
}
-void OFileWriter::writeRefFunction(const char *func, const ::rtl::OUString& useLocale, const char *to) const
+void OFileWriter::writeRefFunction(const char *func, const OUString& useLocale, const char *to) const
{
OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
@@ -99,7 +99,7 @@ void OFileWriter::writeFunction2(const char *func, const char *style, const char
fprintf(m_f, "\treturn %s;\n}\n", array);
}
-void OFileWriter::writeRefFunction2(const char *func, const ::rtl::OUString& useLocale) const
+void OFileWriter::writeRefFunction2(const char *func, const OUString& useLocale) const
{
OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
@@ -117,7 +117,7 @@ void OFileWriter::writeFunction3(const char *func, const char *style, const char
fprintf(m_f, "\treturn %s;\n}\n", array);
}
-void OFileWriter::writeRefFunction3(const char *func, const ::rtl::OUString& useLocale) const
+void OFileWriter::writeRefFunction3(const char *func, const OUString& useLocale) const
{
OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
@@ -131,56 +131,56 @@ void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 c
fprintf(m_f, "static const sal_Unicode %s%d[] = {%d};\n", pAsciiStr, count, val);
}
-bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const
+bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const
{
bool bBool = (str == "true" ? 1 : 0);
fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool);
return bBool;
}
-bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const
+bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const
{
bool bBool = (str == "true" ? 1 : 0);
fprintf(m_f,"static const sal_Unicode default%s[] = {%d};\n", pAsciiStr, bBool);
return bBool;
}
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const
+void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const
{
fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr);
writeStringCharacters(aChars);
fprintf(m_f, "0x0};\n");
}
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count) const
+void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const
{
fprintf(m_f, "static const sal_Unicode %s%d[] = {", pAsciiStr, count);
writeStringCharacters(aChars);
fprintf(m_f, "0x0};\n");
}
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
{
fprintf(m_f, "static const sal_Unicode %s%d%d[] = {", pAsciiStr, count0, count1);
writeStringCharacters(aChars);
fprintf(m_f, "0x0};\n");
}
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, const sal_Int16 count) const
+void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const
{
fprintf(m_f, "static const sal_Unicode %s%s%d[] = {", pTagStr, pAsciiStr, count);
writeStringCharacters(aChars);
fprintf(m_f, "0x0};\n");
}
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const
+void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const
{
fprintf(m_f, "static const sal_Unicode %s%s[] = {", pTagStr, pAsciiStr);
writeStringCharacters(aChars);
fprintf(m_f, "0x0};\n");
}
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
{
fprintf(m_f, "static const sal_Unicode %s%s%d%d[] = {", pTagStr, pAsciiStr, count0, count1);
writeStringCharacters(aChars);
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 66b51747bd1f..7960f5061a69 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -31,8 +31,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
static const sal_Char clocaledata[] = "com.sun.star.i18n.LocaleData";
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 8de5a8cefc78..e73c0c31a600 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 be
OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
Sequence< sal_Int32 >& offset, sal_Bool useOffset, Number* number ) throw(RuntimeException)
{
- rtl::OUString aRet;
+ OUString aRet;
sal_Int32 strLen = inStr.getLength() - startPos;
sal_Unicode *numberChar = NumberChar[number->number];
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index 99958212a86e..ea0ec9416d26 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -45,8 +45,8 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper()
NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString elementType = mapElementTypeShortToString(formatType);
- ::rtl::OUString elementUsage = mapElementUsageShortToString(formatUsage);
+ OUString elementType = mapElementTypeShortToString(formatType);
+ OUString elementUsage = mapElementUsageShortToString(formatUsage);
getFormats( rLocale );
@@ -175,24 +175,24 @@ void NumberFormatCodeMapper::getFormats( const ::com::sun::star::lang::Locale& r
}
-::rtl::OUString
+OUString
NumberFormatCodeMapper::mapElementTypeShortToString(sal_Int16 formatType)
{
switch ( formatType )
{
case com::sun::star::i18n::KNumberFormatType::SHORT :
- return ::rtl::OUString( "short" );
+ return OUString( "short" );
case com::sun::star::i18n::KNumberFormatType::MEDIUM :
- return ::rtl::OUString( "medium" );
+ return OUString( "medium" );
case com::sun::star::i18n::KNumberFormatType::LONG :
- return ::rtl::OUString( "long" );
+ return OUString( "long" );
}
- return ::rtl::OUString();
+ return OUString();
}
sal_Int16
-NumberFormatCodeMapper::mapElementTypeStringToShort(const ::rtl::OUString& formatType)
+NumberFormatCodeMapper::mapElementTypeStringToShort(const OUString& formatType)
{
if ( formatType == "short" )
return com::sun::star::i18n::KNumberFormatType::SHORT;
@@ -204,34 +204,34 @@ NumberFormatCodeMapper::mapElementTypeStringToShort(const ::rtl::OUString& forma
return com::sun::star::i18n::KNumberFormatType::SHORT;
}
-::rtl::OUString
+OUString
NumberFormatCodeMapper::mapElementUsageShortToString(sal_Int16 formatUsage)
{
switch ( formatUsage )
{
case com::sun::star::i18n::KNumberFormatUsage::DATE :
- return ::rtl::OUString( "DATE" );
+ return OUString( "DATE" );
case com::sun::star::i18n::KNumberFormatUsage::TIME :
- return ::rtl::OUString( "TIME" );
+ return OUString( "TIME" );
case com::sun::star::i18n::KNumberFormatUsage::DATE_TIME :
- return ::rtl::OUString( "DATE_TIME" );
+ return OUString( "DATE_TIME" );
case com::sun::star::i18n::KNumberFormatUsage::FIXED_NUMBER :
- return ::rtl::OUString( "FIXED_NUMBER" );
+ return OUString( "FIXED_NUMBER" );
case com::sun::star::i18n::KNumberFormatUsage::FRACTION_NUMBER :
- return ::rtl::OUString( "FRACTION_NUMBER" );
+ return OUString( "FRACTION_NUMBER" );
case com::sun::star::i18n::KNumberFormatUsage::PERCENT_NUMBER :
- return ::rtl::OUString( "PERCENT_NUMBER" );
+ return OUString( "PERCENT_NUMBER" );
case com::sun::star::i18n::KNumberFormatUsage::CURRENCY :
- return ::rtl::OUString( "CURRENCY" );
+ return OUString( "CURRENCY" );
case com::sun::star::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER :
- return ::rtl::OUString( "SCIENTIFIC_NUMBER" );
+ return OUString( "SCIENTIFIC_NUMBER" );
}
- return ::rtl::OUString();
+ return OUString();
}
sal_Int16
-NumberFormatCodeMapper::mapElementUsageStringToShort(const ::rtl::OUString& formatUsage)
+NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage)
{
if ( formatUsage == "DATE" )
return com::sun::star::i18n::KNumberFormatUsage::DATE;
@@ -263,27 +263,27 @@ NumberFormatCodeMapper::createLocaleDataObject() {
mxLocaleData.set( com::sun::star::i18n::LocaleData::create(mxContext) );
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
NumberFormatCodeMapper::getImplementationName(void)
throw( ::com::sun::star::uno::RuntimeException )
{
- return ::rtl::OUString("com.sun.star.i18n.NumberFormatCodeMapper");
+ return OUString("com.sun.star.i18n.NumberFormatCodeMapper");
}
const sal_Char cNumFormat[] = "com.sun.star.i18n.NumberFormatMapper";
sal_Bool SAL_CALL
-NumberFormatCodeMapper::supportsService(const rtl::OUString& rServiceName)
+NumberFormatCodeMapper::supportsService(const OUString& rServiceName)
throw( ::com::sun::star::uno::RuntimeException )
{
return !rServiceName.compareToAscii(cNumFormat);
}
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString::createFromAscii(cNumFormat);
+ ::com::sun::star::uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString::createFromAscii(cNumFormat);
return aRet;
}
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 9eca3a099e0b..45306cfe52c9 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -25,7 +25,7 @@
#include <unicode/rbnf.h>
#include <unicode/normlzr.h>
-#define CSTR( ouStr ) rtl::OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( )
+#define CSTR( ouStr ) OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( )
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::uno;
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index d585895d28f9..b9c19b082bc5 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -578,12 +578,12 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Cha
{
if( 0 == rtl_str_compare( sImplementationName, pArr->pImplementationNm ) )
{
- uno::Sequence< ::rtl::OUString > aServiceNames(1);
+ uno::Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
- ::rtl::OUString::createFromAscii( pArr->pServiceNm );
+ OUString::createFromAscii( pArr->pServiceNm );
xFactory = ::cppu::createSingleFactory(
pServiceManager,
- ::rtl::OUString::createFromAscii( pArr->pImplementationNm ),
+ OUString::createFromAscii( pArr->pImplementationNm ),
*pArr->pFn, aServiceNames );
break;
}
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 8bd86a586682..cebda5090a93 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -46,8 +46,8 @@ class TextSearch: public cppu::WeakImplHelper2
::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::util::SearchOptions aSrchPara;
- ::rtl::OUString sSrchStr;
- ::rtl::OUString sSrchStr2;
+ OUString sSrchStr;
+ OUString sSrchStr2;
mutable com::sun::star::uno::Reference<
com::sun::star::i18n::XCharacterClassification > xCharClass;
@@ -59,7 +59,7 @@ class TextSearch: public cppu::WeakImplHelper2
// define a function pointer for the different search nethods
typedef ::com::sun::star::util::SearchResult
- (SAL_CALL TextSearch:: *FnSrch)( const ::rtl::OUString& searchStr,
+ (SAL_CALL TextSearch:: *FnSrch)( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos );
FnSrch fnForward;
@@ -76,22 +76,22 @@ class TextSearch: public cppu::WeakImplHelper2
void MakeBackwardTab2();
sal_Int32 GetDiff( const sal_Unicode ) const;
::com::sun::star::util::SearchResult SAL_CALL
- NSrchFrwrd( const ::rtl::OUString& searchStr,
+ NSrchFrwrd( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::util::SearchResult SAL_CALL
- NSrchBkwrd( const ::rtl::OUString& searchStr,
+ NSrchBkwrd( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
// Members and methods for the regular expression search
RegexMatcher* pRegexMatcher;
::com::sun::star::util::SearchResult SAL_CALL
- RESrchFrwrd( const ::rtl::OUString& searchStr,
+ RESrchFrwrd( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::util::SearchResult SAL_CALL
- RESrchBkwrd( const ::rtl::OUString& searchStr,
+ RESrchBkwrd( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
void RESrchPrepare( const ::com::sun::star::util::SearchOptions&);
@@ -101,18 +101,18 @@ class TextSearch: public cppu::WeakImplHelper2
WLevDistance* pWLD;
com::sun::star::uno::Reference < com::sun::star::i18n::XBreakIterator > xBreak;
::com::sun::star::util::SearchResult SAL_CALL
- ApproxSrchFrwrd( const ::rtl::OUString& searchStr,
+ ApproxSrchFrwrd( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::util::SearchResult SAL_CALL
- ApproxSrchBkwrd( const ::rtl::OUString& searchStr,
+ ApproxSrchBkwrd( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
- bool IsDelimiter( const ::rtl::OUString& rStr, sal_Int32 nPos ) const;
+ bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const;
sal_Bool checkCTLStart, checkCTLEnd;
- sal_Bool SAL_CALL isCellStart(const ::rtl::OUString& searchStr, sal_Int32 nPos)
+ sal_Bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos)
throw(::com::sun::star::uno::RuntimeException);
public:
@@ -126,20 +126,20 @@ public:
setOptions( const ::com::sun::star::util::SearchOptions& options )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::util::SearchResult SAL_CALL
- searchForward( const ::rtl::OUString& searchStr,
+ searchForward( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::util::SearchResult SAL_CALL
- searchBackward( const ::rtl::OUString& searchStr,
+ searchBackward( const OUString& searchStr,
sal_Int32 startPos, sal_Int32 endPos )
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 );
};
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 77f03c6cf935..4c650b4eefc9 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -23,7 +23,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index c03517718421..2c3a0c9a8cca 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -24,7 +24,6 @@
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index d9fe16ccce20..617ff29f0dad 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -32,8 +32,6 @@ using namespace com::sun::star::i18n;
using namespace com::sun::star::linguistic2;
using namespace com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 94c1cd85e1af..1cbd3b3934e8 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::i18n;
using namespace com::sun::star::linguistic2;
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index a991c6f80e25..22036446535f 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
@@ -30,7 +30,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
index a7b028c152b7..911164ae3e43 100644
--- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx
+++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
@@ -30,7 +30,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index 07d56e2648e1..c0e07f3c3ec6 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
@@ -27,7 +27,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index 57c1b1c676f8..098a6a072fd5 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
@@ -27,7 +27,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index 9eb07bd3a420..e525f5dcca35 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.cxx
@@ -30,7 +30,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index 977f471e4e74..88ea9a89f10f 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
@@ -26,7 +26,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index 66f45c5bbee6..67ad5043fda3 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
@@ -26,7 +26,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
index 9891febfe712..76cb444aead5 100644
--- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
@@ -30,7 +30,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index 1d40692880cc..aa4e87b5d5c3 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.cxx
@@ -29,7 +29,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index f4e22111f1f6..7d1898e703e0 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -28,8 +28,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index af5ca8f0bdbf..918461b5dad9 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -41,7 +41,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
@@ -576,7 +575,7 @@ namespace
/** structure to cache the last transliteration body used. */
struct TransBody
{
- ::rtl::OUString Name;
+ OUString Name;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration > Body;
};
class theTransBodyMutex : public rtl::Static<osl::Mutex, theTransBodyMutex> {};
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index 0300ea48f8b0..a1de147f4e42 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -23,7 +23,6 @@
#include <transliteration_Ignore.hxx>
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 329f2d565a4b..4ef2cfbc249a 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
@@ -25,7 +25,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index f62a7fbc4f29..eb2dc0efaf18 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx
@@ -24,7 +24,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index 8a63e1bebe88..1eb07f7ba577 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -262,7 +262,7 @@ Transliteration_titlecase::Transliteration_titlecase()
implementationName = "com.sun.star.i18n.Transliteration.Transliteration_titlecase";
}
-static rtl::OUString transliterate_titlecase_Impl(
+static OUString transliterate_titlecase_Impl(
const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
const Locale &rLocale,
Sequence< sal_Int32 >& offset )
@@ -317,7 +317,7 @@ static rtl::OUString transliterate_titlecase_Impl(
// this function expects to be called on a word-by-word basis,
// namely that startPos points to the first char of the word
-rtl::OUString SAL_CALL Transliteration_titlecase::transliterate(
+OUString SAL_CALL Transliteration_titlecase::transliterate(
const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
Sequence< sal_Int32 >& offset )
throw(RuntimeException)
@@ -336,7 +336,7 @@ Transliteration_sentencecase::Transliteration_sentencecase()
// this function expects to be called on a sentence-by-sentence basis,
// namely that startPos points to the first word (NOT first char!) in the sentence
-rtl::OUString SAL_CALL Transliteration_sentencecase::transliterate(
+OUString SAL_CALL Transliteration_sentencecase::transliterate(
const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
Sequence< sal_Int32 >& offset )
throw(RuntimeException)
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index 11bdf4a00c4c..d42261bb3380 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -89,8 +89,8 @@ Transliteration_caseignore::transliterateRange( const OUString& str1, const OUSt
sal_Bool SAL_CALL
Transliteration_caseignore::equals(
- const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+ const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
throw(::com::sun::star::uno::RuntimeException)
{
return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0);
@@ -98,8 +98,8 @@ Transliteration_caseignore::equals(
sal_Int32 SAL_CALL
Transliteration_caseignore::compareSubstring(
- const ::rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
- const ::rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2)
+ const OUString& str1, sal_Int32 off1, sal_Int32 len1,
+ const OUString& str2, sal_Int32 off2, sal_Int32 len2)
throw(RuntimeException)
{
sal_Int32 nMatch1, nMatch2;
@@ -109,8 +109,8 @@ Transliteration_caseignore::compareSubstring(
sal_Int32 SAL_CALL
Transliteration_caseignore::compareString(
- const ::rtl::OUString& str1,
- const ::rtl::OUString& str2)
+ const OUString& str1,
+ const OUString& str2)
throw(RuntimeException)
{
sal_Int32 nMatch1, nMatch2;
@@ -119,8 +119,8 @@ Transliteration_caseignore::compareString(
sal_Int32 SAL_CALL
Transliteration_caseignore::compare(
- const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
- const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+ const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
throw(RuntimeException)
{
const sal_Unicode *unistr1 = (sal_Unicode*) str1.getStr() + pos1;
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index c4736f78625d..8847b294fbdb 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -137,8 +137,8 @@ public:
static PaperInfo getSystemDefaultPaper();
static PaperInfo getDefaultPaperForLocale(const ::com::sun::star::lang::Locale & rLocale);
- static Paper fromPSName(const rtl::OString &rName);
- static rtl::OString toPSName(Paper eType);
+ static Paper fromPSName(const OString &rName);
+ static OString toPSName(Paper eType);
static long sloppyFitPageDimension(long nDimension);
};
diff --git a/i18nutil/inc/i18nutil/scripttypedetector.hxx b/i18nutil/inc/i18nutil/scripttypedetector.hxx
index 8920ebce3d29..cf3b9b71e11b 100644
--- a/i18nutil/inc/i18nutil/scripttypedetector.hxx
+++ b/i18nutil/inc/i18nutil/scripttypedetector.hxx
@@ -25,12 +25,12 @@
class I18NUTIL_DLLPUBLIC ScriptTypeDetector
{
public:
- static sal_Int32 beginOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection );
- static sal_Int32 endOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection );
- static sal_Int16 getScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection );
- static sal_Int32 beginOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos );
- static sal_Int32 endOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos );
- static sal_Int16 getCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos );
+ static sal_Int32 beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection );
+ static sal_Int32 endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection );
+ static sal_Int16 getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection );
+ static sal_Int32 beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos );
+ static sal_Int32 endOfCTLScriptType( const OUString& Text, sal_Int32 nPos );
+ static sal_Int16 getCTLScriptType( const OUString& Text, sal_Int32 nPos );
};
#endif
diff --git a/i18nutil/inc/i18nutil/widthfolding.hxx b/i18nutil/inc/i18nutil/widthfolding.hxx
index 6193c07142f5..481239deca88 100644
--- a/i18nutil/inc/i18nutil/widthfolding.hxx
+++ b/i18nutil/inc/i18nutil/widthfolding.hxx
@@ -40,9 +40,9 @@ public:
static oneToOneMapping& getfullKana2halfKanaTable();
static oneToOneMapping& gethalfKana2fullKanaTable();
- static rtl::OUString decompose_ja_voiced_sound_marks(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset);
+ static OUString decompose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset);
static sal_Unicode decompose_ja_voiced_sound_marksChar2Char (sal_Unicode inChar);
- static rtl::OUString compose_ja_voiced_sound_marks(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags = 0 );
+ static OUString compose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags = 0 );
static sal_Unicode getCompositionChar(sal_Unicode c1, sal_Unicode c2);
};
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 463479937c58..5199b0712eea 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -207,7 +207,7 @@ long PaperInfo::sloppyFitPageDimension(long nDimension)
PaperInfo PaperInfo::getSystemDefaultPaper()
{
- rtl::OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get();
+ OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get();
#ifdef UNX
// if set to "use system", get papersize from system
@@ -233,7 +233,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
if (pBuffer && *pBuffer != 0)
{
- rtl::OString aPaper(pBuffer);
+ OString aPaper(pBuffer);
aPaper = aPaper.trim();
static struct { const char *pName; Paper ePaper; } aCustoms [] =
{
@@ -328,7 +328,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
aLocaleStr = officecfg::System::L10N::Locale::get();
if (aLocaleStr.isEmpty())
- aLocaleStr = rtl::OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+ aLocaleStr = OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US"));
// convert locale string to locale struct
::com::sun::star::lang::Locale aSysLocale;
@@ -368,13 +368,13 @@ PaperInfo::PaperInfo(long nPaperWidth, long nPaperHeight)
}
}
-rtl::OString PaperInfo::toPSName(Paper ePaper)
+OString PaperInfo::toPSName(Paper ePaper)
{
return static_cast<size_t>(ePaper) < nTabSize ?
- rtl::OString(aDinTab[ePaper].m_pPSName) : rtl::OString();
+ OString(aDinTab[ePaper].m_pPSName) : OString();
}
-Paper PaperInfo::fromPSName(const rtl::OString &rName)
+Paper PaperInfo::fromPSName(const OString &rName)
{
if (rName.isEmpty())
return PAPER_USER;
diff --git a/i18nutil/source/utility/scripttypedetector.cxx b/i18nutil/source/utility/scripttypedetector.cxx
index 799774f34314..ece2b575e593 100644
--- a/i18nutil/source/utility/scripttypedetector.cxx
+++ b/i18nutil/source/utility/scripttypedetector.cxx
@@ -47,14 +47,14 @@ static sal_Int16 scriptDirection[] = {
ScriptDirection::NEUTRAL, // DirectionProperty_BOUNDARY_NEUTRAL = 18,
};
-sal_Int16 ScriptTypeDetector::getScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection )
+sal_Int16 ScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection )
{
sal_Int16 dir = scriptDirection[unicode::getUnicodeDirection(Text[nPos])];
return (dir == ScriptDirection::NEUTRAL) ? defaultScriptDirection : dir;
}
// return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range.
-sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction )
+sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction )
{
sal_Int32 cPos = nPos;
@@ -67,7 +67,7 @@ sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const rtl::OUString& Text,
return cPos == nPos ? -1 : cPos + 1;
}
-sal_Int32 ScriptTypeDetector::endOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction )
+sal_Int32 ScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction )
{
sal_Int32 cPos = nPos;
sal_Int32 len = Text.getLength();
@@ -81,7 +81,7 @@ sal_Int32 ScriptTypeDetector::endOfScriptDirection( const rtl::OUString& Text, s
return cPos == nPos ? -1 : cPos;
}
-sal_Int16 ScriptTypeDetector::getCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+sal_Int16 ScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos )
{
static ScriptTypeList typeList[] = {
{ UnicodeScript_kHebrew, UnicodeScript_kHebrew, CTLScriptType::CTL_HEBREW }, // 10
@@ -95,7 +95,7 @@ sal_Int16 ScriptTypeDetector::getCTLScriptType( const rtl::OUString& Text, sal_I
}
// Begin of Script Type is inclusive.
-sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos )
{
if (nPos < 0)
return 0;
@@ -112,7 +112,7 @@ sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const rtl::OUString& Text, s
}
// End of the Script Type is exclusive, the return value pointing to the begin of next script type
-sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos )
{
if (nPos < 0)
return 0;
diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index 0777c979101f..99508043dee8 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.cxx
@@ -25,7 +25,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace com { namespace sun { namespace star { namespace i18n {
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index cc6343744aa7..0bb8a79d93a4 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -125,8 +125,8 @@ public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
- virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
- void SetDescription( const rtl::OString& rText )
+ virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
+ void SetDescription( const OString& rText )
{ aDescription.setString(rText); }
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
virtual const SvString & GetName() const { return aName; }
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index b3efec4a0115..f97672372dc4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -92,23 +92,23 @@ public:
sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
- rtl::OString GetSvIdlString( SvStringHashEntry * pName );
+ OString GetSvIdlString( SvStringHashEntry * pName );
};
class SvIdentifier
{
private:
- rtl::OString m_aStr;
+ OString m_aStr;
public:
SvIdentifier()
{
}
- void setString(const rtl::OString& rStr)
+ void setString(const OString& rStr)
{
m_aStr = rStr;
}
- const rtl::OString& getString() const
+ const OString& getString() const
{
return m_aStr;
}
@@ -150,14 +150,14 @@ public:
class SvString
{
private:
- rtl::OString m_aStr;
+ OString m_aStr;
public:
SvString() {}
- void setString(const rtl::OString& rStr)
+ void setString(const OString& rStr)
{
m_aStr = rStr;
}
- const rtl::OString& getString() const
+ const OString& getString() const
{
return m_aStr;
}
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index b77ab2fcb9c7..23a646f4fad3 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -25,7 +25,7 @@
#include <vector>
typedef ::std::vector< String* > StringList;
-typedef ::std::vector< rtl::OString* > ByteStringList;
+typedef ::std::vector< OString* > ByteStringList;
class SvCommand
{
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 8c314d2ac06b..1702ed77618f 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -33,7 +33,7 @@ class SvCommand;
class SvIdlError
{
- rtl::OString aText;
+ OString aText;
public:
sal_uInt32 nLine, nColumn;
@@ -41,8 +41,8 @@ public:
SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
: nLine(nL), nColumn(nC) {}
- const rtl::OString& GetText() const { return aText; }
- void SetText( const rtl::OString& rT ) { aText = rT; }
+ const OString& GetText() const { return aText; }
+ void SetText( const OString& rT ) { aText = rT; }
sal_Bool IsError() const { return nLine != 0; }
void Clear() { nLine = nColumn = 0; }
SvIdlError & operator = ( const SvIdlError & rRef )
@@ -71,14 +71,14 @@ class SvIdlDataBase
SvMetaTypeMemberList aTmpTypeList; // not persistent
protected:
- ::std::set< ::rtl::OUString > m_DepFiles;
+ ::std::set< OUString > m_DepFiles;
SvMetaObjectMemberStack aContextStack;
String aPath;
SvIdlError aError;
void WriteReset()
{
aUsedTypes.clear();
- aIFaceName = rtl::OString();
+ aIFaceName = OString();
}
public:
explicit SvIdlDataBase( const SvCommand& rCmd );
@@ -93,11 +93,11 @@ public:
SvMetaTypeMemberList & GetTypeList();
SvMetaClassMemberList & GetClassList() { return aClassList; }
SvMetaModuleMemberList & GetModuleList() { return aModuleList; }
- SvMetaModule * GetModule( const rtl::OString& rName );
+ SvMetaModule * GetModule( const OString& rName );
// list of used types while writing
SvMetaTypeMemberList aUsedTypes;
- rtl::OString aIFaceName;
+ OString aIFaceName;
SvNumberIdentifier aStructSlotId;
void StartNewFile( const String& rName );
@@ -111,13 +111,13 @@ public:
const String & GetPath() const { return aPath; }
SvMetaObjectMemberStack & GetStack() { return aContextStack; }
- void Write(const rtl::OString& rText);
- void WriteError(const rtl::OString& rErrWrn,
- const rtl::OString& rFileName,
- const rtl::OString& rErrorText,
+ void Write(const OString& rText);
+ void WriteError(const OString& rErrWrn,
+ const OString& rFileName,
+ const OString& rErrorText,
sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
void WriteError( SvTokenStream & rInStm );
- void SetError( const rtl::OString& rError, SvToken * pTok );
+ void SetError( const OString& rError, SvToken * pTok );
void Push( SvMetaObject * pObj );
sal_Bool Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
{
@@ -129,11 +129,11 @@ public:
return bOk;
}
sal_uInt32 GetUniqueId() { return ++nUniqueId; }
- sal_Bool FindId( const rtl::OString& rIdName, sal_uLong * pVal );
- sal_Bool InsertId( const rtl::OString& rIdName, sal_uLong nVal );
+ sal_Bool FindId( const OString& rIdName, sal_uLong * pVal );
+ sal_Bool InsertId( const OString& rIdName, sal_uLong nVal );
sal_Bool ReadIdFile( const String & rFileName );
- SvMetaType * FindType( const rtl::OString& rName );
+ SvMetaType * FindType( const OString& rName );
static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList & );
SvMetaType * ReadKnownType( SvTokenStream & rInStm );
@@ -142,7 +142,7 @@ public:
SvMetaAttribute * SearchKnownAttr( const SvNumberIdentifier& );
SvMetaClass * ReadKnownClass( SvTokenStream & rInStm );
void AddDepFile(String const& rFileName);
- bool WriteDepFile(SvFileStream & rStream, ::rtl::OUString const& rTarget);
+ bool WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
};
class SvIdlWorkingBase : public SvIdlDataBase
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index d5297a825a87..115d09e82df0 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -31,12 +31,12 @@ class SvHashTable
sal_uInt32 lAsk; // number of requests
sal_uInt32 lTry; // number of tries
protected:
- sal_Bool Test_Insert( const rtl::OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
+ sal_Bool Test_Insert( const OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
// compare element with entry
- virtual bool equals( const rtl::OString& , sal_uInt32 ) const = 0;
+ virtual bool equals( const OString& , sal_uInt32 ) const = 0;
// get hash value from subclass
- virtual sal_uInt32 HashFunc( const rtl::OString& ) const = 0;
+ virtual sal_uInt32 HashFunc( const OString& ) const = 0;
public:
SvHashTable( sal_uInt32 nMaxEntries );
virtual ~SvHashTable();
@@ -50,20 +50,20 @@ class SvStringHashTable;
class SvStringHashEntry : public SvRefBase
{
friend class SvStringHashTable;
- rtl::OString aName;
+ OString aName;
sal_uInt32 nHashId;
sal_uLong nValue;
sal_Bool bHasId;
public:
SvStringHashEntry() : bHasId( sal_False ) {;}
- SvStringHashEntry( const rtl::OString& rName, sal_uInt32 nIdx )
+ SvStringHashEntry( const OString& rName, sal_uInt32 nIdx )
: aName( rName )
, nHashId( nIdx )
, nValue( 0 )
, bHasId( sal_True ) {}
~SvStringHashEntry();
- const rtl::OString& GetName() const { return aName; }
+ const OString& GetName() const { return aName; }
sal_Bool HasId() const { return bHasId; }
sal_uInt32 GetId() const { return nHashId; }
@@ -92,17 +92,17 @@ class SvStringHashTable : public SvHashTable
{
SvStringHashEntry* pEntries;
protected:
- virtual sal_uInt32 HashFunc( const rtl::OString& rElement ) const;
- virtual bool equals( const rtl::OString &rElement, sal_uInt32 nIndex ) const;
+ virtual sal_uInt32 HashFunc( const OString& rElement ) const;
+ virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const;
public:
SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel
virtual ~SvStringHashTable();
- rtl::OString GetNearString( const rtl::OString& rName ) const;
+ OString GetNearString( const OString& rName ) const;
virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const;
- sal_Bool Insert( const rtl::OString& rStr, sal_uInt32 * pHash ); // insert string
- sal_Bool Test( const rtl::OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
+ sal_Bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string
+ sal_Bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
SvStringHashEntry & operator []( sal_uInt32 nPos ) const
{ return pEntries[ nPos ]; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 37d75e0d0d1d..7dd36f4e530e 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -37,7 +37,7 @@ class SvToken
friend class SvTokenStream;
sal_uLong nLine, nColumn;
SVTOKEN_ENUM nType;
- rtl::OString aString;
+ OString aString;
union
{
sal_uLong nLong;
@@ -51,12 +51,12 @@ public:
SvToken( sal_uLong n );
SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
SvToken( char c );
- SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr );
+ SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr );
SvToken( SVTOKEN_ENUM nTypeP );
SvToken & operator = ( const SvToken & rObj );
- rtl::OString GetTokenAsString() const;
+ OString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
@@ -81,7 +81,7 @@ public:
sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
sal_Bool IsEof() const { return nType == SVTOKEN_EOF; }
- const rtl::OString& GetString() const
+ const OString& GetString() const
{
return IsIdentifierHash()
? pHash->GetName()
@@ -112,7 +112,7 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
inline SvToken::SvToken( char c )
: nType( SVTOKEN_CHAR ), cChar( c ) {}
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr )
: nType( nTypeP ), aString( rStr ) {}
inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
@@ -124,8 +124,8 @@ class SvTokenStream
int nBufPos;
int c; // next character
sal_uInt16 nTabSize; // length of tabulator
- rtl::OString aStrTrue;
- rtl::OString aStrFalse;
+ OString aStrTrue;
+ OString aStrFalse;
sal_uLong nMaxPos;
SvFileStream * pInStream;
@@ -136,7 +136,7 @@ class SvTokenStream
void InitCtor();
- rtl::OString aBufStr;
+ OString aBufStr;
int GetNextChar();
int GetFastNextChar()
{
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 386b216a61ed..7d42b7559b27 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -59,12 +59,12 @@ public:
SvMetaModule();
const String & GetIdlFileName() const { return aIdlFileName; }
- const rtl::OString& GetModulePrefix() const { return aModulePrefix.getString(); }
+ const OString& GetModulePrefix() const { return aModulePrefix.getString(); }
- virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
- const rtl::OString& GetHelpFileName() const { return aHelpFileName.getString(); }
- const rtl::OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
+ const OString& GetHelpFileName() const { return aHelpFileName.getString(); }
+ const OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
const SvMetaAttributeMemberList & GetAttrList() const { return aAttrList; }
const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index cbe4d31bd680..69c1eb1a6da8 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -27,8 +27,8 @@
struct SvSlotElement
{
SvMetaSlotRef xSlot;
- rtl::OString aPrefix;
- SvSlotElement( SvMetaSlot * pS, const rtl::OString& rPrefix )
+ OString aPrefix;
+ SvSlotElement( SvMetaSlot * pS, const OString& rPrefix )
: xSlot( pS )
, aPrefix( rPrefix )
{
@@ -43,15 +43,15 @@ SV_DECL_REF(SvMetaClass)
class SvClassElement : public SvPersistBase
{
SvBOOL aAutomation;
- rtl::OString aPrefix;
+ OString aPrefix;
SvMetaClassRef xClass;
public:
SV_DECL_PERSIST1( SvClassElement, SvPersistBase, 1 )
SvClassElement();
- void SetPrefix( const rtl::OString& rPrefix )
+ void SetPrefix( const OString& rPrefix )
{ aPrefix = rPrefix; }
- const rtl::OString& GetPrefix() const
+ const OString& GetPrefix() const
{ return aPrefix; }
void SetAutomation( sal_Bool rAutomation )
@@ -81,21 +81,21 @@ class SvMetaClass : public SvMetaType
sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
- void WriteSlotStubs( const rtl::OString& rShellName,
+ void WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
SvStream & rOutStm );
- sal_uInt16 WriteSlots( const rtl::OString& rShellName, sal_uInt16 nCount,
+ sal_uInt16 WriteSlots( const OString& rShellName, sal_uInt16 nCount,
SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm );
void InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
SvMetaClassList & rClassList,
- const rtl::OString& rPrefix, SvIdlDataBase& rBase );
+ const OString& rPrefix, SvIdlDataBase& rBase );
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 1427218580a2..456d51d64b87 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -68,11 +68,11 @@ class SvMetaSlot : public SvMetaAttribute
SvMetaEnumValue* pEnumValue;
SvString aUnoName;
- void WriteSlot( const rtl::OString& rShellName,
- sal_uInt16 nCount, const rtl::OString& rSlotId,
+ void WriteSlot( const OString& rShellName,
+ sal_uInt16 nCount, const OString& rSlotId,
SvSlotElementList &rList,
size_t nStart,
- const rtl::OString& rPrefix,
+ const OString& rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void Write( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab,
@@ -177,17 +177,17 @@ public:
virtual sal_Bool IsVariable() const;
virtual sal_Bool IsMethod() const;
- virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
+ virtual OString GetMangleName( sal_Bool bVariable ) const;
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
sal_Bool GetHasCoreId() const;
- const rtl::OString& GetGroupId() const;
- const rtl::OString& GetConfigId() const;
- const rtl::OString& GetExecMethod() const;
- const rtl::OString& GetStateMethod() const;
- const rtl::OString& GetDefault() const;
- const rtl::OString& GetDisableFlags() const;
+ const OString& GetGroupId() const;
+ const OString& GetConfigId() const;
+ const OString& GetExecMethod() const;
+ const OString& GetStateMethod() const;
+ const OString& GetDefault() const;
+ const OString& GetDisableFlags() const;
sal_Bool GetPseudoSlots() const;
sal_Bool GetCachable() const;
sal_Bool GetVolatile() const;
@@ -204,8 +204,8 @@ public:
sal_Bool GetRecordAbsolute() const;
sal_Bool GetHasDialog() const;
- const rtl::OString& GetPseudoPrefix() const;
- const rtl::OString& GetUnoName() const;
+ const OString& GetPseudoPrefix() const;
+ const OString& GetUnoName() const;
sal_Bool GetMenuConfig() const;
sal_Bool GetToolBoxConfig() const;
sal_Bool GetStatusBarConfig() const;
@@ -235,16 +235,16 @@ public:
virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix,
+ virtual void Insert( SvSlotElementList&, const OString& rPrefix,
SvIdlDataBase& );
- void WriteSlotStubs( const rtl::OString& rShellName,
+ void WriteSlotStubs( const OString& rShellName,
ByteStringList & rList,
SvStream & rOutStm );
- sal_uInt16 WriteSlotMap( const rtl::OString& rShellName,
+ sal_uInt16 WriteSlotMap( const OString& rShellName,
sal_uInt16 nCount,
SvSlotElementList&,
size_t nStart,
- const rtl::OString&,
+ const OString&,
SvIdlDataBase & rBase,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 7189ceb14cd0..0efc9082e135 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -98,7 +98,7 @@ public:
virtual sal_Bool IsMethod() const;
virtual sal_Bool IsVariable() const;
- virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
+ virtual OString GetMangleName( sal_Bool bVariable ) const;
virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -111,14 +111,14 @@ public:
WriteType, WriteAttribute );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- sal_uLong MakeSfx( rtl::OStringBuffer& rAtrrArray );
- virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix,
+ sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
+ virtual void Insert( SvSlotElementList&, const OString& rPrefix,
SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
HelpIdTable& rIdTable );
virtual void WriteCSV( SvIdlDataBase&, SvStream& );
void FillIDTable(HelpIdTable& rIDTable);
- rtl::OString Compare( SvMetaAttribute *pAttr );
+ OString Compare( SvMetaAttribute *pAttr );
};
SV_IMPL_REF(SvMetaAttribute)
@@ -144,7 +144,7 @@ class SvMetaType : public SvMetaExtern
sal_Bool bIsShell;
char cParserChar;
- void WriteSfxItem( const rtl::OString& rItemName, SvIdlDataBase & rBase,
+ void WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase,
@@ -166,12 +166,12 @@ protected:
public:
SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
SvMetaType();
- SvMetaType( const rtl::OString& rTypeName, char cParserChar,
- const rtl::OString& rCName );
- SvMetaType( const rtl::OString& rTypeName, const rtl::OString& rSbxName,
- const rtl::OString& rOdlName, char cParserChar,
- const rtl::OString& rCName, const rtl::OString& rBasicName,
- const rtl::OString& rBasicPostfix );
+ SvMetaType( const OString& rTypeName, char cParserChar,
+ const OString& rCName );
+ SvMetaType( const OString& rTypeName, const OString& rSbxName,
+ const OString& rOdlName, char cParserChar,
+ const OString& rCName, const OString& rBasicName,
+ const OString& rBasicPostfix );
SvMetaAttributeMemberList & GetAttrList() const;
sal_uLong GetAttrCount() const
@@ -202,18 +202,18 @@ public:
void SetCall1( int e);
int GetCall1() const;
- void SetBasicName(const rtl::OString& rName)
+ void SetBasicName(const OString& rName)
{ aBasicName.setString(rName); }
- const rtl::OString& GetBasicName() const;
- rtl::OString GetBasicPostfix() const;
- const rtl::OString& GetSvName() const;
- const rtl::OString& GetSbxName() const;
- const rtl::OString& GetOdlName() const;
- const rtl::OString& GetCName() const;
+ const OString& GetBasicName() const;
+ OString GetBasicPostfix() const;
+ const OString& GetSvName() const;
+ const OString& GetSbxName() const;
+ const OString& GetOdlName() const;
+ const OString& GetCName() const;
char GetParserChar() const { return cParserChar; }
- virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -221,20 +221,20 @@ public:
SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- rtl::OString GetCString() const;
+ OString GetCString() const;
void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- sal_uLong MakeSfx( rtl::OStringBuffer& rAtrrArray );
+ sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
sal_Bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
- rtl::OString GetParserString() const;
+ OString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
- const rtl::OString& rChief );
+ const OString& rChief );
};
SV_IMPL_REF(SvMetaType)
@@ -252,7 +252,7 @@ class SvMetaTypeStringMemberList : public SvDeclPersistList<SvMetaTypeString *>
class SvMetaEnumValue : public SvMetaName
{
- rtl::OString aEnumValue;
+ OString aEnumValue;
public:
SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
SvMetaEnumValue();
@@ -269,7 +269,7 @@ class SvMetaEnumValueMemberList : public SvDeclPersistList<SvMetaEnumValue *> {}
class SvMetaTypeEnum : public SvMetaType
{
SvMetaEnumValueMemberList aEnumValueList;
- rtl::OString aPrefix;
+ OString aPrefix;
protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
@@ -282,7 +282,7 @@ public:
sal_uInt16 GetMaxValue() const;
sal_uLong Count() const { return aEnumValueList.size(); }
- const rtl::OString& GetPrefix() const { return aPrefix; }
+ const OString& GetPrefix() const { return aPrefix; }
SvMetaEnumValue * GetObject( sal_uLong n ) const
{ return aEnumValueList[n]; }
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 96eb8cc92d30..de253b6b817d 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -41,7 +41,7 @@ SvHashTable::~SvHashTable()
{
}
-sal_Bool SvHashTable::Test_Insert( const rtl::OString& rElement, sal_Bool bInsert,
+sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert,
sal_uInt32 * pInsertPos )
{
sal_uInt32 nHash;
@@ -114,7 +114,7 @@ SvStringHashTable::~SvStringHashTable()
delete [] pEntries;
}
-sal_uInt32 SvStringHashTable::HashFunc( const rtl::OString& rElement ) const
+sal_uInt32 SvStringHashTable::HashFunc( const OString& rElement ) const
{
sal_uInt32 nHash = 0; // hash value
const char * pStr = rElement.getStr();
@@ -135,7 +135,7 @@ sal_uInt32 SvStringHashTable::HashFunc( const rtl::OString& rElement ) const
return( nHash );
}
-rtl::OString SvStringHashTable::GetNearString( const rtl::OString& rName ) const
+OString SvStringHashTable::GetNearString( const OString& rName ) const
{
for( sal_uInt32 i = 0; i < GetMax(); i++ )
{
@@ -146,7 +146,7 @@ rtl::OString SvStringHashTable::GetNearString( const rtl::OString& rName ) const
return pE->GetName();
}
}
- return rtl::OString();
+ return OString();
}
sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
@@ -156,7 +156,7 @@ sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
return pEntries[ nIndex ].HasId();
}
-sal_Bool SvStringHashTable::Insert( const rtl::OString& rName, sal_uInt32 * pIndex )
+sal_Bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex )
{
sal_uInt32 nIndex;
@@ -170,7 +170,7 @@ sal_Bool SvStringHashTable::Insert( const rtl::OString& rName, sal_uInt32 * pInd
return sal_True;
}
-sal_Bool SvStringHashTable::Test( const rtl::OString& rName, sal_uInt32 * pPos ) const
+sal_Bool SvStringHashTable::Test( const OString& rName, sal_uInt32 * pPos ) const
{
return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, sal_False, pPos );
}
@@ -182,7 +182,7 @@ SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
return( NULL );
}
-bool SvStringHashTable::equals( const rtl::OString& rElement,
+bool SvStringHashTable::equals( const OString& rElement,
sal_uInt32 nIndex ) const
{
return rElement.equals( pEntries[ nIndex ].GetName() );
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index e01cabb9b692..e5b87310de8a 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -25,9 +25,9 @@
#include <globals.hxx>
#include <rtl/strbuf.hxx>
-rtl::OString SvToken::GetTokenAsString() const
+OString SvToken::GetTokenAsString() const
{
- rtl::OString aStr;
+ OString aStr;
switch( nType )
{
case SVTOKEN_EMPTY:
@@ -48,7 +48,7 @@ rtl::OString SvToken::GetTokenAsString() const
aStr = aString;
break;
case SVTOKEN_CHAR:
- aStr = rtl::OString(cChar);
+ aStr = OString(cChar);
break;
case SVTOKEN_RTTIBASE:
aStr = "RTTIBASE";
@@ -85,8 +85,8 @@ SvToken & SvToken::operator = ( const SvToken & rObj )
void SvTokenStream::InitCtor()
{
- aStrTrue = rtl::OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
- aStrFalse = rtl::OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
+ aStrTrue = OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
+ aStrFalse = OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
nLine = nColumn = 0;
nBufPos = 0;
nTabSize = 4;
@@ -161,7 +161,7 @@ int SvTokenStream::GetNextChar()
}
else
{
- aBufStr = rtl::OString();
+ aBufStr = OString();
nColumn = 0;
nBufPos = 0;
return '\0';
@@ -275,7 +275,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
}
else if( c == '"' )
{
- rtl::OStringBuffer aStr;
+ OStringBuffer aStr;
sal_Bool bDone = sal_False;
while( !bDone && !IsEof() && c )
{
@@ -322,13 +322,13 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
}
else if( isalpha (c) || (c == '_') )
{
- rtl::OStringBuffer aBuf;
+ OStringBuffer aBuf;
while( isalnum( c ) || c == '_' )
{
aBuf.append(static_cast<char>(c));
c = GetFastNextChar();
}
- rtl::OString aStr = aBuf.makeStringAndClear();
+ OString aStr = aBuf.makeStringAndClear();
if( aStr.equalsIgnoreAsciiCase( aStrTrue ) )
{
rToken.nType = SVTOKEN_BOOL;
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index f4d646569ea7..491d485a528b 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -152,7 +152,7 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) rStm << aDescription;
}
-sal_Bool SvMetaName::SetName( const rtl::OString& rName, SvIdlDataBase * )
+sal_Bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * )
{
aName.setString(rName);
return sal_True;
@@ -220,7 +220,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
{
rOutStm << "<DESCRIPTION>" << endl;
- rtl::OString aDesc( GetDescription().getString() );
+ OString aDesc( GetDescription().getString() );
sal_Int32 nPos = aDesc.indexOf('\n');
while ( nPos != -1 )
{
@@ -378,7 +378,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
{
WriteTab( rOutStm, nTab );
rOutStm << "helpcontext("
- << rtl::OString::valueOf(static_cast<sal_Int64>(
+ << OString::valueOf(static_cast<sal_Int64>(
GetHelpContext().GetValue())).getStr()
<< ")," << endl;
}
@@ -558,7 +558,7 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, nTab );
rOutStm << "// class SvMetaExtern" << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "uuid(" << rtl::OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl;
+ rOutStm << "uuid(" << OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl;
WriteTab( rOutStm, nTab );
rOutStm << "version("
<< OString::number(aVersion.GetMajorVersion()).getStr()
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 0d7510e1046a..5678a6500643 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -166,12 +166,12 @@ sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
return sal_True;
}
-rtl::OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
+OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
{
if( nVal )
return pName->GetName();
- return rtl::OStringBuffer(pName->GetName()).
+ return OStringBuffer(pName->GetName()).
append(RTL_CONSTASCII_STRINGPARAM("(FALSE)")).
makeStringAndClear();
}
@@ -239,7 +239,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"no value for identifier <"));
aStr.append(getString()).append(RTL_CONSTASCII_STRINGPARAM("> "));
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -266,7 +266,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"no value for identifier <"));
aStr.append(getString()).append(RTL_CONSTASCII_STRINGPARAM("> "));
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -365,7 +365,7 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
if( pTok->IsString() )
{
pTok = rInStm.GetToken_Next();
- bOk = MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ bOk = MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
if( bOk && bBraket )
bOk = rInStm.Read( ')' );
@@ -381,7 +381,7 @@ sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
{
// write global id
rOutStm << SvHash_uuid()->GetName().getStr() << "(\"";
- rOutStm << rtl::OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
+ rOutStm << OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
return sal_True;
}
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index e83c23bb11eb..05c258565eb5 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -100,7 +100,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
rStm.Seek( nPos );
}
-sal_Bool SvMetaModule::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase )
{
if( pBase )
{
@@ -132,9 +132,9 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
{
sal_uInt32 nTokPos = rInStm.Tell();
- if( !rBase.ReadIdFile( rtl::OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) )
+ if( !rBase.ReadIdFile( OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) )
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
aStr.append(aSlotIdFile.getString());
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
rBase.WriteError( rInStm );
@@ -222,7 +222,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
{
- OUString aFullName(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ OUString aFullName(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
rBase.StartNewFile( aFullName );
osl::FileBase::RC searchError = osl::File::searchFileURL(aFullName, rBase.GetPath(), aFullName);
osl::FileBase::getSystemPathFromFileURL( aFullName, aFullName );
@@ -256,15 +256,15 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot open file: "));
- aStr.append(rtl::OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot open file: "));
+ aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot find file:"));
- aStr.append(rtl::OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot find file:"));
+ aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
@@ -324,14 +324,14 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm
{
pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
- bOk = aBeginName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ bOk = aBeginName.MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
rInStm.ReadDelemiter();
if( bOk )
{
pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
- bOk = aEndName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ bOk = aEndName.MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
rInStm.ReadDelemiter();
if( bOk )
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 953886d97974..3d1d67e2ba50 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -297,7 +297,7 @@ sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
if( bOk )
{
- rBase.Write(rtl::OString('.'));
+ rBase.Write(OString('.'));
bOk = SvMetaName::ReadSvIdl( rBase, rInStm );
}
if( bOk )
@@ -329,7 +329,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
aStr.append(pS->GetName().getString());
aStr.append(RTL_CONSTASCII_STRINGPARAM(" with different id's"));
rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken());
@@ -344,12 +344,12 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
if( nId1 == nId2 && nId1 != 0 )
{
OSL_FAIL( "Gleiche Id in MetaClass : " );
- OSL_FAIL(rtl::OString::valueOf(static_cast<sal_Int32>(
+ OSL_FAIL(OString::valueOf(static_cast<sal_Int32>(
pS->GetSlotId().GetValue())).getStr());
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
aStr.append(pS->GetName().getString());
aStr.append(RTL_CONSTASCII_STRINGPARAM(" and Attribute "));
aStr.append(rAttr.GetName().getString());
@@ -442,7 +442,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
return nCount;
}
-sal_uInt16 SvMetaClass::WriteSlots( const rtl::OString& rShellName,
+sal_uInt16 SvMetaClass::WriteSlots( const OString& rShellName,
sal_uInt16 nCount, SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm )
@@ -462,7 +462,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const rtl::OString& rShellName,
void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
SvMetaClassList &rClassList,
- const rtl::OString& rPrefix, SvIdlDataBase& rBase)
+ const OString& rPrefix, SvIdlDataBase& rBase)
{
// was this class already written?
for ( size_t i = 0, n = rClassList.size(); i < n ; ++i )
@@ -504,7 +504,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>&
{
SvClassElement * pEle = aClassList[n];
SvMetaClass * pCl = pEle->GetClass();
- rtl::OStringBuffer rPre(rPrefix);
+ OStringBuffer rPre(rPrefix);
if( rPre.getLength() && pEle->GetPrefix().getLength() )
rPre.append('.');
rPre.append(pEle->GetPrefix());
@@ -544,7 +544,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
}
-void SvMetaClass::WriteSlotStubs( const rtl::OString& rShellName,
+void SvMetaClass::WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm )
@@ -580,7 +580,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
std::vector<sal_uLong> aSuperList;
SvMetaClassList classList;
SvSlotElementList aSlotList;
- InsertSlots(aSlotList, aSuperList, classList, rtl::OString(), rBase);
+ InsertSlots(aSlotList, aSuperList, classList, OString(), rBase);
for ( size_t i = 0, n = aSlotList.size(); i < n; ++i )
{
SvSlotElement *pEle = aSlotList[ i ];
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 644ff6680e39..5cb323326260 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -291,7 +291,7 @@ sal_Bool SvMetaSlot::IsMethod() const
return b;
}
-rtl::OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
+OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
{
if( !bVariable )
{
@@ -324,32 +324,32 @@ sal_Bool SvMetaSlot::GetHasCoreId() const
if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
return ((SvMetaSlot *)GetRef())->GetHasCoreId();
}
-const rtl::OString& SvMetaSlot::GetGroupId() const
+const OString& SvMetaSlot::GetGroupId() const
{
if( !aGroupId.getString().isEmpty() || !GetRef() ) return aGroupId.getString();
return ((SvMetaSlot *)GetRef())->GetGroupId();
}
-const rtl::OString& SvMetaSlot::GetDisableFlags() const
+const OString& SvMetaSlot::GetDisableFlags() const
{
if( !aDisableFlags.getString().isEmpty() || !GetRef() ) return aDisableFlags.getString();
return ((SvMetaSlot *)GetRef())->GetDisableFlags();
}
-const rtl::OString& SvMetaSlot::GetConfigId() const
+const OString& SvMetaSlot::GetConfigId() const
{
if( !aConfigId.getString().isEmpty() || !GetRef() ) return aConfigId.getString();
return ((SvMetaSlot *)GetRef())->GetConfigId();
}
-const rtl::OString& SvMetaSlot::GetExecMethod() const
+const OString& SvMetaSlot::GetExecMethod() const
{
if( !aExecMethod.getString().isEmpty() || !GetRef() ) return aExecMethod.getString();
return ((SvMetaSlot *)GetRef())->GetExecMethod();
}
-const rtl::OString& SvMetaSlot::GetStateMethod() const
+const OString& SvMetaSlot::GetStateMethod() const
{
if( !aStateMethod.getString().isEmpty() || !GetRef() ) return aStateMethod.getString();
return ((SvMetaSlot *)GetRef())->GetStateMethod();
}
-const rtl::OString& SvMetaSlot::GetDefault() const
+const OString& SvMetaSlot::GetDefault() const
{
if( !aDefault.getString().isEmpty() || !GetRef() ) return aDefault.getString();
return ((SvMetaSlot *)GetRef())->GetDefault();
@@ -440,7 +440,7 @@ sal_Bool SvMetaSlot::GetHasDialog() const
if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
return ((SvMetaSlot *)GetRef())->GetHasDialog();
}
-const rtl::OString& SvMetaSlot::GetPseudoPrefix() const
+const OString& SvMetaSlot::GetPseudoPrefix() const
{
if( !aPseudoPrefix.getString().isEmpty() || !GetRef() ) return aPseudoPrefix.getString();
return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
@@ -488,7 +488,7 @@ sal_Bool SvMetaSlot::GetImageReflection() const
return ((SvMetaSlot *)GetRef())->GetImageReflection();
}
-const rtl::OString& SvMetaSlot::GetUnoName() const
+const OString& SvMetaSlot::GetUnoName() const
{
if( aUnoName.IsSet() || !GetRef() ) return aUnoName.getString();
return ((SvMetaSlot *)GetRef())->GetUnoName();
@@ -509,14 +509,14 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm );
if( aGet.ReadSvIdl( SvHash_Get(), rInStm ) )
{
- rBase.WriteError( "warning", rtl::OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
+ rBase.WriteError( "warning", OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
"<Get> old style, use Readonly",
rInStm.GetToken()->GetLine(),
rInStm.GetToken()->GetColumn() );
}
if( aSet.ReadSvIdl( SvHash_Set(), rInStm ) )
{
- rBase.WriteError( "warning", rtl::OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
+ rBase.WriteError( "warning", OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
"<Set> old style, use method declaration",
rInStm.GetToken()->GetLine(),
rInStm.GetToken()->GetColumn() );
@@ -693,15 +693,15 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
rOutStm << ';' << endl;
}
- rtl::OString aDel(", ");
- rtl::OStringBuffer aOut;
+ OString aDel(", ");
+ OStringBuffer aOut;
if( aVolatile )
aOut.append(aVolatile.GetSvIdlString( SvHash_Volatile() ));
else if( !aCachable )
// because of Default == TRUE, only when no other is set
aOut.append(aCachable.GetSvIdlString( SvHash_Cachable() ));
else
- aDel = rtl::OString();
+ aDel = OString();
if( aToggle )
{
@@ -714,7 +714,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
aDel = ", ";
}
- rtl::OString aDel1(", ");
+ OString aDel1(", ");
if( aAsynchron )
aOut.append(aDel).append(aAsynchron.GetSvIdlString( SvHash_Asynchron() ));
else if( !aSynchron )
@@ -835,7 +835,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
else
{
- rtl::OStringBuffer aStr( "attribute " );
+ OStringBuffer aStr( "attribute " );
aStr.append(pAttr->GetName().getString());
aStr.append(" is method or variable but not a slot");
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -868,7 +868,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
else
{
- rtl::OStringBuffer aStr("attribute ");
+ OStringBuffer aStr("attribute ");
aStr.append(pAttr2->GetName().getString());
aStr.append(" is method or variable but not a slot");
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -922,7 +922,7 @@ void SvMetaSlot::Write( SvIdlDataBase & rBase,
}
-void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
+void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
SvIdlDataBase& rBase)
{
// get insert position through binary search in slotlist
@@ -1001,8 +1001,8 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
{
// create SlotId
SvMetaEnumValue *enumValue = pEnum->GetObject(n);
- rtl::OString aValName = enumValue->GetName().getString();
- rtl::OStringBuffer aBuf;
+ OString aValName = enumValue->GetName().getString();
+ OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
aBuf.append(GetPseudoPrefix());
else
@@ -1010,7 +1010,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
aBuf.append('_');
aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
- rtl::OString aSId = aBuf.makeStringAndClear();
+ OString aSId = aBuf.makeStringAndClear();
xEnumSlot = NULL;
for( m=0; m<rBase.GetAttrList().size(); m++ )
@@ -1074,21 +1074,21 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
}
-static rtl::OString MakeSlotName( SvStringHashEntry * pEntry )
+static OString MakeSlotName( SvStringHashEntry * pEntry )
{
- rtl::OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
+ OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
aName.append(pEntry->GetName());
return aName.makeStringAndClear().toAsciiUpperCase();
};
-void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
+void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
ByteStringList & rList,
SvStream & rOutStm )
{
if ( !GetExport() && !GetHidden() )
return;
- rtl::OString aMethodName( GetExecMethod() );
+ OString aMethodName( GetExecMethod() );
if ( !aMethodName.isEmpty() &&
!aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")) )
{
@@ -1104,7 +1104,7 @@ void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
if ( !bIn )
{
- rList.push_back( new rtl::OString(aMethodName) );
+ rList.push_back( new OString(aMethodName) );
rOutStm << "SFX_EXEC_STUB("
<< rShellName.getStr()
<< ','
@@ -1129,7 +1129,7 @@ void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
if ( !bIn )
{
- rList.push_back( new rtl::OString(aMethodName) );
+ rList.push_back( new OString(aMethodName) );
rOutStm << "SFX_STATE_STUB("
<< rShellName.getStr()
<< ','
@@ -1139,11 +1139,11 @@ void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
}
}
-void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
- const rtl::OString& rSlotId,
+void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
+ const OString& rSlotId,
SvSlotElementList& rSlotList,
size_t nStart,
- const rtl::OString& rPrefix,
+ const OString& rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm )
{
if ( !GetExport() && !GetHidden() )
@@ -1154,7 +1154,7 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
rOutStm << "// Slot Nr. "
<< OString::number(nListPos).getStr()
<< " : ";
- rtl::OString aSlotIdValue(rtl::OString::valueOf(static_cast<sal_Int32>(
+ OString aSlotIdValue(OString::valueOf(static_cast<sal_Int32>(
GetSlotId().GetValue())));
rOutStm << aSlotIdValue.getStr() << endl;
WriteTab( rOutStm, 1 );
@@ -1181,11 +1181,11 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
if( bIsEnumSlot )
{
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
<< "] /*Offset Master*/, " << endl;
WriteTab( rOutStm, 4 );
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
<< "] /*Offset Next*/, " << endl;
WriteTab( rOutStm, 4 );
@@ -1240,13 +1240,13 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
else
{
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
<< "] /*Offset Linked*/, " << endl;
WriteTab( rOutStm, 4 );
}
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
<< "] /*Offset Next*/, " << endl;
WriteTab( rOutStm, 4 );
@@ -1377,7 +1377,7 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
pType = GetType();
sal_uLong nSCount = pType->GetAttrCount();
rOutStm
- << rtl::OString::valueOf(static_cast<sal_Int32>(
+ << OString::valueOf(static_cast<sal_Int32>(
nSCount)).getStr()
<< "/*Count*/";
}
@@ -1459,15 +1459,15 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
return 0;
}
-sal_uInt16 SvMetaSlot::WriteSlotMap( const rtl::OString& rShellName, sal_uInt16 nCount,
+sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16 nCount,
SvSlotElementList& rSlotList,
size_t nStart,
- const rtl::OString& rPrefix,
+ const OString& rPrefix,
SvIdlDataBase & rBase,
SvStream & rOutStm )
{
// SlotId, if not specified generate from name
- rtl::OString slotId = GetSlotId().getString();
+ OString slotId = GetSlotId().getString();
sal_uInt16 nSCount = 0;
if( IsMethod() )
@@ -1503,9 +1503,9 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
{
for( sal_uLong n = 0; n < pEnum->Count(); ++n )
{
- rtl::OString aValName = pEnum->GetObject( n )->GetName().getString();
+ OString aValName = pEnum->GetObject( n )->GetName().getString();
- rtl::OStringBuffer aBuf;
+ OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
aBuf.append(GetPseudoPrefix());
else
@@ -1513,7 +1513,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
aBuf.append('_');
aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
- rtl::OString aSId = aBuf.makeStringAndClear();
+ OString aSId = aBuf.makeStringAndClear();
sal_uLong nSId2;
sal_Bool bIdOk = sal_False;
@@ -1529,7 +1529,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
rTable[ nSId2 ] = this;
rOutStm << "#define " << aSId.getStr() << '\t'
- << rtl::OString::valueOf(
+ << OString::valueOf(
static_cast<sal_Int32>(nSId2)).getStr()
<< endl;
}
@@ -1550,7 +1550,7 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
rStrm << "PROJECT,";
rStrm << GetSlotId().getString().getStr() << ',';
rStrm
- << rtl::OString::valueOf(
+ << OString::valueOf(
static_cast<sal_Int32>(GetSlotId().GetValue())).getStr()
<< ',';
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index af582515b614..3416266889ef 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -174,7 +174,7 @@ sal_Bool SvMetaAttribute::IsVariable() const
return pType->GetType() != TYPE_METHOD;
}
-rtl::OString SvMetaAttribute::GetMangleName( sal_Bool ) const
+OString SvMetaAttribute::GetMangleName( sal_Bool ) const
{
return GetName().getString();
}
@@ -413,7 +413,7 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
{
WriteTab( rOutStm, nTab );
rOutStm << "id("
- << rtl::OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase,bVar))).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase,bVar))).getStr()
<< ")," << endl;
}
if( bVar && (bReadonly || IsMethod()) )
@@ -455,12 +455,12 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
rOutStm << "pODKCallFunction( "
- << rtl::OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
+ << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
rOutStm << ',' << endl;
WriteTab( rOutStm, 3 );
rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
- rtl::OString aParserStr;
+ OString aParserStr;
if( pBaseType->GetType() == TYPE_METHOD || bSet )
aParserStr = pBaseType->GetParserString();
if( !aParserStr.isEmpty() )
@@ -491,7 +491,7 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rOutStm << ", ";
if( IsMethod() )
- pBaseType->WriteParamNames( rBase, rOutStm, rtl::OString() );
+ pBaseType->WriteParamNames( rBase, rOutStm, OString() );
else if( bSet )
pBaseType->WriteParamNames( rBase, rOutStm, GetName().getString() );
}
@@ -581,7 +581,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if( !bVariable && IsMethod() )
{
- rtl::OString name = rBase.aIFaceName + GetName().getString();
+ OString name = rBase.aIFaceName + GetName().getString();
const char * pName = name.getStr();
WriteTab( rOutStm, nTab );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
@@ -603,7 +603,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
else
{
- rtl::OString name = GetName().getString();
+ OString name = GetName().getString();
sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if ( !bReadonly && !IsMethod() )
@@ -708,7 +708,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray )
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
@@ -727,7 +727,7 @@ sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray )
}
}
-void SvMetaAttribute::Insert (SvSlotElementList&, const rtl::OString&, SvIdlDataBase&)
+void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&)
{
}
@@ -751,8 +751,8 @@ SvMetaType::SvMetaType()
{
}
-SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
- const rtl::OString& rCName )
+SvMetaType::SvMetaType( const OString& rName, char cPC,
+ const OString& rCName )
CTOR
{
SetName( rName );
@@ -760,13 +760,13 @@ SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
aCName.setString(rCName);
}
-SvMetaType::SvMetaType( const rtl::OString& rName,
- const rtl::OString& rSbxName,
- const rtl::OString& rOdlName,
+SvMetaType::SvMetaType( const OString& rName,
+ const OString& rSbxName,
+ const OString& rOdlName,
char cPc,
- const rtl::OString& rCName,
- const rtl::OString& rBasicName,
- const rtl::OString& rBasicPostfix )
+ const OString& rCName,
+ const OString& rBasicName,
+ const OString& rBasicPostfix )
CTOR
{
SetName( rName );
@@ -864,7 +864,7 @@ void SvMetaType::SetType( int nT )
}
else if( nType == TYPE_CLASS )
{
- rtl::OStringBuffer aTmp(C_PREF);
+ OStringBuffer aTmp(C_PREF);
aTmp.append(RTL_CONSTASCII_STRINGPARAM("Object *"));
aCName.setString(aTmp.makeStringAndClear());
}
@@ -884,7 +884,7 @@ SvMetaType * SvMetaType::GetReturnType() const
return (SvMetaType *)GetRef();
}
-const rtl::OString& SvMetaType::GetBasicName() const
+const OString& SvMetaType::GetBasicName() const
{
if( aBasicName.IsSet() || !GetRef() )
return aBasicName.getString();
@@ -892,10 +892,10 @@ const rtl::OString& SvMetaType::GetBasicName() const
return ((SvMetaType*)GetRef())->GetBasicName();
}
-rtl::OString SvMetaType::GetBasicPostfix() const
+OString SvMetaType::GetBasicPostfix() const
{
// MBN and Co always want "As xxx"
- return rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(" As ")).
+ return OStringBuffer(RTL_CONSTASCII_STRINGPARAM(" As ")).
append(GetBasicName()).
makeStringAndClear();
}
@@ -964,7 +964,7 @@ int SvMetaType::GetCall1() const
return ((SvMetaType *)GetRef())->GetCall1();
}
-const rtl::OString& SvMetaType::GetSvName() const
+const OString& SvMetaType::GetSvName() const
{
if( aSvName.IsSet() || !GetRef() )
return aSvName.getString();
@@ -972,7 +972,7 @@ const rtl::OString& SvMetaType::GetSvName() const
return ((SvMetaType *)GetRef())->GetSvName();
}
-const rtl::OString& SvMetaType::GetSbxName() const
+const OString& SvMetaType::GetSbxName() const
{
if( aSbxName.IsSet() || !GetRef() )
return aSbxName.getString();
@@ -980,7 +980,7 @@ const rtl::OString& SvMetaType::GetSbxName() const
return ((SvMetaType *)GetRef())->GetSbxName();
}
-const rtl::OString& SvMetaType::GetOdlName() const
+const OString& SvMetaType::GetOdlName() const
{
if( aOdlName.IsSet() || !GetRef() )
return aOdlName.getString();
@@ -988,7 +988,7 @@ const rtl::OString& SvMetaType::GetOdlName() const
return ((SvMetaType *)GetRef())->GetOdlName();
}
-const rtl::OString& SvMetaType::GetCName() const
+const OString& SvMetaType::GetCName() const
{
if( aCName.IsSet() || !GetRef() )
return aCName.getString();
@@ -996,7 +996,7 @@ const rtl::OString& SvMetaType::GetCName() const
return ((SvMetaType *)GetRef())->GetCName();
}
-sal_Bool SvMetaType::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
{
aSvName.setString(rName);
aSbxName.setString(rName);
@@ -1006,9 +1006,9 @@ sal_Bool SvMetaType::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
return SvMetaReference::SetName( rName, pBase );
}
-rtl::OString SvMetaType::GetCString() const
+OString SvMetaType::GetCString() const
{
- rtl::OStringBuffer out( GetSvName() );
+ OStringBuffer out( GetSvName() );
if( aCall0 == (int)CALL_POINTER )
out.append(" *");
else if( aCall0 == (int)CALL_REFERENCE )
@@ -1081,7 +1081,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OString aStr("wrong typedef: ");
+ OString aStr("wrong typedef: ");
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
}
@@ -1098,7 +1098,7 @@ sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
{
if( ReadHeaderSvIdl( rBase, rInStm ) )
{
- rBase.Write(rtl::OString('.'));
+ rBase.Write(OString('.'));
return SvMetaExtern::ReadSvIdl( rBase, rInStm );
}
return sal_False;
@@ -1152,7 +1152,7 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
// write only enum
return;
- rtl::OString name = GetName().getString();
+ OString name = GetName().getString();
if( nT == WRITE_ODL || nT == WRITE_C_HEADER || nT == WRITE_CXX_HEADER )
{
switch( nType )
@@ -1173,7 +1173,7 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if ( nT == WRITE_C_HEADER )
{
- rtl::OString aStr = name.toAsciiUpperCase();
+ OString aStr = name.toAsciiUpperCase();
rOutStm << "#ifndef " << C_PREF << aStr.getStr() << "_DEF " << endl;
rOutStm << "#define " << C_PREF << aStr.getStr() << "_DEF " << endl;
}
@@ -1305,7 +1305,7 @@ void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
sal_uInt16 nTab )
{
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
- rtl::OString name = GetName().getString();
+ OString name = GetName().getString();
if( aSvName.getString() != name || aSbxName.getString() != name || aOdlName.getString() != name )
{
WriteTab( rOutStm, nTab );
@@ -1373,7 +1373,7 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
}
-sal_uLong SvMetaType::MakeSfx( rtl::OStringBuffer& rAttrArray )
+sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
{
sal_uLong nC = 0;
@@ -1392,16 +1392,16 @@ sal_uLong SvMetaType::MakeSfx( rtl::OStringBuffer& rAttrArray )
}
void SvMetaType::WriteSfxItem(
- const rtl::OString& rItemName, SvIdlDataBase &, SvStream & rOutStm )
+ const OString& rItemName, SvIdlDataBase &, SvStream & rOutStm )
{
WriteStars( rOutStm );
- rtl::OStringBuffer aVarName(RTL_CONSTASCII_STRINGPARAM(" a"));
+ OStringBuffer aVarName(RTL_CONSTASCII_STRINGPARAM(" a"));
aVarName.append(rItemName).append(RTL_CONSTASCII_STRINGPARAM("_Impl"));
- rtl::OStringBuffer aTypeName(RTL_CONSTASCII_STRINGPARAM("SfxType"));
- rtl::OStringBuffer aAttrArray;
+ OStringBuffer aTypeName(RTL_CONSTASCII_STRINGPARAM("SfxType"));
+ OStringBuffer aAttrArray;
sal_uLong nAttrCount = MakeSfx( aAttrArray );
- rtl::OString aAttrCount(
+ OString aAttrCount(
OString::number(nAttrCount));
aTypeName.append(aAttrCount);
@@ -1589,7 +1589,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "[out] ";
}
- rtl::OString out;
+ OString out;
if( GetType() == TYPE_METHOD )
out = GetReturnType()->GetBaseType()->GetOdlName();
else
@@ -1678,14 +1678,14 @@ void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteMethodArgs( rBase, rOutStm, nTab +2, nT );
}
-rtl::OString SvMetaType::GetParserString() const
+OString SvMetaType::GetParserString() const
{
SvMetaType * pBT = GetBaseType();
if( pBT != this )
return pBT->GetParserString();
int type = GetType();
- rtl::OString aPStr;
+ OString aPStr;
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
@@ -1698,13 +1698,13 @@ rtl::OString SvMetaType::GetParserString() const
}
}
else
- aPStr = rtl::OString(GetParserChar());
+ aPStr = OString(GetParserChar());
return aPStr;
}
void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
SvStream & rOutStm,
- const rtl::OString& rChief )
+ const OString& rChief )
{
SvMetaType * pBT = GetBaseType();
if( pBT != this )
@@ -1720,7 +1720,7 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
for( sal_uLong n = 0; n < nAttrCount; n++ )
{
SvMetaAttribute * pA = (*pAttrList)[n];
- rtl::OString aStr = pA->GetName().getString();
+ OString aStr = pA->GetName().getString();
pA->GetType()->WriteParamNames( rBase, rOutStm, aStr );
if( n +1 < nAttrCount )
rOutStm << ", ";
@@ -1841,7 +1841,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
namespace
{
- rtl::OString getCommonSubPrefix(const rtl::OString &rA, const rtl::OString &rB)
+ OString getCommonSubPrefix(const OString &rA, const OString &rB)
{
sal_Int32 nMax = std::min(rA.getLength(), rB.getLength());
sal_Int32 nI = 0;
@@ -1965,9 +1965,9 @@ void SvMetaTypevoid::Save( SvPersistStream & rStm )
SvMetaType::Save( rStm );
}
-rtl::OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
+OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
{
- rtl::OStringBuffer aStr;
+ OStringBuffer aStr;
if ( aType.Is() )
{
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index f538bec146a0..3d6ce3708545 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -144,14 +144,14 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
pDataBase->Load( aStm );
if( aStm.GetError() != SVSTREAM_OK )
{
- rtl::OStringBuffer aStr;
+ OStringBuffer aStr;
if( aStm.GetError() == SVSTREAM_FILEFORMAT_ERROR )
aStr.append("error: incompatible format, file ");
else if( aStm.GetError() == SVSTREAM_WRONGVERSION )
aStr.append("error: wrong version, file ");
else
aStr.append("error during load, file ");
- aStr.append(rtl::OUStringToOString(aFileName,
+ aStr.append(OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "%s\n", aStr.getStr() );
return sal_False;
@@ -166,7 +166,7 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
}
else
{
- const rtl::OString aStr(rtl::OUStringToOString(aFileName,
+ const OString aStr(OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "unable to read input file: %s\n", aStr.getStr() );
return sal_False;
@@ -178,16 +178,16 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
{
// program name
- pList->push_back( new String(rtl::OUString::createFromAscii(*argv) ) );
+ pList->push_back( new String(OUString::createFromAscii(*argv) ) );
for( int i = 1; i < argc; i++ )
{
if( '@' == **(argv +i) )
{ // when @, then response file
- SvFileStream aStm( rtl::OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
+ SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
if( aStm.GetError() != SVSTREAM_OK )
return sal_False;
- rtl::OString aStr;
+ OString aStr;
while( aStm.ReadLine( aStr ) )
{
sal_uInt16 n = 0;
@@ -200,12 +200,12 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
while( aStr[n] && !isspace( aStr[n] ) )
n++;
if( n != nPos )
- pList->push_back( new String( rtl::OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ) );
+ pList->push_back( new String( OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ) );
}
}
}
else if( argv[ i ] )
- pList->push_back( new String( rtl::OUString::createFromAscii( argv[ i ] ) ) );
+ pList->push_back( new String( OUString::createFromAscii( argv[ i ] ) ) );
}
return sal_True;
}
@@ -293,7 +293,7 @@ SvCommand::SvCommand( int argc, char ** argv )
{
printf(
"unknown switch: %s\n",
- rtl::OUStringToOString(
+ OUStringToOString(
aParam, RTL_TEXTENCODING_UTF8).getStr());
exit( -1 );
}
@@ -336,7 +336,7 @@ SvCommand::SvCommand( int argc, char ** argv )
// temporary compatibility hack
printf(
"unknown switch: %s\n",
- rtl::OUStringToOString(
+ OUStringToOString(
aParam, RTL_TEXTENCODING_UTF8).getStr());
exit( -1 );
}
@@ -356,13 +356,13 @@ SvCommand::SvCommand( int argc, char ** argv )
delete aList[ i ];
aList.clear();
- rtl::OString aInc(getenv("INCLUDE"));
+ OString aInc(getenv("INCLUDE"));
// append include environment variable
if( aInc.getLength() )
{
if( aPath.Len() )
aPath += OUString( SAL_PATHSEPARATOR );
- aPath += rtl::OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
+ aPath += OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
}
}
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 7e907e769302..8850d9813d8e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -75,7 +75,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
return aTypeList;
}
-SvMetaModule * SvIdlDataBase::GetModule( const rtl::OString& rName )
+SvMetaModule * SvIdlDataBase::GetModule( const OString& rName )
{
for( sal_uLong n = 0; n < aModuleList.size(); n++ )
if( aModuleList[n]->GetName().getString().equals(rName) )
@@ -157,7 +157,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
aPStm << nUniqueId;
}
-void SvIdlDataBase::SetError( const rtl::OString& rError, SvToken * pTok )
+void SvIdlDataBase::SetError( const OString& rError, SvToken * pTok )
{
if( pTok->GetLine() > 10000 )
aError.SetText( "hgchcg" );
@@ -175,7 +175,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
GetStack().Push( pObj );
}
-sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
+sal_Bool SvIdlDataBase::FindId( const OString& rIdName, sal_uLong * pVal )
{
if( pIdTable )
{
@@ -189,7 +189,7 @@ sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
return sal_False;
}
-sal_Bool SvIdlDataBase::InsertId( const rtl::OString& rIdName, sal_uLong nVal )
+sal_Bool SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal )
{
if( !pIdTable )
pIdTable = new SvStringHashTable( 20003 );
@@ -228,12 +228,12 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
if( pTok->Is( SvHash_define() ) )
{
pTok = aTokStm.GetToken_Next();
- rtl::OString aDefName;
+ OString aDefName;
if( pTok->IsIdentifier() )
aDefName = pTok->GetString();
else
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+ OString aStr(RTL_CONSTASCII_STRINGPARAM(
"unexpected token after define"));
// set error
SetError( aStr, pTok );
@@ -264,7 +264,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
|| pTok->GetChar() == '^'
|| pTok->GetChar() == '~' )
{
- rtl::OStringBuffer aStr("unknown operator '");
+ OStringBuffer aStr("unknown operator '");
aStr.append(pTok->GetChar());
aStr.append("'in define");
// set error
@@ -290,7 +290,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
{
if( !InsertId( aDefName, nVal ) )
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
+ OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
SetError( aStr, pTok );
WriteError( aTokStm );
return sal_False;
@@ -300,7 +300,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
else if( pTok->Is( SvHash_include() ) )
{
pTok = aTokStm.GetToken_Next();
- rtl::OStringBuffer aName;
+ OStringBuffer aName;
if( pTok->IsString() )
aName.append(pTok->GetString());
else if( pTok->IsChar() && pTok->GetChar() == '<' )
@@ -314,7 +314,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
}
if( pTok->IsEof() )
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+ OString aStr(RTL_CONSTASCII_STRINGPARAM(
"unexpected eof in #include"));
// set error
SetError(aStr, pTok);
@@ -322,10 +322,10 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
return sal_False;
}
}
- if (!ReadIdFile(rtl::OStringToOUString(aName.toString(),
+ if (!ReadIdFile(OStringToOUString(aName.toString(),
RTL_TEXTENCODING_ASCII_US)))
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"cannot read file: "));
aStr.append(aName.makeStringAndClear());
SetError(aStr.makeStringAndClear(), pTok);
@@ -352,7 +352,7 @@ SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType,
return NULL;
}
-SvMetaType * SvIdlDataBase::FindType( const rtl::OString& rName )
+SvMetaType * SvIdlDataBase::FindType( const OString& rName )
{
for( SvMetaTypeMemberList::const_iterator it = aTypeList.begin(); it != aTypeList.end(); ++it )
if( rName.equals((*it)->GetName().getString()) )
@@ -401,7 +401,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
if( pTok->IsIdentifier() )
{
- rtl::OString aName = pTok->GetString();
+ OString aName = pTok->GetString();
SvMetaTypeMemberList & rList = GetTypeList();
SvMetaTypeMemberList::const_iterator it = rList.begin();
SvMetaType * pType = NULL;
@@ -484,7 +484,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
}
}
- rtl::OStringBuffer aStr("Nicht gefunden : ");
+ OStringBuffer aStr("Nicht gefunden : ");
aStr.append(pTok->GetString());
OSL_FAIL(aStr.getStr());
}
@@ -530,15 +530,15 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
return NULL;
}
-void SvIdlDataBase::Write(const rtl::OString& rText)
+void SvIdlDataBase::Write(const OString& rText)
{
if( nVerbosity != 0 )
fprintf( stdout, "%s", rText.getStr() );
}
-void SvIdlDataBase::WriteError( const rtl::OString& rErrWrn,
- const rtl::OString& rFileName,
- const rtl::OString& rErrorText,
+void SvIdlDataBase::WriteError( const OString& rErrWrn,
+ const OString& rFileName,
+ const OString& rErrorText,
sal_uLong nRow, sal_uLong nColumn ) const
{
// error treatment
@@ -555,7 +555,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
{
// error treatment
String aFileName( rInStm.GetFileName() );
- rtl::OStringBuffer aErrorText;
+ OStringBuffer aErrorText;
sal_uLong nRow = 0, nColumn = 0;
rInStm.SeekEnd();
@@ -595,7 +595,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
aError = SvIdlError();
}
- WriteError("error", rtl::OUStringToOString(aFileName,
+ WriteError("error", OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8), aErrorText.makeStringAndClear(), nRow, nColumn);
DBG_ASSERT( pTok, "token must be found" );
@@ -610,7 +610,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
}
if( pTok && pTok->IsIdentifier() )
{
- rtl::OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
+ OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
if( !aN.isEmpty() )
fprintf( stderr, "%s versus %s\n", pTok->GetString().getStr(), aN.getStr() );
}
@@ -636,7 +636,7 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
{
OUString aFullName;
if( osl::FileBase::E_None == osl::File::searchFileURL(
- rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US),
+ OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US),
rPath,
aFullName) )
{
@@ -648,8 +648,8 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
{
if( aStm.GetError() == SVSTREAM_WRONGVERSION )
{
- rtl::OStringBuffer aStr("wrong version, file ");
- aStr.append(rtl::OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("wrong version, file ");
+ aStr.append(OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
SetError(aStr.makeStringAndClear(), pTok);
WriteError( rInStm );
bOk = sal_False;
@@ -716,7 +716,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
SvStringHashEntry* pEntry = aList[ i ];
rOutStm << "#define " << pEntry->GetName().getStr()
<< '\t'
- << rtl::OString::valueOf(static_cast<sal_Int64>(
+ << OString::valueOf(static_cast<sal_Int64>(
pEntry->GetValue())).getStr()
<< endl;
}
@@ -834,12 +834,12 @@ void SvIdlDataBase::AddDepFile(String const& rFileName)
}
#ifdef WNT
-static ::rtl::OString
-lcl_ConvertToCygwin(::rtl::OString const& rString)
+static OString
+lcl_ConvertToCygwin(OString const& rString)
{
sal_Int32 i = 0;
sal_Int32 const len = rString.getLength();
- ::rtl::OStringBuffer buf(len + 16);
+ OStringBuffer buf(len + 16);
if ((2 <= len) && (':' == rString[1]))
{
buf.append("/cygdrive/");
@@ -866,21 +866,21 @@ lcl_ConvertToCygwin(::rtl::OString const& rString)
}
#endif
-static ::rtl::OString
-lcl_Convert(::rtl::OUString const& rString)
+static OString
+lcl_Convert(OUString const& rString)
{
return
#ifdef WNT
lcl_ConvertToCygwin
#endif
- (::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
+ (OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
}
struct WriteDep
{
SvFileStream & m_rStream;
explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { }
- void operator() (::rtl::OUString const& rItem)
+ void operator() (OUString const& rItem)
{
m_rStream << " \\\n ";
m_rStream << lcl_Convert(rItem).getStr();
@@ -888,7 +888,7 @@ struct WriteDep
};
bool SvIdlDataBase::WriteDepFile(
- SvFileStream & rStream, ::rtl::OUString const& rTarget)
+ SvFileStream & rStream, OUString const& rTarget)
{
rStream << lcl_Convert(rTarget).getStr();
rStream << " :";
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 1b2bb45b2328..ad8c9432324e 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -67,7 +67,7 @@ IdlDll::~IdlDll()
delete pHashTable;
}
-inline SvStringHashEntry * INS( const rtl::OString& rName )
+inline SvStringHashEntry * INS( const OString& rName )
{
sal_uInt32 nIdx;
IDLAPP->pHashTable->Insert( rName, &nIdx );
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index ea2c227e23b9..33e190e07401 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -96,8 +96,8 @@ inline OUString tempFileHelper(OUString const & fname)
}
else
{
- rtl::OStringBuffer aStr("invalid filename: ");
- aStr.append(rtl::OUStringToOString(fname, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("invalid filename: ");
+ aStr.append(OUStringToOString(fname, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
return aTmpFile;
@@ -147,8 +147,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteDocumentation( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write documentation file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aDocuFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write documentation file: ");
+ aStr.append(OUStringToOString(aCommand.aDocuFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -159,8 +159,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteSvIdl( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write list file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aListFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write list file: ");
+ aStr.append(OUStringToOString(aCommand.aListFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -171,8 +171,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteSfx( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write slotmap file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aSlotMapFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write slotmap file: ");
+ aStr.append(OUStringToOString(aCommand.aSlotMapFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -183,8 +183,8 @@ int cdecl main ( int argc, char ** argv)
if (!pDataBase->WriteHelpIds( aStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write help ID file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aHelpIdFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write help ID file: ");
+ aStr.append(OUStringToOString(aCommand.aHelpIdFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -195,8 +195,8 @@ int cdecl main ( int argc, char ** argv)
if (!pDataBase->WriteCSV( aStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write CSV file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aCSVFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write CSV file: ");
+ aStr.append(OUStringToOString(aCommand.aCSVFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -207,8 +207,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteSfxItem( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write item file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aSfxItemFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write item file: ");
+ aStr.append(OUStringToOString(aCommand.aSfxItemFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -220,8 +220,8 @@ int cdecl main ( int argc, char ** argv)
if( aOutStm.GetError() != SVSTREAM_OK )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write database file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aDataBaseFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write database file: ");
+ aStr.append(OUStringToOString(aCommand.aDataBaseFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -234,7 +234,7 @@ int cdecl main ( int argc, char ** argv)
{
nExit = -1;
fprintf( stderr, "cannot write dependency file: %s\n",
- ::rtl::OUStringToOString( aCommand.m_DepFile,
+ OUStringToOString( aCommand.m_DepFile,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
@@ -315,11 +315,11 @@ int cdecl main ( int argc, char ** argv)
if( bErr )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot move file from: ");
- aStr.append(rtl::OUStringToOString(aErrFile2,
+ OStringBuffer aStr("cannot move file from: ");
+ aStr.append(OUStringToOString(aErrFile2,
RTL_TEXTENCODING_UTF8));
aStr.append("\n to file: ");
- aStr.append(rtl::OUStringToOString(aErrFile,
+ aStr.append(OUStringToOString(aErrFile,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "%s\n", aStr.getStr() );
}
diff --git a/idlc/inc/idlc/astarray.hxx b/idlc/inc/idlc/astarray.hxx
index e4e2bc5038b3..e75e0100b25a 100644
--- a/idlc/inc/idlc/astarray.hxx
+++ b/idlc/inc/idlc/astarray.hxx
@@ -25,7 +25,7 @@
class AstArray : public AstType
{
public:
- AstArray(const ::rtl::OString& name, AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
+ AstArray(const OString& name, AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
AstArray(AstType* pType, const ExprList& rDimExpr, AstScope* pScope);
virtual ~AstArray() {}
@@ -43,7 +43,7 @@ public:
{ return m_dimension; }
private:
- ::rtl::OString makeName();
+ OString makeName();
AstType* m_pType;
sal_uInt32 m_dimension;
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 4bf0e8f3b53c..7f88e49ffa03 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -30,13 +30,13 @@ namespace typereg { class Writer; }
class AstAttribute: public AstDeclaration, public AstScope {
public:
AstAttribute(
- sal_uInt32 flags, AstType const * type, rtl::OString const & name,
+ sal_uInt32 flags, AstType const * type, OString const & name,
AstScope * scope):
AstDeclaration(NT_attribute, name, scope),
AstScope(NT_attribute), m_flags(flags), m_pType(type)
{}
- AstAttribute(NodeType nodeType, sal_uInt32 flags, AstType const * pType, const ::rtl::OString& name, AstScope* pScope)
+ AstAttribute(NodeType nodeType, sal_uInt32 flags, AstType const * pType, const OString& name, AstScope* pScope)
: AstDeclaration(nodeType, name, pScope), AstScope(nodeType)
, m_flags(flags)
, m_pType(pType)
@@ -44,8 +44,8 @@ public:
virtual ~AstAttribute() {}
void setExceptions(
- rtl::OUString const * getDoc, DeclList const * getExc,
- rtl::OUString const * setDoc, DeclList const * setExc)
+ OUString const * getDoc, DeclList const * getExc,
+ OUString const * setDoc, DeclList const * setExc)
{
if (getDoc != 0) {
m_getDocumentation = *getDoc;
@@ -97,15 +97,15 @@ public:
private:
void dumpExceptions(
- typereg::Writer & writer, rtl::OUString const & documentation,
+ typereg::Writer & writer, OUString const & documentation,
DeclList const & exceptions, RTMethodMode flags,
sal_uInt16 * methodIndex);
const sal_uInt32 m_flags;
AstType const * m_pType;
- rtl::OUString m_getDocumentation;
+ OUString m_getDocumentation;
DeclList m_getExceptions;
- rtl::OUString m_setDocumentation;
+ OUString m_setDocumentation;
DeclList m_setExceptions;
};
diff --git a/idlc/inc/idlc/astbasetype.hxx b/idlc/inc/idlc/astbasetype.hxx
index 8b2afec94e7c..a788a16189b8 100644
--- a/idlc/inc/idlc/astbasetype.hxx
+++ b/idlc/inc/idlc/astbasetype.hxx
@@ -26,7 +26,7 @@
class AstBaseType : public AstType
{
public:
- AstBaseType(const ExprType type, const ::rtl::OString& name, AstScope* pScope)
+ AstBaseType(const ExprType type, const OString& name, AstScope* pScope)
: AstType(NT_predefined, name, pScope)
, m_exprType(type)
{}
diff --git a/idlc/inc/idlc/astconstant.hxx b/idlc/inc/idlc/astconstant.hxx
index c5c184db6a83..e012ecd9db98 100644
--- a/idlc/inc/idlc/astconstant.hxx
+++ b/idlc/inc/idlc/astconstant.hxx
@@ -28,9 +28,9 @@ class AstConstant : public AstDeclaration
{
public:
AstConstant(const ExprType type, const NodeType nodeType,
- AstExpression* pExpr, const ::rtl::OString& name, AstScope* pScope);
+ AstExpression* pExpr, const OString& name, AstScope* pScope);
AstConstant(const ExprType type, AstExpression* pExpr,
- const ::rtl::OString& name, AstScope* pScope);
+ const OString& name, AstScope* pScope);
virtual ~AstConstant();
AstExpression* getConstValue()
diff --git a/idlc/inc/idlc/astconstants.hxx b/idlc/inc/idlc/astconstants.hxx
index 2f7ccf6e9129..e0f536da9d9c 100644
--- a/idlc/inc/idlc/astconstants.hxx
+++ b/idlc/inc/idlc/astconstants.hxx
@@ -24,7 +24,7 @@
class AstConstants : public AstModule
{
public:
- AstConstants(const ::rtl::OString& name, AstScope* pScope)
+ AstConstants(const OString& name, AstScope* pScope)
: AstModule(NT_constants, name, pScope)
{}
virtual ~AstConstants() {}
diff --git a/idlc/inc/idlc/astdeclaration.hxx b/idlc/inc/idlc/astdeclaration.hxx
index 25dd67f46076..6226a832de06 100644
--- a/idlc/inc/idlc/astdeclaration.hxx
+++ b/idlc/inc/idlc/astdeclaration.hxx
@@ -64,16 +64,16 @@ class AstDeclaration
{
public:
// Constructors
- AstDeclaration(NodeType type, const ::rtl::OString& name, AstScope* pScope);
+ AstDeclaration(NodeType type, const OString& name, AstScope* pScope);
virtual ~AstDeclaration();
// Data access
- void setName(const ::rtl::OString& name);
- const ::rtl::OString& getLocalName() const
+ void setName(const OString& name);
+ const OString& getLocalName() const
{ return m_localName; }
- const ::rtl::OString& getScopedName() const
+ const OString& getScopedName() const
{ return m_scopedName; }
- const ::rtl::OString& getFullName()
+ const OString& getFullName()
{ return m_fullName; }
virtual const sal_Char* getRelativName() const
{ return m_fullName.getStr()+1; }
@@ -95,13 +95,13 @@ public:
{ return m_lineNumber; }
void setLineNumber(sal_Int32 lineNumber)
{ m_lineNumber = lineNumber; }
- const ::rtl::OString& getFileName() const
+ const OString& getFileName() const
{ return m_fileName; }
- void setFileName(const ::rtl::OString& rFileName)
+ void setFileName(const OString& rFileName)
{ m_fileName = rFileName; }
- const ::rtl::OUString& getDocumentation() const
+ const OUString& getDocumentation() const
{ return m_documentation; }
- void setDocumentation(const ::rtl::OUString& rDocumentation)
+ void setDocumentation(const OUString& rDocumentation)
{ m_documentation = rDocumentation; }
sal_Bool isAdded()
{ return m_bIsAdded; }
@@ -121,9 +121,9 @@ public:
void setPredefined(bool bPredefined);
protected:
- ::rtl::OString m_localName;
- ::rtl::OString m_scopedName; // full qualified name
- ::rtl::OString m_fullName; // full qualified name with '/' as seperator
+ OString m_localName;
+ OString m_scopedName; // full qualified name
+ OString m_fullName; // full qualified name with '/' as seperator
AstScope* m_pScope;
NodeType m_nodeType;
sal_Bool m_bImported; // imported ?
@@ -132,8 +132,8 @@ protected:
bool m_bPublished;
bool m_bPredefined;
sal_Int32 m_lineNumber; // line number defined in
- ::rtl::OString m_fileName; // fileName defined in
- ::rtl::OUString m_documentation; // fileName defined in
+ OString m_fileName; // fileName defined in
+ OUString m_documentation; // fileName defined in
};
#endif // _IDLC_ASTDECLARATION_HXX_
diff --git a/idlc/inc/idlc/astenum.hxx b/idlc/inc/idlc/astenum.hxx
index 38bee411f313..c332ba2a6cf3 100644
--- a/idlc/inc/idlc/astenum.hxx
+++ b/idlc/inc/idlc/astenum.hxx
@@ -27,7 +27,7 @@ class AstEnum : public AstType
, public AstScope
{
public:
- AstEnum(const ::rtl::OString& name, AstScope* pScope);
+ AstEnum(const OString& name, AstScope* pScope);
virtual ~AstEnum();
diff --git a/idlc/inc/idlc/astexception.hxx b/idlc/inc/idlc/astexception.hxx
index eb5349bf8846..d51dca1a13d3 100644
--- a/idlc/inc/idlc/astexception.hxx
+++ b/idlc/inc/idlc/astexception.hxx
@@ -24,7 +24,7 @@
class AstException : public AstStruct
{
public:
- AstException(const ::rtl::OString& name, AstException* pBaseType, AstScope* pScope)
+ AstException(const OString& name, AstException* pBaseType, AstScope* pScope)
: AstStruct(NT_exception, name, pBaseType, pScope)
{}
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 80b4ea02786d..6caaf01d325f 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -102,7 +102,7 @@ public:
AstExpression(sal_Int64 h);
AstExpression(sal_uInt64 uh);
AstExpression(double d);
- AstExpression(::rtl::OString* scopedName);
+ AstExpression(OString* scopedName);
virtual ~AstExpression();
@@ -115,9 +115,9 @@ public:
{ return m_lineNo; }
void setLine(sal_Int32 l)
{ m_lineNo = l; }
- const ::rtl::OString& getFileName()
+ const OString& getFileName()
{ return m_fileName; }
- void setFileName(const ::rtl::OString& fileName)
+ void setFileName(const OString& fileName)
{ m_fileName = fileName; }
ExprComb getCombOperator()
{ return m_combOperator; }
@@ -135,9 +135,9 @@ public:
{ return m_subExpr2; }
void setExpr2(AstExpression *pExpr)
{ m_subExpr2 = pExpr; }
- ::rtl::OString* getSymbolicName()
+ OString* getSymbolicName()
{ return m_pSymbolicName; }
- void setSymbolicName(::rtl::OString* pSymbolicName)
+ void setSymbolicName(OString* pSymbolicName)
{ m_pSymbolicName = pSymbolicName; }
// Evaluation and value coercion
@@ -150,7 +150,7 @@ public:
sal_Bool operator==(AstExpression *pExpr);
sal_Bool compare(AstExpression *pExpr);
- ::rtl::OString toString();
+ OString toString();
void dump() {}
private:
// Fill out the lineno, filename and definition scope details
@@ -165,13 +165,13 @@ private:
AstScope* m_pScope; // scope defined in
sal_Int32 m_lineNo; // line number defined in
- ::rtl::OString m_fileName; // fileName defined in
+ OString m_fileName; // fileName defined in
ExprComb m_combOperator;
AstExpression* m_subExpr1;
AstExpression* m_subExpr2;
AstExprValue* m_exprValue;
- ::rtl::OString* m_pSymbolicName;
+ OString* m_pSymbolicName;
};
#endif // _IDLC_ASTEXPRESSION_HXX_
diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx
index 1d4d231182e5..d4a05a0898a1 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/idlc/astinterface.hxx
@@ -47,7 +47,7 @@ public:
};
AstInterface(
- const ::rtl::OString& name, AstInterface const * pInherits,
+ const OString& name, AstInterface const * pInherits,
AstScope* pScope);
virtual ~AstInterface();
@@ -77,7 +77,7 @@ public:
void addInheritedInterface(
AstType const * ifc, bool optional,
- rtl::OUString const & documentation);
+ OUString const & documentation);
DoubleMemberDeclarations checkMemberClashes(
AstDeclaration const * member) const;
@@ -97,18 +97,18 @@ private:
explicit VisibleMember(AstDeclaration const * theMandatory = 0):
mandatory(theMandatory) {}
- typedef std::map< rtl::OString, AstDeclaration const * > Optionals;
+ typedef std::map< OString, AstDeclaration const * > Optionals;
AstDeclaration const * mandatory;
Optionals optionals;
};
- typedef std::map< rtl::OString, InterfaceKind > VisibleInterfaces;
- typedef std::map< rtl::OString, VisibleMember > VisibleMembers;
+ typedef std::map< OString, InterfaceKind > VisibleInterfaces;
+ typedef std::map< OString, VisibleMember > VisibleMembers;
void checkInheritedInterfaceClashes(
DoubleDeclarations & doubleDeclarations,
- std::set< rtl::OString > & seenInterfaces, AstInterface const * ifc,
+ std::set< OString > & seenInterfaces, AstInterface const * ifc,
bool optional, bool direct, bool mainOptional) const;
void checkMemberClashes(
diff --git a/idlc/inc/idlc/astinterfacemember.hxx b/idlc/inc/idlc/astinterfacemember.hxx
index 1cd89d2132cf..544bb18e3936 100644
--- a/idlc/inc/idlc/astinterfacemember.hxx
+++ b/idlc/inc/idlc/astinterfacemember.hxx
@@ -25,7 +25,7 @@ class AstInterfaceMember : public AstDeclaration
{
public:
AstInterfaceMember(const sal_uInt32 flags, AstInterface* pRealInterface,
- const ::rtl::OString& name, AstScope* pScope)
+ const OString& name, AstScope* pScope)
: AstDeclaration(NT_interface_member, name, pScope)
, m_flags(flags)
, m_pRealInterface(pRealInterface)
diff --git a/idlc/inc/idlc/astmember.hxx b/idlc/inc/idlc/astmember.hxx
index fd98b299aa02..3fec89005fc8 100644
--- a/idlc/inc/idlc/astmember.hxx
+++ b/idlc/inc/idlc/astmember.hxx
@@ -29,7 +29,7 @@ class AstType;
class AstMember: public AstDeclaration {
public:
AstMember(
- AstType const * pType, rtl::OString const & name, AstScope * pScope):
+ AstType const * pType, OString const & name, AstScope * pScope):
AstDeclaration(NT_member, name, pScope), m_pType(pType) {}
virtual ~AstMember() {}
@@ -38,7 +38,7 @@ public:
protected:
AstMember(
- NodeType type, AstType const * pType, rtl::OString const & name,
+ NodeType type, AstType const * pType, OString const & name,
AstScope * pScope):
AstDeclaration(type, name, pScope), m_pType(pType) {}
diff --git a/idlc/inc/idlc/astmodule.hxx b/idlc/inc/idlc/astmodule.hxx
index 249af84de270..93e12b1c4ba9 100644
--- a/idlc/inc/idlc/astmodule.hxx
+++ b/idlc/inc/idlc/astmodule.hxx
@@ -26,11 +26,11 @@ class AstModule : public AstDeclaration
, public AstScope
{
public:
- AstModule(const ::rtl::OString& name, AstScope* pScope)
+ AstModule(const OString& name, AstScope* pScope)
: AstDeclaration(NT_module, name, pScope)
, AstScope(NT_module)
{}
- AstModule(NodeType type, const ::rtl::OString& name, AstScope* pScope)
+ AstModule(NodeType type, const OString& name, AstScope* pScope)
: AstDeclaration(type, name, pScope)
, AstScope(type)
{}
diff --git a/idlc/inc/idlc/astneeds.hxx b/idlc/inc/idlc/astneeds.hxx
index 53c8bc2b488b..38e95bd217cb 100644
--- a/idlc/inc/idlc/astneeds.hxx
+++ b/idlc/inc/idlc/astneeds.hxx
@@ -24,7 +24,7 @@
class AstNeeds : public AstDeclaration
{
public:
- AstNeeds(AstService* pRealService, const ::rtl::OString& name, AstScope* pScope)
+ AstNeeds(AstService* pRealService, const OString& name, AstScope* pScope)
: AstDeclaration(NT_needs, name, pScope)
, m_pRealService(pRealService)
{}
diff --git a/idlc/inc/idlc/astobserves.hxx b/idlc/inc/idlc/astobserves.hxx
index 06ec9884a64e..d939073a76de 100644
--- a/idlc/inc/idlc/astobserves.hxx
+++ b/idlc/inc/idlc/astobserves.hxx
@@ -24,7 +24,7 @@
class AstObserves : public AstDeclaration
{
public:
- AstObserves(AstInterface* pRealInterface, const ::rtl::OString& name, AstScope* pScope)
+ AstObserves(AstInterface* pRealInterface, const OString& name, AstScope* pScope)
: AstDeclaration(NT_observes, name, pScope)
, m_pRealInterface(pRealInterface)
{}
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 90ea5c9c918a..4b6b8e7d14d5 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.hxx
@@ -30,7 +30,7 @@ class AstOperation : public AstDeclaration
, public AstScope
{
public:
- AstOperation(AstType* pReturnType, const ::rtl::OString& name, AstScope* pScope)
+ AstOperation(AstType* pReturnType, const OString& name, AstScope* pScope)
: AstDeclaration(NT_operation, name, pScope)
, AstScope(NT_operation)
, m_pReturnType(pReturnType)
diff --git a/idlc/inc/idlc/astparameter.hxx b/idlc/inc/idlc/astparameter.hxx
index fa80864efbe3..7bf8ce05b0c0 100644
--- a/idlc/inc/idlc/astparameter.hxx
+++ b/idlc/inc/idlc/astparameter.hxx
@@ -28,7 +28,7 @@ class AstParameter: public AstMember {
public:
AstParameter(
Direction direction, bool rest, AstType const * type,
- rtl::OString const & name, AstScope * scope):
+ OString const & name, AstScope * scope):
AstMember(NT_parameter, type, name, scope), m_direction(direction),
m_rest(rest) {}
diff --git a/idlc/inc/idlc/astscope.hxx b/idlc/inc/idlc/astscope.hxx
index ec66c7a44a21..c3efcadba5a8 100644
--- a/idlc/inc/idlc/astscope.hxx
+++ b/idlc/inc/idlc/astscope.hxx
@@ -45,12 +45,12 @@ public:
sal_uInt16 getNodeCount(NodeType nType);
// Name look up mechanism
- AstDeclaration* lookupByName(const ::rtl::OString& scopedName);
+ AstDeclaration* lookupByName(const OString& scopedName);
// Look up the identifier 'name' specified only in the local scope
- AstDeclaration* lookupByNameLocal(const ::rtl::OString& name) const;
+ AstDeclaration* lookupByNameLocal(const OString& name) const;
- AstDeclaration* lookupInForwarded(const ::rtl::OString& scopedName);
- AstDeclaration* lookupInInherited(const ::rtl::OString& scopedName) const;
+ AstDeclaration* lookupInForwarded(const OString& scopedName);
+ AstDeclaration* lookupInInherited(const OString& scopedName) const;
// Look up a predefined type by its ExprType
AstDeclaration* lookupPrimitiveType(ExprType type);
diff --git a/idlc/inc/idlc/astsequence.hxx b/idlc/inc/idlc/astsequence.hxx
index 62c80bd276d3..622df5aaf4c6 100644
--- a/idlc/inc/idlc/astsequence.hxx
+++ b/idlc/inc/idlc/astsequence.hxx
@@ -25,7 +25,7 @@ class AstSequence : public AstType
{
public:
AstSequence(AstType* pMemberType, AstScope* pScope)
- : AstType(NT_sequence, ::rtl::OString("[]")+pMemberType->getScopedName(), pScope)
+ : AstType(NT_sequence, OString("[]")+pMemberType->getScopedName(), pScope)
, m_pMemberType(pMemberType)
, m_pRelativName(NULL)
{}
@@ -44,7 +44,7 @@ public:
virtual const sal_Char* getRelativName() const;
private:
AstType* m_pMemberType;
- mutable ::rtl::OString* m_pRelativName;
+ mutable OString* m_pRelativName;
};
#endif // _IDLC_ASTSEQUENCE_HXX_
diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx
index d3e0b643b5d9..2cca3ca2b2d4 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/idlc/astservice.hxx
@@ -26,13 +26,13 @@ class AstService : public AstDeclaration
, public AstScope
{
public:
- AstService(const ::rtl::OString& name, AstScope* pScope)
+ AstService(const OString& name, AstScope* pScope)
: AstDeclaration(NT_service, name, pScope)
, AstScope(NT_service)
, m_singleInterfaceBasedService(false)
, m_defaultConstructor(false)
{}
- AstService(const NodeType type, const ::rtl::OString& name, AstScope* pScope)
+ AstService(const NodeType type, const OString& name, AstScope* pScope)
: AstDeclaration(type, name, pScope)
, AstScope(type)
, m_singleInterfaceBasedService(false)
diff --git a/idlc/inc/idlc/astservicemember.hxx b/idlc/inc/idlc/astservicemember.hxx
index 533aa680ae46..8bed1770040f 100644
--- a/idlc/inc/idlc/astservicemember.hxx
+++ b/idlc/inc/idlc/astservicemember.hxx
@@ -25,7 +25,7 @@ class AstServiceMember : public AstDeclaration
{
public:
AstServiceMember(const sal_uInt32 flags, AstService* pRealService,
- const ::rtl::OString& name, AstScope* pScope)
+ const OString& name, AstScope* pScope)
: AstDeclaration(NT_service_member, name, pScope)
, m_flags(flags)
, m_pRealService(pRealService)
diff --git a/idlc/inc/idlc/aststruct.hxx b/idlc/inc/idlc/aststruct.hxx
index e3c26c577fd7..837bbafddd6d 100644
--- a/idlc/inc/idlc/aststruct.hxx
+++ b/idlc/inc/idlc/aststruct.hxx
@@ -31,12 +31,12 @@ class AstStruct : public AstType
{
public:
AstStruct(
- const ::rtl::OString& name,
- std::vector< rtl::OString > const & typeParameters,
+ const OString& name,
+ std::vector< OString > const & typeParameters,
AstStruct* pBaseType, AstScope* pScope);
AstStruct(const NodeType type,
- const ::rtl::OString& name,
+ const OString& name,
AstStruct* pBaseType,
AstScope* pScope);
virtual ~AstStruct();
@@ -47,7 +47,7 @@ public:
DeclList::size_type getTypeParameterCount() const
{ return m_typeParameters.size(); }
- AstDeclaration const * findTypeParameter(rtl::OString const & name) const;
+ AstDeclaration const * findTypeParameter(OString const & name) const;
virtual bool isType() const;
diff --git a/idlc/inc/idlc/asttype.hxx b/idlc/inc/idlc/asttype.hxx
index 782a9ad3c628..cea157a8d7f9 100644
--- a/idlc/inc/idlc/asttype.hxx
+++ b/idlc/inc/idlc/asttype.hxx
@@ -24,7 +24,7 @@
class AstType : public AstDeclaration
{
public:
- AstType(const NodeType type, const ::rtl::OString& name, AstScope* pScope)
+ AstType(const NodeType type, const OString& name, AstScope* pScope)
: AstDeclaration(type, name, pScope)
{}
diff --git a/idlc/inc/idlc/asttypedef.hxx b/idlc/inc/idlc/asttypedef.hxx
index 99ba094a459f..2e1f4cd0c257 100644
--- a/idlc/inc/idlc/asttypedef.hxx
+++ b/idlc/inc/idlc/asttypedef.hxx
@@ -25,7 +25,7 @@ class AstTypeDef : public AstType
{
public:
AstTypeDef(
- AstType const * baseType, rtl::OString const & name, AstScope * scope):
+ AstType const * baseType, OString const & name, AstScope * scope):
AstType(NT_typedef, name, scope), m_pBaseType(baseType) {}
virtual ~AstTypeDef() {}
diff --git a/idlc/inc/idlc/astunion.hxx b/idlc/inc/idlc/astunion.hxx
index e0859f97a1c6..d1b9b477c7b7 100644
--- a/idlc/inc/idlc/astunion.hxx
+++ b/idlc/inc/idlc/astunion.hxx
@@ -25,7 +25,7 @@
class AstUnion : public AstStruct
{
public:
- AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pScope);
+ AstUnion(const OString& name, AstType* pDiscType, AstScope* pScope);
virtual ~AstUnion();
AstType* getDiscrimantType()
diff --git a/idlc/inc/idlc/astunionbranch.hxx b/idlc/inc/idlc/astunionbranch.hxx
index aaca29a3bba6..9c114da45152 100644
--- a/idlc/inc/idlc/astunionbranch.hxx
+++ b/idlc/inc/idlc/astunionbranch.hxx
@@ -25,7 +25,7 @@
class AstUnionBranch : public AstMember
{
public:
- AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const ::rtl::OString& name, AstScope* pScope);
+ AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const OString& name, AstScope* pScope);
virtual ~AstUnionBranch();
AstUnionLabel* getLabel()
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 0853bb1545f9..8a7b1e4b07e2 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -112,21 +112,21 @@ public:
void coercionError(AstExpression *pExpr, ExprType et);
// Report a failed name lookup attempt
- void lookupError(const ::rtl::OString& n);
+ void lookupError(const OString& n);
// Report a failed name lookup attempt
- void lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope);
+ void lookupError(ErrorCode e, const OString& n, AstDeclaration* pScope);
// Report a type error
void noTypeError(AstDeclaration const * pDecl);
- void inheritanceError(NodeType nodeType, const ::rtl::OString* name, AstDeclaration* pDecl);
+ void inheritanceError(NodeType nodeType, const OString* name, AstDeclaration* pDecl);
void flagError(ErrorCode e, sal_uInt32 flag);
- void forwardLookupError(AstDeclaration* pForward, const ::rtl::OString& name);
+ void forwardLookupError(AstDeclaration* pForward, const OString& name);
- void constantExpected(AstDeclaration* pDecl, const ::rtl::OString& name);
+ void constantExpected(AstDeclaration* pDecl, const OString& name);
void evalError(AstExpression* pExpr);
@@ -137,7 +137,7 @@ public:
void enumValExpected(AstUnion* pUnion);
// Report a failed enumerator lookup in an enum
- void enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name);
+ void enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const OString& name);
bool checkPublished(AstDeclaration const * decl, bool bOptiional=false);
};
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 9e01f54152c2..f93341a4bd62 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.hxx
@@ -34,12 +34,12 @@ public:
FD_complex // Complex declarator (complex_part field used)
};
- FeDeclarator(const ::rtl::OString& name, DeclaratorType declType, AstDeclaration* pComplPart);
+ FeDeclarator(const OString& name, DeclaratorType declType, AstDeclaration* pComplPart);
virtual ~FeDeclarator();
AstDeclaration* getComplexPart()
{ return m_pComplexPart; }
- const ::rtl::OString& getName()
+ const OString& getName()
{ return m_name; }
DeclaratorType getDeclType()
{ return m_declType; }
@@ -48,7 +48,7 @@ public:
AstType const * compose(AstDeclaration const * pDecl);
private:
AstDeclaration* m_pComplexPart;
- ::rtl::OString m_name;
+ OString m_name;
DeclaratorType m_declType;
};
@@ -58,8 +58,8 @@ class FeInheritanceHeader
{
public:
FeInheritanceHeader(
- NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
- std::vector< rtl::OString > * typeParameters);
+ NodeType nodeType, OString* pName, OString* pInherits,
+ std::vector< OString > * typeParameters);
virtual ~FeInheritanceHeader()
{
@@ -69,21 +69,21 @@ public:
NodeType getNodeType()
{ return m_nodeType; }
- ::rtl::OString* getName()
+ OString* getName()
{ return m_pName; }
AstDeclaration* getInherits()
{ return m_pInherits; }
- std::vector< rtl::OString > const & getTypeParameters() const
+ std::vector< OString > const & getTypeParameters() const
{ return m_typeParameters; }
private:
- void initializeInherits(::rtl::OString* pinherits);
+ void initializeInherits(OString* pinherits);
NodeType m_nodeType;
- ::rtl::OString* m_pName;
+ OString* m_pName;
AstDeclaration* m_pInherits;
- std::vector< rtl::OString > m_typeParameters;
+ std::vector< OString > m_typeParameters;
};
#endif // _IDLC_FEHELPER_HXX_
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx
index 30f54362b4bf..452cd913294e 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc/idlc.hxx
@@ -45,8 +45,8 @@ public:
void init();
- bool dumpDeps(::rtl::OString const& rDepFile,
- ::rtl::OString const& rTarget);
+ bool dumpDeps(OString const& rDepFile,
+ OString const& rTarget);
Options* getOptions()
{ return m_pOptions; }
@@ -56,24 +56,24 @@ public:
{ return m_pRoot; }
ErrorHandler* error()
{ return m_pErrorHandler; }
- const ::rtl::OString& getFileName()
+ const OString& getFileName()
{ return m_fileName; }
- void setFileName(const ::rtl::OString& fileName)
+ void setFileName(const OString& fileName)
{ m_fileName = fileName; addInclude(fileName); }
- const ::rtl::OString& getMainFileName()
+ const OString& getMainFileName()
{ return m_mainFileName; }
- void setMainFileName(const ::rtl::OString& mainFileName)
+ void setMainFileName(const OString& mainFileName)
{ m_mainFileName = mainFileName; }
- const ::rtl::OString& getRealFileName()
+ const OString& getRealFileName()
{ return m_realFileName; }
- void setRealFileName(const ::rtl::OString& realFileName)
+ void setRealFileName(const OString& realFileName)
{ m_realFileName = realFileName; }
- const ::rtl::OString& getDocumentation()
+ const OString& getDocumentation()
{
m_bIsDocValid = sal_False;
return m_documentation;
}
- void setDocumentation(const ::rtl::OString& documentation)
+ void setDocumentation(const OString& documentation)
{
m_documentation = documentation;
m_bIsDocValid = sal_True;
@@ -112,7 +112,7 @@ public:
void setParseState(ParseState parseState)
{ m_parseState = parseState; }
- void addInclude(const ::rtl::OString& inc)
+ void addInclude(const OString& inc)
{ m_includes.insert(inc); }
StringSet* getIncludes()
{ return &m_includes; }
@@ -126,10 +126,10 @@ private:
AstStack* m_pScopes;
AstModule* m_pRoot;
ErrorHandler* m_pErrorHandler;
- ::rtl::OString m_fileName;
- ::rtl::OString m_mainFileName;
- ::rtl::OString m_realFileName;
- ::rtl::OString m_documentation;
+ OString m_fileName;
+ OString m_mainFileName;
+ OString m_realFileName;
+ OString m_documentation;
sal_Bool m_bIsDocValid;
sal_Bool m_bGenerateDoc;
sal_Bool m_bIsInMainfile;
@@ -144,21 +144,21 @@ private:
};
-typedef ::std::pair< ::rtl::OString, ::rtl::OString > sPair_t;
-sal_Int32 compileFile(const ::rtl::OString * pathname);
+typedef ::std::pair< OString, OString > sPair_t;
+sal_Int32 compileFile(const OString * pathname);
// a null pathname means stdin
-sal_Int32 produceFile(const ::rtl::OString& filenameBase,
+sal_Int32 produceFile(const OString& filenameBase,
sPair_t const*const pDepFile);
// filenameBase is filename without ".idl"
-void removeIfExists(const ::rtl::OString& pathname);
+void removeIfExists(const OString& pathname);
-::rtl::OString makeTempName(const ::rtl::OString& prefix, const ::rtl::OString& postfix);
-sal_Bool copyFile(const ::rtl::OString* source, const ::rtl::OString& target);
+OString makeTempName(const OString& prefix, const OString& postfix);
+sal_Bool copyFile(const OString* source, const OString& target);
// a null source means stdin
-sal_Bool isFileUrl(const ::rtl::OString& fileName);
-::rtl::OString convertToAbsoluteSystemPath(const ::rtl::OString& fileName);
-::rtl::OString convertToFileUrl(const ::rtl::OString& fileName);
+sal_Bool isFileUrl(const OString& fileName);
+OString convertToAbsoluteSystemPath(const OString& fileName);
+OString convertToFileUrl(const OString& fileName);
Idlc* SAL_CALL idlc();
Idlc* SAL_CALL setIdlc(Options* pOptions);
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 5f657f3a3926..32214d6b77d3 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.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
{
- sal_Int32 operator()(const ::rtl::OString& str) const
+ sal_Int32 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;
class AstExpression;
typedef ::std::list< AstExpression* > ExprList;
@@ -66,7 +66,7 @@ typedef ::std::list< AstUnionLabel* > LabelList;
class AstDeclaration;
-typedef ::boost::unordered_map< ::rtl::OString, AstDeclaration*, HashString, EqualString > DeclMap;
+typedef ::boost::unordered_map< OString, AstDeclaration*, HashString, EqualString > DeclMap;
typedef ::std::list< AstDeclaration* > DeclList;
class AstScope;
diff --git a/idlc/inc/idlc/inheritedinterface.hxx b/idlc/inc/idlc/inheritedinterface.hxx
index 21cadf734671..41134e57caef 100644
--- a/idlc/inc/idlc/inheritedinterface.hxx
+++ b/idlc/inc/idlc/inheritedinterface.hxx
@@ -31,7 +31,7 @@ class InheritedInterface {
public:
InheritedInterface(
AstType const * theInterface, bool theOptional,
- rtl::OUString const & theDocumentation):
+ OUString const & theDocumentation):
interface(theInterface), optional(theOptional),
documentation(theDocumentation) {}
@@ -42,12 +42,12 @@ public:
bool isOptional() const { return optional; }
- rtl::OUString getDocumentation() const { return documentation; }
+ OUString getDocumentation() const { return documentation; }
private:
AstType const * interface;
bool optional;
- rtl::OUString documentation;
+ OUString documentation;
};
#endif
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 474b2be2dcc7..5e9ca97110f1 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -22,18 +22,18 @@
#include <idlc/idlctypes.hxx>
-typedef ::boost::unordered_map< ::rtl::OString,
- ::rtl::OString,
+typedef ::boost::unordered_map< OString,
+ OString,
HashString,
EqualString > OptionMap;
class IllegalArgument
{
public:
- IllegalArgument(const ::rtl::OString& msg)
+ IllegalArgument(const OString& msg)
: m_message(msg) {}
- ::rtl::OString m_message;
+ OString m_message;
};
@@ -57,12 +57,12 @@ public:
throw( IllegalArgument );
#endif /* @@@ */
- ::rtl::OString prepareHelp();
- ::rtl::OString prepareVersion();
+ OString prepareHelp();
+ OString prepareVersion();
- const ::rtl::OString& getProgramName() const;
- bool isValid(const ::rtl::OString& option);
- const ::rtl::OString& getOption(const ::rtl::OString& option)
+ const OString& getProgramName() const;
+ bool isValid(const OString& option);
+ const OString& getOption(const OString& option)
throw( IllegalArgument );
const StringVector& getInputFiles() const { return m_inputFiles; }
@@ -71,7 +71,7 @@ public:
bool quiet() const { return m_quiet; }
protected:
- ::rtl::OString m_program;
+ OString m_program;
StringVector m_inputFiles;
bool m_stdin;
bool m_verbose;
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index 727a757bf90c..dae0e2d414c3 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -27,7 +27,7 @@ using namespace ::rtl;
AstConstant::AstConstant(const ExprType type,
const NodeType nodeType,
AstExpression* pExpr,
- const ::rtl::OString& name,
+ const OString& name,
AstScope* pScope)
: AstDeclaration(nodeType, name, pScope)
, m_pConstValue(pExpr)
@@ -37,7 +37,7 @@ AstConstant::AstConstant(const ExprType type,
AstConstant::AstConstant(const ExprType type,
AstExpression* pExpr,
- const ::rtl::OString& name,
+ const OString& name,
AstScope* pScope)
: AstDeclaration(NT_const, name, pScope)
, m_pConstValue(pExpr)
diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx
index ef0996323153..c5733f9ccb4c 100644
--- a/idlc/source/astdeclaration.cxx
+++ b/idlc/source/astdeclaration.cxx
@@ -97,7 +97,7 @@ void AstDeclaration::setPredefined(bool bPredefined)
}
}
-void AstDeclaration::setName(const ::rtl::OString& name)
+void AstDeclaration::setName(const OString& name)
{
m_scopedName = name;
sal_Int32 nIndex = name.lastIndexOf( ':' );
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 684555ce75b3..fd5e2db43c01 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -219,13 +219,13 @@ sal_Bool AstService::dump(RegistryKey& rKey)
}
RegistryKey localKey;
if (rKey.createKey(
- rtl::OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8),
+ OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8),
localKey)) {
fprintf(
stderr, "%s: warning, could not create key '%s' in '%s'\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(),
- rtl::OUStringToOString(
+ OUStringToOString(
rKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
return false;
}
@@ -233,12 +233,12 @@ sal_Bool AstService::dump(RegistryKey& rKey)
version, getDocumentation(), emptyStr,
getNodeType() == NT_singleton ? RT_TYPE_SINGLETON : RT_TYPE_SERVICE,
m_bPublished,
- rtl::OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8),
+ OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8),
superName.isEmpty() ? 0 : 1, properties, constructors,
references);
if (!superName.isEmpty()) {
writer.setSuperTypeName(
- 0, rtl::OStringToOUString(superName, RTL_TEXTENCODING_UTF8));
+ 0, OStringToOUString(superName, RTL_TEXTENCODING_UTF8));
}
sal_uInt16 constructorIndex = 0;
sal_uInt16 propertyIndex = 0;
@@ -260,7 +260,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
writer.setReferenceData(
referenceIndex++, decl->getDocumentation(), RT_REF_SUPPORTS,
(decl->isOptional() ? RT_ACCESS_OPTIONAL : RT_ACCESS_INVALID),
- rtl::OStringToOUString( decl->getRealInterface()->getRelativName(),
+ OStringToOUString( decl->getRealInterface()->getRelativName(),
RTL_TEXTENCODING_UTF8));
break;
}
@@ -271,7 +271,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
AstServiceMember * decl = (AstServiceMember *)(*i);
writer.setReferenceData(referenceIndex++, decl->getDocumentation(), RT_REF_EXPORTS,
(decl->isOptional() ? RT_ACCESS_OPTIONAL : RT_ACCESS_INVALID),
- rtl::OStringToOUString(decl->getRealService()->getRelativName(),
+ OStringToOUString(decl->getRealService()->getRelativName(),
RTL_TEXTENCODING_UTF8));
}
break;
@@ -281,7 +281,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
AstObserves * decl = (AstObserves *)(*i);
writer.setReferenceData(referenceIndex++, decl->getDocumentation(), RT_REF_OBSERVES,
RT_ACCESS_INVALID,
- rtl::OStringToOUString( decl->getRealInterface()->getRelativName(),
+ OStringToOUString( decl->getRealInterface()->getRelativName(),
RTL_TEXTENCODING_UTF8));
break;
}
@@ -291,7 +291,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
AstNeeds * decl = (AstNeeds *)(*i);
writer.setReferenceData( referenceIndex++, decl->getDocumentation(), RT_REF_NEEDS,
RT_ACCESS_INVALID,
- rtl::OStringToOUString( decl->getRealService()->getRelativName(),
+ OStringToOUString( decl->getRealService()->getRelativName(),
RTL_TEXTENCODING_UTF8));
break;
}
@@ -304,7 +304,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
if (m_defaultConstructor) {
writer.setMethodData(
constructorIndex++, emptyStr, RT_MODE_TWOWAY,
- emptyStr, rtl::OUString("void"),
+ emptyStr, OUString("void"),
0, 0);
}
sal_uInt32 size;
@@ -317,7 +317,7 @@ sal_Bool AstService::dump(RegistryKey& rKey)
stderr, "%s: warning, could not set value of key \"%s\" in %s\n",
idlc()->getOptions()->getProgramName().getStr(),
getFullName().getStr(),
- rtl::OUStringToOString(
+ OUStringToOString(
localKey.getRegistryName(), RTL_TEXTENCODING_UTF8).getStr());
return false;
}
@@ -385,7 +385,7 @@ sal_Bool AstAttribute::dumpBlob(
}
void AstAttribute::dumpExceptions(
- typereg::Writer & writer, rtl::OUString const & documentation,
+ typereg::Writer & writer, OUString const & documentation,
DeclList const & exceptions, RTMethodMode flags, sal_uInt16 * methodIndex)
{
if (!exceptions.empty()) {
@@ -396,7 +396,7 @@ void AstAttribute::dumpExceptions(
writer.setMethodData(
idx, documentation, flags,
OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8),
- rtl::OUString("void"), 0,
+ OUString("void"), 0,
static_cast< sal_uInt16 >(exceptions.size()));
sal_uInt16 exceptionIndex = 0;
for (DeclList::const_iterator i(exceptions.begin());
@@ -404,7 +404,7 @@ void AstAttribute::dumpExceptions(
{
writer.setMethodExceptionTypeName(
idx, exceptionIndex++,
- rtl::OStringToOUString(
+ OStringToOUString(
(*i)->getRelativName(), RTL_TEXTENCODING_UTF8));
}
}
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx
index 2e6cbcb4e722..2edfb7cb9c49 100644
--- a/idlc/source/astenum.cxx
+++ b/idlc/source/astenum.cxx
@@ -24,7 +24,7 @@
using namespace ::rtl;
-AstEnum::AstEnum(const ::rtl::OString& name, AstScope* pScope)
+AstEnum::AstEnum(const OString& name, AstScope* pScope)
: AstType(NT_enum, name, pScope)
, AstScope(NT_enum)
, m_enumValueCount(0)
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index df13e960b772..f35d4d019f71 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -110,7 +110,7 @@ AstExpression::AstExpression(double d)
m_exprValue->u.dval = d;
}
-AstExpression::AstExpression(::rtl::OString* scopedName)
+AstExpression::AstExpression(OString* scopedName)
: m_combOperator(EC_symbol)
, m_subExpr1(NULL)
, m_subExpr2(NULL)
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 3b8336485855..7d9f0dc1d515 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -27,7 +27,7 @@
using namespace ::rtl;
-AstInterface::AstInterface(const ::rtl::OString& name,
+AstInterface::AstInterface(const OString& name,
AstInterface const * pInherits,
AstScope* pScope)
: AstType(NT_interface, name, pScope)
@@ -39,7 +39,7 @@ AstInterface::AstInterface(const ::rtl::OString& name,
, m_bSingleInheritance(pInherits != 0)
{
if (pInherits != 0) {
- addInheritedInterface(pInherits, false, rtl::OUString());
+ addInheritedInterface(pInherits, false, OUString());
}
}
@@ -51,14 +51,14 @@ AstInterface::DoubleDeclarations AstInterface::checkInheritedInterfaceClashes(
AstInterface const * ifc, bool optional) const
{
DoubleDeclarations doubleDecls;
- std::set< rtl::OString > seen;
+ std::set< OString > seen;
checkInheritedInterfaceClashes(
doubleDecls, seen, ifc, true, optional, optional);
return doubleDecls;
}
void AstInterface::addInheritedInterface(
- AstType const * ifc, bool optional, rtl::OUString const & documentation)
+ AstType const * ifc, bool optional, OUString const & documentation)
{
m_inheritedInterfaces.push_back(
InheritedInterface(ifc, optional, documentation));
@@ -258,7 +258,7 @@ sal_Bool AstInterface::dump(RegistryKey& rKey)
void AstInterface::checkInheritedInterfaceClashes(
DoubleDeclarations & doubleDeclarations,
- std::set< rtl::OString > & seenInterfaces, AstInterface const * ifc,
+ std::set< OString > & seenInterfaces, AstInterface const * ifc,
bool direct, bool optional, bool mainOptional) const
{
if (direct || optional
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index b4aa3f74354e..f90966575a92 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -46,11 +46,11 @@ sal_Bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
sal_uInt16 nExcep = nExceptions();
RTMethodMode methodMode = RT_MODE_TWOWAY;
- rtl::OUString returnTypeName;
+ OUString returnTypeName;
if (m_pReturnType == 0) {
- returnTypeName = rtl::OUString("void");
+ returnTypeName = OUString("void");
} else {
- returnTypeName = rtl::OStringToOUString(
+ returnTypeName = OStringToOUString(
m_pReturnType->getRelativName(), RTL_TEXTENCODING_UTF8);
}
rBlob.setMethodData(
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 99440873aa32..7f645564208b 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -26,13 +26,13 @@
using namespace ::rtl;
AstStruct::AstStruct(
- const OString& name, std::vector< rtl::OString > const & typeParameters,
+ const OString& name, std::vector< OString > const & typeParameters,
AstStruct* pBaseType, AstScope* pScope)
: AstType(NT_struct, name, pScope)
, AstScope(NT_struct)
, m_pBaseType(pBaseType)
{
- for (std::vector< rtl::OString >::const_iterator i(typeParameters.begin());
+ for (std::vector< OString >::const_iterator i(typeParameters.begin());
i != typeParameters.end(); ++i)
{
m_typeParameters.push_back(
@@ -59,7 +59,7 @@ AstStruct::~AstStruct()
}
}
-AstDeclaration const * AstStruct::findTypeParameter(rtl::OString const & name)
+AstDeclaration const * AstStruct::findTypeParameter(OString const & name)
const
{
for (DeclList::const_iterator i(m_typeParameters.begin());
@@ -133,7 +133,7 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
{
pMember = (AstMember*)pDecl;
RTFieldAccess flags = RT_ACCESS_READWRITE;
- rtl::OString typeName;
+ OString typeName;
if (pMember->getType()->getNodeType() == NT_type_parameter) {
flags |= RT_ACCESS_PARAMETERIZED_TYPE;
typeName = pMember->getType()->getLocalName();
diff --git a/idlc/source/aststructinstance.cxx b/idlc/source/aststructinstance.cxx
index 5a2981e018cf..20b6ac3360f6 100644
--- a/idlc/source/aststructinstance.cxx
+++ b/idlc/source/aststructinstance.cxx
@@ -28,10 +28,10 @@
namespace {
-rtl::OString createName(
+OString createName(
AstType const * typeTemplate, DeclList const * typeArguments)
{
- rtl::OStringBuffer buf(typeTemplate->getScopedName());
+ OStringBuffer buf(typeTemplate->getScopedName());
if (typeArguments != 0) {
buf.append('<');
for (DeclList::const_iterator i(typeArguments->begin());
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index 8a03ae5d9d4a..45e2f3128345 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -26,7 +26,7 @@
using namespace ::rtl;
-AstUnion::AstUnion(const ::rtl::OString& name, AstType* pDiscType, AstScope* pScope)
+AstUnion::AstUnion(const OString& name, AstType* pDiscType, AstScope* pScope)
: AstStruct(NT_union, name, NULL, pScope)
, m_pDiscriminantType(pDiscType)
, m_discExprType(ET_long)
@@ -354,7 +354,7 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
return sal_True;
}
-AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const ::rtl::OString& name, AstScope* pScope)
+AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, const OString& name, AstScope* pScope)
: AstMember(NT_union_branch, pType, name, pScope)
, m_pLabel(pLabel)
{
diff --git a/idlc/source/attributeexceptions.hxx b/idlc/source/attributeexceptions.hxx
index 09a7c8b4d9cd..7c47f74ad685 100644
--- a/idlc/source/attributeexceptions.hxx
+++ b/idlc/source/attributeexceptions.hxx
@@ -24,7 +24,7 @@
struct AttributeExceptions {
struct Part {
- rtl::OUString const * documentation;
+ OUString const * documentation;
DeclList const * exceptions;
};
Part get;
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index c0abf9e62fbc..390d76e8e57d 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -567,14 +567,14 @@ void ErrorHandler::coercionError(AstExpression *pExpr, ExprType et)
idlc()->incErrorCount();
}
-void ErrorHandler::lookupError(const ::rtl::OString& n)
+void ErrorHandler::lookupError(const OString& n)
{
errorHeader(EIDL_LOOKUP_ERROR);
fprintf(stderr, "'%s'\n", n.getStr());
idlc()->incErrorCount();
}
-void ErrorHandler::lookupError(ErrorCode e, const ::rtl::OString& n, AstDeclaration* pScope)
+void ErrorHandler::lookupError(ErrorCode e, const OString& n, AstDeclaration* pScope)
{
errorHeader(e);
fprintf(stderr, "'%s' in '%s'\n", n.getStr(), pScope->getFullName().getStr());
@@ -635,7 +635,7 @@ void ErrorHandler::inheritanceError(NodeType nodeType, const OString* name, AstD
}
void ErrorHandler::forwardLookupError(AstDeclaration* pForward,
- const ::rtl::OString& name)
+ const OString& name)
{
errorHeader(EIDL_FWD_DECL_LOOKUP);
fprintf(stderr, "trying to look up '%s' in undefined forward declared interface '%s'\n",
@@ -644,7 +644,7 @@ void ErrorHandler::forwardLookupError(AstDeclaration* pForward,
}
void ErrorHandler::constantExpected(AstDeclaration* pDecl,
- const ::rtl::OString& name)
+ const OString& name)
{
errorHeader(EIDL_CONSTANT_EXPECTED);
fprintf(stderr, "'%s' is bound to '%s'\n", name.getStr(), pDecl->getScopedName().getStr());
@@ -665,7 +665,7 @@ void ErrorHandler::enumValExpected(AstUnion* pUnion)
idlc()->incErrorCount();
}
-void ErrorHandler::enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const ::rtl::OString& name)
+void ErrorHandler::enumValLookupFailure(AstUnion* pUnion, AstEnum* pEnum, const OString& name)
{
errorHeader(EIDL_ENUM_VAL_NOT_FOUND);
fprintf(stderr, " union %s, enum %s, enumerator %s\n",
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index a3ab3fd0d1fe..fdfd8388d657 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -89,8 +89,8 @@ AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
}
FeInheritanceHeader::FeInheritanceHeader(
- NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
- std::vector< rtl::OString > * typeParameters)
+ NodeType nodeType, OString* pName, OString* pInherits,
+ std::vector< OString > * typeParameters)
: m_nodeType(nodeType)
, m_pName(pName)
, m_pInherits(NULL)
@@ -101,7 +101,7 @@ FeInheritanceHeader::FeInheritanceHeader(
initializeInherits(pInherits);
}
-void FeInheritanceHeader::initializeInherits(::rtl::OString* pInherits)
+void FeInheritanceHeader::initializeInherits(OString* pInherits)
{
if ( pInherits )
{
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index 4002b1395afd..7e880261a8ae 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -289,7 +289,7 @@ OUString Idlc::processDocumentation()
}
static void lcl_writeString(::osl::File & rFile, ::osl::FileBase::RC & o_rRC,
- ::rtl::OString const& rString)
+ OString const& rString)
{
sal_uInt64 nWritten(0);
if (::osl::FileBase::E_None == o_rRC) {
@@ -306,7 +306,7 @@ struct WriteDep
::osl::FileBase::RC & m_rRC;
explicit WriteDep(::osl::File & rFile, ::osl::FileBase::RC & rRC)
: m_rFile(rFile), m_rRC(rRC) { }
- void operator() (::rtl::OString const& rEntry)
+ void operator() (OString const& rEntry)
{
lcl_writeString(m_rFile, m_rRC, " \\\n ");
lcl_writeString(m_rFile, m_rRC, rEntry);
@@ -321,7 +321,7 @@ struct WriteDummy
::osl::FileBase::RC & m_rRC;
explicit WriteDummy(::osl::File & rFile, ::osl::FileBase::RC & rRC)
: m_rFile(rFile), m_rRC(rRC) { }
- void operator() (::rtl::OString const& rEntry)
+ void operator() (OString const& rEntry)
{
lcl_writeString(m_rFile, m_rRC, rEntry);
lcl_writeString(m_rFile, m_rRC, ":\n\n");
@@ -329,10 +329,10 @@ struct WriteDummy
};
bool
-Idlc::dumpDeps(::rtl::OString const& rDepFile, ::rtl::OString const& rTarget)
+Idlc::dumpDeps(OString const& rDepFile, OString const& rTarget)
{
::osl::File depFile(
- ::rtl::OStringToOUString(rDepFile, osl_getThreadTextEncoding()));
+ OStringToOUString(rDepFile, osl_getThreadTextEncoding()));
::osl::FileBase::RC rc =
depFile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
if (::osl::FileBase::E_None != rc) {
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 2c8beb5e4c00..894e5d8f1150 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -240,7 +240,7 @@ sal_Int32 compileFile(const OString * pathname)
idlc()->setMainFileName(fileName);
idlc()->setRealFileName(tmpFile);
- ::std::vector< ::rtl::OUString> lCppArgs;
+ ::std::vector< OUString> lCppArgs;
lCppArgs.push_back("-DIDL");
lCppArgs.push_back("-C");
lCppArgs.push_back("-zI");
@@ -259,7 +259,7 @@ sal_Int32 compileFile(const OString * pathname)
{
cppArgs.append("-I");
cppArgs.append(filePath);
- lCppArgs.push_back(rtl::OStringToOUString(
+ lCppArgs.push_back(OStringToOUString(
cppArgs.makeStringAndClear().replace('\\', '/'),
RTL_TEXTENCODING_UTF8));
}
@@ -273,7 +273,7 @@ sal_Int32 compileFile(const OString * pathname)
{
token = dOpt.getToken( 0, ' ', nIndex );
if (token.getLength())
- lCppArgs.push_back(rtl::OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8));
+ lCppArgs.push_back(OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8));
} while( nIndex != -1 );
}
@@ -285,7 +285,7 @@ sal_Int32 compileFile(const OString * pathname)
{
token = incOpt.getToken( 0, ' ', nIndex );
if (token.getLength())
- lCppArgs.push_back(rtl::OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8));
+ lCppArgs.push_back(OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8));
} while( nIndex != -1 );
}
@@ -322,8 +322,8 @@ sal_Int32 compileFile(const OString * pathname)
rtl_uString** pCmdArgs = 0;
pCmdArgs = (rtl_uString**)rtl_allocateZeroMemory(nCmdArgs * sizeof(rtl_uString*));
- ::std::vector< ::rtl::OUString >::iterator iter = lCppArgs.begin();
- ::std::vector< ::rtl::OUString >::iterator end = lCppArgs.end();
+ ::std::vector< OUString >::iterator iter = lCppArgs.begin();
+ ::std::vector< OUString >::iterator end = lCppArgs.end();
int i = 0;
while ( iter != end ) {
pCmdArgs[i++] = (*iter).pData;
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index 838a8fbf1039..37017b9bcfd8 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -123,7 +123,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
OString const outputFileUrl = convertToFileUrl(outputFile);
- ::rtl::OString depFileUrl;
+ OString depFileUrl;
if (options.isValid("-M")) {
depFileUrl = convertToFileUrl(options.getOption("-M"));
if ('/' != depFileUrl.getStr()[depFileUrl.getLength()-1]) {
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 6051e54fbe46..375e1454f850 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -27,8 +27,6 @@
#include <stdio.h>
#include <string.h>
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
Options::Options(char const * progname)
: m_program(progname), m_stdin(false), m_verbose(false), m_quiet(false)
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index 323cc8011eca..c47b332d9a71 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -41,13 +41,11 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OString;
-using ::rtl::OUString;
namespace javaunohelper
{
-inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
+inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
{
OSL_ASSERT( sizeof (sal_Unicode) == sizeof (jchar) );
jsize len = jni_env->GetStringLength( jstr );
@@ -58,7 +56,7 @@ inline ::rtl::OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
ustr->refCount = 1;
ustr->length = len;
ustr->buffer[ len ] = '\0';
- return ::rtl::OUString( ustr, SAL_NO_ACQUIRE );
+ return OUString( ustr, SAL_NO_ACQUIRE );
}
}
@@ -154,7 +152,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra
jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" );
if (0 != c)
{
- OString cstr( ::rtl::OUStringToOString(
+ OString cstr( OUStringToOString(
exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
OSL_TRACE( __FILE__": forwarding RuntimeException: %s", cstr.getStr() );
jni_env->ThrowNew( c, cstr.getStr() );
@@ -165,7 +163,7 @@ extern "C" SAL_JNI_EXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstra
jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" );
if (0 != c)
{
- OString cstr( ::rtl::OUStringToOString(
+ OString cstr( OUStringToOString(
exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
jni_env->ThrowNew( c, cstr.getStr() );
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index 02af62e67b3a..68bf90794597 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -40,8 +40,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OString;
-using ::rtl::OUString;
/*
* Class: com_sun_star_comp_helper_SharedLibraryLoader
@@ -64,7 +62,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
(void) jRegKey;
(void) loader;
- fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
+ fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
#else
oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
if (lib)
@@ -148,7 +146,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
(void) jRegKey;
(void) loader;
- fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, ::rtl::OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
+ fprintf(stderr, "Hmm, %s called for %s\n", __PRETTY_FUNCTION__, OUStringToOString(pJLibName, RTL_TEXTENCODING_JAVA_UTF8).getStr());
#endif
OUString aLibName( pJLibName );
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index aa34d33c7df9..85eb09266dfe 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -31,7 +31,6 @@
#define SAL_DLLPREFIX ""
#endif
-using ::rtl::OUString;
extern "C"
{
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index ba89bd921311..6b518f38bc1f 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -74,10 +74,10 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
css::uno::Any arg(
css::uno::makeAny(
css::beans::NamedValue(
- rtl::OUString( "UnoVirtualMachine" ),
+ OUString( "UnoVirtualMachine" ),
css::uno::makeAny( handle ) ) ) );
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- ::rtl::OUString(
+ OUString(
"com.sun.star.java.JavaVirtualMachine"),
css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext );
}
@@ -87,7 +87,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
throw (css::uno::Exception)
{
return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- ::rtl::OUString(
+ OUString(
"com.sun.star.java.JavaVirtualMachine"),
args, xContext );
}
@@ -108,7 +108,7 @@ namespace javaunohelper {
loader );
} catch ( ::jvmaccess::UnoVirtualMachine::CreationException & ) {
throw css::uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
RTL_CONSTASCII_USTRINGPARAM(
"jmvaccess::UnoVirtualMachine::CreationException"
" occurred" ) ),
@@ -122,7 +122,7 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton(
{
css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) );
::cppu::ContextEntry_Init entry(
- ::rtl::OUString(
+ OUString(
"/singletons/com.sun.star.java.theJavaVirtualMachine"),
css::uno::makeAny( xFac ), true );
return ::cppu::createComponentContext( &entry, 1, xContext );
diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx
index 507af76d3759..ab1a6c53f322 100644
--- a/jvmaccess/inc/jvmaccess/classpath.hxx
+++ b/jvmaccess/inc/jvmaccess/classpath.hxx
@@ -67,7 +67,7 @@ public:
translateToUrls(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- ::JNIEnv * environment, ::rtl::OUString const & classPath)
+ ::JNIEnv * environment, OUString const & classPath)
{
return
static_cast< ::jobjectArray >(
@@ -103,8 +103,8 @@ public:
static inline ::jclass loadClass(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- ::JNIEnv * environment, ::rtl::OUString const & classPath,
- ::rtl::OUString const & name)
+ ::JNIEnv * environment, OUString const & classPath,
+ OUString const & name)
{
return
static_cast< ::jclass >(
@@ -124,13 +124,13 @@ private:
static void * doTranslateToUrls(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath);
+ void * environment, OUString const & classPath);
static void * doLoadClass(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath,
- ::rtl::OUString const & name);
+ void * environment, OUString const & classPath,
+ OUString const & name);
};
}
diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 4891cc27876a..d693f2a10a99 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -40,7 +40,7 @@
void * ::jvmaccess::ClassPath::doTranslateToUrls(
css::uno::Reference< css::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath)
+ void * environment, OUString const & classPath)
{
OSL_ASSERT(context.is() && environment != 0);
::JNIEnv * const env = static_cast< ::JNIEnv * >(environment);
@@ -55,7 +55,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
}
::std::vector< jobject > urls;
for (::sal_Int32 i = 0; i != -1;) {
- ::rtl::OUString url(classPath.getToken(0, ' ', i));
+ OUString url(classPath.getToken(0, ' ', i));
if (!url.isEmpty()) {
css::uno::Reference< css::uri::XVndSunStarExpandUrlReference >
expUrl(
@@ -68,7 +68,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
url = expUrl->expand( expander );
} catch (const css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
- (::rtl::OUString(
+ (OUString(
"com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
css::uno::Reference< css::uno::XInterface >());
@@ -91,7 +91,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
jobjectArray result = env->NewObjectArray(
static_cast< jsize >(urls.size()), classUrl, 0);
// static_cast is ok, as each element of urls occupied at least one
- // character of the ::rtl::OUString classPath
+ // character of the OUString classPath
if (result == 0) {
return 0;
}
@@ -105,8 +105,8 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
void * ::jvmaccess::ClassPath::doLoadClass(
css::uno::Reference< css::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath,
- ::rtl::OUString const & name)
+ void * environment, OUString const & classPath,
+ OUString const & name)
{
OSL_ASSERT(context.is() && environment != 0);
::JNIEnv * const env = static_cast< ::JNIEnv * >(environment);
diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx
index 26d86dc2cf47..34ccf25cc26f 100644
--- a/jvmaccess/workbench/javainfo/javainfotest.cxx
+++ b/jvmaccess/workbench/javainfo/javainfotest.cxx
@@ -31,9 +31,6 @@ using namespace osl;
using jvmaccess::JavaInfo;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
#define JAVA_VERSION "1.4.1_01"
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index dbc10ac125b9..9c9bb06780e3 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -277,7 +277,7 @@ JVMFWK_DLLPUBLIC void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
in the second <code>JavaInfo</code> object. The equality of the
<code>rtl_uString</code> members is determined
by the respective comparison function (see
- <code>rtl::OUString::equals</code>).
+ <code>OUString::equals</code>).
Similiarly the equality of the <code>sal_Sequence</code> is
also determined by a comparison
function (see <code>rtl::ByteSequence::operator ==</code>). </p>
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index c94b8b41f498..718844dc6b25 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -28,12 +28,9 @@
#include "rtl/byteseq.hxx"
#include "jvmfwk/framework.h"
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
static sal_Bool hasOption(char const * szOption, int argc, char** argv);
-static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
+static OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
static bool findAndSelect(JavaInfo**);
#define HELP_TEXT \
@@ -98,7 +95,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
}
- rtl::OUString aVendor( pInfo->sVendor );
+ OUString aVendor( pInfo->sVendor );
// Only do something if the sunjavaplugin created this JavaInfo
if ( aVendor != "Sun Microsystems Inc." &&
aVendor != "Oracle Corporation" &&
@@ -114,24 +111,24 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
return 0;
}
- rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
+ OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
fprintf(stdout, "%s\n", sPaths.getStr());
jfw_freeJavaInfo(pInfo);
return 0;
}
-rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData)
+OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData)
{
const sal_Unicode* chars = (sal_Unicode*) vendorData.getConstArray();
sal_Int32 len = vendorData.getLength();
- rtl::OUString sData(chars, len / 2);
+ OUString sData(chars, len / 2);
//the runtime lib is on the first line
sal_Int32 index = 0;
- rtl::OUString aToken = sData.getToken( 1, '\n', index);
+ OUString aToken = sData.getToken( 1, '\n', index);
- rtl::OString paths =
- rtl::OUStringToOString(aToken, osl_getThreadTextEncoding());
+ OString paths =
+ OUStringToOString(aToken, osl_getThreadTextEncoding());
return paths;
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index f58a66d3b4ea..25667848c54f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -25,7 +25,6 @@
using namespace std;
using namespace osl;
-using ::rtl::OUString;
using ::rtl::Reference;
namespace jfw_plugin
@@ -162,7 +161,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
return false;
if (m_sJavaHome.isEmpty())
- m_sJavaHome = rtl::OUString("file:///usr/lib");
+ m_sJavaHome = OUString("file:///usr/lib");
// init m_sRuntimeLibrary
OSL_ASSERT(!m_sHome.isEmpty());
@@ -227,9 +226,9 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
#ifdef X86_64
//Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead
- if (!bRt && m_sJavaHome != rtl::OUString("file:///usr/lib"))
+ if (!bRt && m_sJavaHome != OUString("file:///usr/lib"))
{
- m_sHome = rtl::OUString("file:///usr/lib64");
+ m_sHome = OUString("file:///usr/lib64");
for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
{
//Construct an absolute path to the possible runtime
@@ -283,7 +282,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
return true;
}
-int GnuInfo::compareVersions(const rtl::OUString&) const
+int GnuInfo::compareVersions(const OUString&) const
{
return 0;
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 950021ed7f96..0b1aa6bf2a03 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -29,7 +29,7 @@ namespace jfw_plugin
class GnuInfo: public VendorBase
{
private:
- rtl::OUString m_sJavaHome;
+ OUString m_sJavaHome;
public:
static char const* const* getJavaExePaths(int * size);
@@ -38,8 +38,8 @@ public:
virtual char const* const* getRuntimePaths(int * size);
virtual bool initialize(
- std::vector<std::pair<rtl::OUString, rtl::OUString> > props);
- virtual int compareVersions(const rtl::OUString& sSecond) const;
+ std::vector<std::pair<OUString, OUString> > props);
+ virtual int compareVersions(const OUString& sSecond) const;
};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index f3ee1e3c520a..07f9c0c05523 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -23,7 +23,6 @@
using namespace std;
-using ::rtl::OUString;
using ::rtl::Reference;
namespace jfw_plugin
{
@@ -101,7 +100,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
#endif
}
-int OtherInfo::compareVersions(const rtl::OUString& /*sSecond*/) const
+int OtherInfo::compareVersions(const OUString& /*sSecond*/) const
{
//Need to provide an own algorithm for comparing version.
//Because this function returns always 0, which means the version of
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 88ae1d935288..c2f33ee2dce7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -37,7 +37,7 @@ public:
using VendorBase::getLibraryPaths;
virtual char const* const* getRuntimePaths(int * size);
virtual char const* const* getLibraryPaths(int* size);
- virtual int compareVersions(const rtl::OUString& sSecond) const;
+ virtual int compareVersions(const OUString& sSecond) const;
};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 27b704d079df..e5c888a697c6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -71,9 +71,6 @@ using namespace osl;
using namespace std;
using namespace jfw_plugin;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
namespace {
@@ -132,7 +129,7 @@ OString getPluginJarPath(
}
OSL_ASSERT(!sPath.isEmpty());
}
- ret = rtl::OUStringToOString(sPath, osl_getThreadTextEncoding());
+ ret = OUStringToOString(sPath, osl_getThreadTextEncoding());
return ret;
}
@@ -144,18 +141,18 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
JavaInfo* pInfo = (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo));
if (pInfo == NULL)
return NULL;
- rtl::OUString sVendor = info->getVendor();
+ OUString sVendor = info->getVendor();
pInfo->sVendor = sVendor.pData;
rtl_uString_acquire(sVendor.pData);
- rtl::OUString sHome = info->getHome();
+ OUString sHome = info->getHome();
pInfo->sLocation = sHome.pData;
rtl_uString_acquire(pInfo->sLocation);
- rtl::OUString sVersion = info->getVersion();
+ OUString sVersion = info->getVersion();
pInfo->sVersion = sVersion.pData;
rtl_uString_acquire(pInfo->sVersion);
pInfo->nFeatures = info->supportsAccessibility() ? 1 : 0;
pInfo->nRequirements = info->needsRestart() ? JFW_REQUIRE_NEEDRESTART : 0;
- rtl::OUStringBuffer buf(1024);
+ OUStringBuffer buf(1024);
buf.append(info->getRuntimeLibrary());
if (!info->getLibraryPaths().isEmpty())
{
@@ -164,7 +161,7 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
buf.appendAscii("\n");
}
- rtl::OUString sVendorData = buf.makeStringAndClear();
+ OUString sVendorData = buf.makeStringAndClear();
rtl::ByteSequence byteSeq( (sal_Int8*) sVendorData.pData->buffer,
sVendorData.getLength() * sizeof(sal_Unicode));
pInfo->arVendorData = byteSeq.get();
@@ -173,14 +170,14 @@ JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
return pInfo;
}
-rtl::OUString getRuntimeLib(const rtl::ByteSequence & data)
+OUString getRuntimeLib(const rtl::ByteSequence & data)
{
const sal_Unicode* chars = (sal_Unicode*) data.getConstArray();
sal_Int32 len = data.getLength();
- rtl::OUString sData(chars, len / 2);
+ OUString sData(chars, len / 2);
//the runtime lib is on the first line
sal_Int32 index = 0;
- rtl::OUString aToken = sData.getToken( 0, '\n', index);
+ OUString aToken = sData.getToken( 0, '\n', index);
return aToken;
}
@@ -287,7 +284,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
bool bExclude = false;
for (int j = 0; j < nLenList; j++)
{
- rtl::OUString sExVer(arExcludeList[j]);
+ OUString sExVer(arExcludeList[j]);
try
{
if (cur->compareVersions(sExVer) == 0)
@@ -414,7 +411,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
for (int i = 0; i < nLenList; i++)
{
- rtl::OUString sExVer(arExcludeList[i]);
+ OUString sExVer(arExcludeList[i]);
int nRes = 0;
try
{
@@ -569,7 +566,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
//Check if the Vendor (pInfo->sVendor) is supported by this plugin
if ( ! isVendorSupported(pInfo->sVendor))
return JFW_PLUGIN_E_WRONG_VENDOR;
- rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
+ OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
JFW_TRACE2("[Java framework] Using Java runtime library: "
+ sRuntimeLib + ".\n");
@@ -599,26 +596,26 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
#ifdef UNX
//Setting the JAVA_HOME is needed for awt
- rtl::OUString javaHome("JAVA_HOME=");
- rtl::OUString sPathLocation;
+ OUString javaHome("JAVA_HOME=");
+ OUString sPathLocation;
osl_getSystemPathFromFileURL(pInfo->sLocation, & sPathLocation.pData);
javaHome += sPathLocation;
- rtl::OString osJavaHome = rtl::OUStringToOString(
+ OString osJavaHome = OUStringToOString(
javaHome, osl_getThreadTextEncoding());
putenv(strdup(osJavaHome.getStr()));
#endif
typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
- rtl::OUString sSymbolCreateJava("JNI_CreateJavaVM");
+ OUString sSymbolCreateJava("JNI_CreateJavaVM");
JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getFunctionSymbol(
moduleRt, sSymbolCreateJava.pData);
if (!pCreateJavaVM)
{
OSL_ASSERT(0);
- rtl::OString sLib = rtl::OUStringToOString(
+ OString sLib = OUStringToOString(
sRuntimeLib, osl_getThreadTextEncoding());
- rtl::OString sSymbol = rtl::OUStringToOString(
+ OString sSymbol = OUStringToOString(
sSymbolCreateJava, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
"Java runtime library: %s does not export symbol %s !\n",
@@ -647,20 +644,20 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
options[n].optionString= (char *) "abort";
options[n].extraInfo= (void* )(sal_IntPtr)abort_handler;
++n;
- rtl::OString sClassPathProp("-Djava.class.path=");
- rtl::OString sClassPathOption;
+ OString sClassPathProp("-Djava.class.path=");
+ OString sClassPathOption;
for (int i = 0; i < cOptions; i++)
{
#ifdef UNX
// Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2)
// in the class path in order to have applet support.
- rtl::OString sClassPath = arOptions[i].optionString;
+ OString sClassPath = arOptions[i].optionString;
if (sClassPath.match(sClassPathProp, 0) == sal_True)
{
char sep[] = {SAL_PATHSEPARATOR, 0};
OString sAddPath = getPluginJarPath(pInfo->sVendor, pInfo->sLocation,pInfo->sVersion);
if (!sAddPath.isEmpty())
- sClassPathOption = sClassPath + rtl::OString(sep) + sAddPath;
+ sClassPathOption = sClassPath + OString(sep) + sAddPath;
else
sClassPathOption = sClassPath;
options[n].optionString = (char *) sClassPathOption.getStr();
@@ -756,7 +753,7 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
javaPluginError ret = JFW_PLUGIN_E_NONE;
if (!pInfo || !exist)
return JFW_PLUGIN_E_INVALID_ARG;
- ::rtl::OUString sLocation(pInfo->sLocation);
+ OUString sLocation(pInfo->sLocation);
if (sLocation.isEmpty())
return JFW_PLUGIN_E_INVALID_ARG;
@@ -780,7 +777,7 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
//true although the runtime library may not be loadable.
if (ret == JFW_PLUGIN_E_NONE && *exist == sal_True)
{
- rtl::OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
+ OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
JFW_TRACE2("[Java framework] Checking existence of Java runtime library.\n");
::osl::DirectoryItem itemRt;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index d45555d7c92b..fb77e2a6703d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -86,9 +86,9 @@ char const* const* SunInfo::getLibraryPaths(int* size)
#endif
}
-int SunInfo::compareVersions(const rtl::OUString& sSecond) const
+int SunInfo::compareVersions(const OUString& sSecond) const
{
- rtl::OUString sFirst = getVersion();
+ OUString sFirst = getVersion();
SunVersion version1(sFirst);
JFW_ENSURE(version1, "[Java framework] sunjavaplugin" SAL_DLLEXTENSION
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 21ce38946972..9fd310e23542 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -37,7 +37,7 @@ public:
virtual char const* const* getRuntimePaths(int * size);
virtual char const* const* getLibraryPaths(int* size);
- virtual int compareVersions(const rtl::OUString& sSecond) const;
+ virtual int compareVersions(const OUString& sSecond) const;
};
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 4eaff7ba6fff..aced75f63bec 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -27,9 +27,6 @@
#include "diagnostics.h"
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
namespace jfw_plugin { //stoc_javadetect
@@ -41,12 +38,12 @@ public:
} test;
#endif
-SunVersion::SunVersion(const rtl::OUString &usVer):
+SunVersion::SunVersion(const OUString &usVer):
m_nUpdateSpecial(0), m_preRelease(Rel_NONE),
usVersion(usVer)
{
memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
- rtl::OString sVersion= rtl::OUStringToOString(usVer, osl_getThreadTextEncoding());
+ OString sVersion= OUStringToOString(usVer, osl_getThreadTextEncoding());
m_bValid = init(sVersion.getStr());
}
SunVersion::SunVersion(const char * szVer):
@@ -54,7 +51,7 @@ SunVersion::SunVersion(const char * szVer):
{
memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
m_bValid = init(szVer);
- usVersion= rtl::OUString(szVer,strlen(szVer),osl_getThreadTextEncoding());
+ usVersion= OUString(szVer,strlen(szVer),osl_getThreadTextEncoding());
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index e67d8e5f39cd..b60959c67105 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -82,7 +82,7 @@ protected:
PreRelease m_preRelease;
public:
SunVersion(const char * szVer);
- SunVersion(const rtl::OUString& usVer);
+ SunVersion(const OUString& usVer);
~SunVersion();
/**
@@ -100,7 +100,7 @@ public:
/** Will always contain a value if the object has been constructed with
a version string.
*/
- rtl::OUString usVersion;
+ OUString usVersion;
protected:
bool init(const char * szVer);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index e4e5b0945ddd..fea25b05e078 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -53,11 +53,7 @@
using namespace osl;
using namespace std;
-using ::rtl::OUString;
using ::rtl::Reference;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringToOString;
#ifdef WNT
#define HKEY_SUN_JRE L"Software\\JavaSoft\\Java Runtime Environment"
@@ -125,15 +121,15 @@ extern VendorSupportMapEntry gVendorMap[];
bool getSDKInfoFromRegistry(vector<OUString> & vecHome);
bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
-bool decodeOutput(const rtl::OString& s, rtl::OUString* out);
+bool decodeOutput(const OString& s, OUString* out);
namespace
{
- rtl::OUString getLibraryLocation()
+ OUString getLibraryLocation()
{
- rtl::OUString libraryFileUrl;
+ OUString libraryFileUrl;
OSL_VERIFY(osl::Module::getUrlFromAddress((void *)(sal_IntPtr)getLibraryLocation, libraryFileUrl));
return getDirFromFile(libraryFileUrl);
}
@@ -153,7 +149,7 @@ namespace
OUString const & operator()()
{
static OUString sIni;
- rtl::OUStringBuffer buf( 255);
+ OUStringBuffer buf( 255);
buf.append( getLibraryLocation());
buf.appendAscii( SAL_CONFIGFILE("/sunjavaplugin") );
sIni = buf.makeStringAndClear();
@@ -217,7 +213,7 @@ public:
inline FileHandleReader(oslFileHandle & rHandle) SAL_THROW(()):
m_aGuard(rHandle), m_nSize(0), m_nIndex(0), m_bLf(false) {}
- Result readLine(rtl::OString * pLine) SAL_THROW(());
+ Result readLine(OString * pLine) SAL_THROW(());
private:
enum { BUFFER_SIZE = 1024 };
@@ -230,7 +226,7 @@ private:
};
FileHandleReader::Result
-FileHandleReader::readLine(rtl::OString * pLine)
+FileHandleReader::readLine(OString * pLine)
SAL_THROW(())
{
OSL_ENSURE(pLine, "specification violation");
@@ -273,13 +269,13 @@ FileHandleReader::readLine(rtl::OString * pLine)
case 0x0D:
m_bLf = true;
case 0x0A:
- *pLine += rtl::OString(m_aBuffer + nStart,
+ *pLine += OString(m_aBuffer + nStart,
m_nIndex - 1 - nStart);
//TODO! check for overflow, and not very efficient
return RESULT_OK;
}
- *pLine += rtl::OString(m_aBuffer + nStart, m_nIndex - nStart);
+ *pLine += OString(m_aBuffer + nStart, m_nIndex - nStart);
//TODO! check for overflow, and not very efficient
}
}
@@ -365,7 +361,7 @@ bool getJavaProps(const OUString & exePath,
#ifdef JVM_ONE_PATH_CHECK
const OUString & homePath,
#endif
- std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
+ std::vector<std::pair<OUString, OUString> >& props,
bool * bProcessRun)
{
bool ret = false;
@@ -375,7 +371,7 @@ bool getJavaProps(const OUString & exePath,
//We need to set the CLASSPATH in case the office is started from
//a different directory. The JREProperties.class is expected to reside
//next to the plugin.
- rtl::OUString sThisLib;
+ OUString sThisLib;
if (osl_getModuleURLFromAddress((void *) (sal_IntPtr)& getJavaProps,
& sThisLib.pData) == sal_False)
return false;
@@ -496,7 +492,7 @@ bool getJavaProps(const OUString & exePath,
readable strings. The strings are encoded as integer values separated
by spaces.
*/
-bool decodeOutput(const rtl::OString& s, rtl::OUString* out)
+bool decodeOutput(const OString& s, OUString* out)
{
OSL_ASSERT(out != 0);
OUStringBuffer buff(512);
@@ -687,7 +683,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
bool getJREInfoFromBinPath(
- const rtl::OUString& path, vector<rtl::Reference<VendorBase> > & vecInfos)
+ const OUString& path, vector<rtl::Reference<VendorBase> > & vecInfos)
{
// file:///c:/jre/bin
//map: jre/bin/java.exe
@@ -781,7 +777,7 @@ vector<OUString> getVectorFromCharArray(char const * const * ar, int size)
}
return vec;
}
-bool getJREInfoByPath(const rtl::OUString& path,
+bool getJREInfoByPath(const OUString& path,
std::vector<rtl::Reference<VendorBase> > & vecInfos)
{
bool ret = false;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index cab102757f64..33ff7e35b530 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -28,7 +28,7 @@ namespace jfw_plugin
{
class VendorBase;
-std::vector<rtl::OUString> getVectorFromCharArray(char const * const * ar, int size);
+std::vector<OUString> getVectorFromCharArray(char const * const * ar, int size);
/* The function uses the relative paths, such as "bin/java.exe" and the provided
path to derive the home directory. The home directory is then used as
@@ -36,8 +36,8 @@ std::vector<rtl::OUString> getVectorFromCharArray(char const * const * ar, int s
file:///c:/j2sdk/jre/bin then file:///c:/j2sdk/jre would be derived.
*/
bool getJREInfoFromBinPath(
- const rtl::OUString& path, std::vector<rtl::Reference<VendorBase> > & vecInfos);
-inline rtl::OUString getDirFromFile(const rtl::OUString& usFilePath);
+ const OUString& path, std::vector<rtl::Reference<VendorBase> > & vecInfos);
+inline OUString getDirFromFile(const OUString& usFilePath);
void createJavaInfoFromPath(std::vector<rtl::Reference<VendorBase> >& vecInfos);
void createJavaInfoFromJavaHome(std::vector<rtl::Reference<VendorBase> > &vecInfos);
void createJavaInfoDirScan(std::vector<rtl::Reference<VendorBase> >& vecInfos);
@@ -45,7 +45,7 @@ void createJavaInfoDirScan(std::vector<rtl::Reference<VendorBase> >& vecInfos);
void createJavaInfoFromWinReg(std::vector<rtl::Reference<VendorBase> >& vecInfos);
#endif
-bool makeDriveLetterSame(rtl::OUString * fileURL);
+bool makeDriveLetterSame(OUString * fileURL);
/* for std::find_if
@@ -54,8 +54,8 @@ bool makeDriveLetterSame(rtl::OUString * fileURL);
*/
struct InfoFindSame
{
- rtl::OUString sJava;
- InfoFindSame(const rtl::OUString& sJavaHome):sJava(sJavaHome){}
+ OUString sJava;
+ InfoFindSame(const OUString& sJavaHome):sJava(sJavaHome){}
bool operator () (const rtl::Reference<VendorBase> & aVendorInfo)
{
@@ -65,16 +65,16 @@ struct InfoFindSame
struct SameOrSubDirJREMap
{
- rtl::OUString s1;
- SameOrSubDirJREMap(const rtl::OUString& s):s1(s){
+ OUString s1;
+ SameOrSubDirJREMap(const OUString& s):s1(s){
}
- bool operator () (const std::pair<const rtl::OUString, rtl::Reference<VendorBase> > & s2)
+ bool operator () (const std::pair<const OUString, rtl::Reference<VendorBase> > & s2)
{
if (s1 == s2.first)
return true;
- rtl::OUString sSub;
- sSub = s2.first + rtl::OUString("/");
+ OUString sSub;
+ sSub = s2.first + OUString("/");
if (s1.match(sSub) == sal_True)
return true;
return false;
@@ -87,7 +87,7 @@ struct SameOrSubDirJREMap
This depends if there is a JRE at all and if it is from a vendor that
is supported by this plugin.
*/
-rtl::Reference<VendorBase> getJREInfoByPath(const rtl::OUString& path);
+rtl::Reference<VendorBase> getJREInfoByPath(const OUString& path);
/* Creates a VendorBase object if a JRE could be found at the specified path.
@@ -102,17 +102,17 @@ rtl::Reference<VendorBase> getJREInfoByPath(const rtl::OUString& path);
false - no VendorBase has been created. Either the path did not represent a
supported JRE installation or there was already a VendorBase in vecInfos.
*/
-bool getJREInfoByPath(const rtl::OUString& path,
+bool getJREInfoByPath(const OUString& path,
std::vector<rtl::Reference<VendorBase> > & vecInfos);
std::vector<rtl::Reference<VendorBase> > getAllJREInfos();
bool getJavaProps(
- const rtl::OUString & exePath,
+ const OUString & exePath,
#ifdef JVM_ONE_PATH_CHECK
- const rtl::OUString & homePath,
+ const OUString & homePath,
#endif
- std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
+ std::vector<std::pair<OUString, OUString> >& props,
bool * bProcessRun);
void createJavaInfoFromWinReg(std::vector<rtl::Reference<VendorBase> > & vecInfos);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 67957ef6fbd2..6fa931d44eb7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -27,7 +27,6 @@
using namespace std;
using namespace osl;
-using ::rtl::OUString;
namespace jfw_plugin
{
@@ -238,7 +237,7 @@ bool VendorBase::needsRestart() const
return false;
}
-int VendorBase::compareVersions(const rtl::OUString& /*sSecond*/) const
+int VendorBase::compareVersions(const OUString& /*sSecond*/) const
{
OSL_FAIL("[Java framework] VendorBase::compareVersions must be "
"overridden in derived class.");
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index f9f4a968cf3b..0d73dd67763d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -121,7 +121,7 @@ public:
it will be discarded by the caller.
*/
virtual bool initialize(
- std::vector<std::pair<rtl::OUString, rtl::OUString> > props);
+ std::vector<std::pair<OUString, OUString> > props);
/* returns relative file URLs to the runtime library.
For example "/bin/client/jvm.dll"
@@ -130,11 +130,11 @@ public:
virtual char const* const* getLibraryPaths(int* size);
- virtual const rtl::OUString & getVendor() const;
- virtual const rtl::OUString & getVersion() const;
- virtual const rtl::OUString & getHome() const;
- virtual const rtl::OUString & getRuntimeLibrary() const;
- virtual const rtl::OUString & getLibraryPaths() const;
+ virtual const OUString & getVendor() const;
+ virtual const OUString & getVersion() const;
+ virtual const OUString & getHome() const;
+ virtual const OUString & getRuntimeLibrary() const;
+ virtual const OUString & getLibraryPaths() const;
virtual bool supportsAccessibility() const;
/* determines if prior to running java something has to be done,
like setting the LD_LIBRARY_PATH. This implementation checks
@@ -156,22 +156,22 @@ public:
@throw
MalformedVersionException if the version string was not recognized.
*/
- virtual int compareVersions(const rtl::OUString& sSecond) const;
+ virtual int compareVersions(const OUString& sSecond) const;
protected:
- rtl::OUString m_sVendor;
- rtl::OUString m_sVersion;
- rtl::OUString m_sHome;
- rtl::OUString m_sRuntimeLibrary;
- rtl::OUString m_sLD_LIBRARY_PATH;
+ OUString m_sVendor;
+ OUString m_sVersion;
+ OUString m_sHome;
+ OUString m_sRuntimeLibrary;
+ OUString m_sLD_LIBRARY_PATH;
bool m_bAccessibility;
typedef rtl::Reference<VendorBase> (* createInstance_func) ();
friend rtl::Reference<VendorBase> createInstance(
createInstance_func pFunc,
- std::vector<std::pair<rtl::OUString, rtl::OUString> > properties);
+ std::vector<std::pair<OUString, OUString> > properties);
};
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 02d82ce514d4..11ed82e7a668 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -27,10 +27,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
-using ::rtl::OString;
namespace jfw_plugin
{
@@ -64,7 +60,7 @@ Sequence<OUString> getVendorNames()
return Sequence<OUString>(arNames, count);
}
-bool isVendorSupported(const rtl::OUString& sVendor)
+bool isVendorSupported(const OUString& sVendor)
{
Sequence<OUString> seqNames = getVendorNames();
const OUString * arNames = seqNames.getConstArray();
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index d91a9a1ec5cf..98b7b8a1bff8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -46,13 +46,13 @@ VendorSupportMapEntry gVendorMap[] ={
{NULL, NULL, NULL} };
-com::sun::star::uno::Sequence<rtl::OUString> getVendorNames();
+com::sun::star::uno::Sequence<OUString> getVendorNames();
/* Examines if the vendor supplied in parameter sVendor is part of the
list of supported vendors. That is the arry of VendorSupportMapEntry
is search for an respective entry.
*/
-bool isVendorSupported(const rtl::OUString & sVendor);
+bool isVendorSupported(const OUString & sVendor);
}
#endif
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index b49a8fb3f655..f9f481f5e0a2 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -38,7 +38,7 @@ using namespace osl;
namespace jfw
{
-rtl::OString getElement(::rtl::OString const & docPath,
+OString getElement(OString const & docPath,
xmlChar const * pathExpression, bool bThrowIfEmpty)
{
//Prepare the xml document and context
@@ -47,7 +47,7 @@ rtl::OString getElement(::rtl::OString const & docPath,
if (doc == NULL)
throw FrameworkException(
JFW_E_ERROR,
- rtl::OString("[Java framework] Error in function getElement "
+ OString("[Java framework] Error in function getElement "
"(elements.cxx)"));
jfw::CXPathContextPtr context(xmlXPathNewContext(doc));
@@ -55,18 +55,18 @@ rtl::OString getElement(::rtl::OString const & docPath,
(xmlChar*) NS_JAVA_FRAMEWORK) == -1)
throw FrameworkException(
JFW_E_ERROR,
- rtl::OString("[Java framework] Error in function getElement "
+ OString("[Java framework] Error in function getElement "
"(elements.cxx)"));
CXPathObjectPtr pathObj;
pathObj = xmlXPathEvalExpression(pathExpression, context);
- rtl::OString sValue;
+ OString sValue;
if (xmlXPathNodeSetIsEmpty(pathObj->nodesetval))
{
if (bThrowIfEmpty)
throw FrameworkException(
JFW_E_ERROR,
- rtl::OString("[Java framework] Error in function getElement "
+ OString("[Java framework] Error in function getElement "
"(elements.cxx)"));
}
else
@@ -76,7 +76,7 @@ rtl::OString getElement(::rtl::OString const & docPath,
return sValue;
}
-rtl::OString getElementUpdated()
+OString getElementUpdated()
{
return getElement(jfw::getVendorSettingsPath(),
(xmlChar*)"/jf:javaSelection/jf:updated/text()", true);
@@ -84,7 +84,7 @@ rtl::OString getElementUpdated()
void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
{
- rtl::OString sExcMsg("[Java framework] Error in function createSettingsStructure "
+ OString sExcMsg("[Java framework] Error in function createSettingsStructure "
"(elements.cxx).");
xmlNode * root = xmlDocGetRootElement(document);
if (root == NULL)
@@ -174,7 +174,7 @@ VersionInfo::~VersionInfo()
delete [] arVersions;
}
-void VersionInfo::addExcludeVersion(const rtl::OUString& sVersion)
+void VersionInfo::addExcludeVersion(const OUString& sVersion)
{
vecExcludeVersions.push_back(sVersion);
}
@@ -187,7 +187,7 @@ rtl_uString** VersionInfo::getExcludeVersions()
arVersions = new rtl_uString*[vecExcludeVersions.size()];
int j=0;
- typedef std::vector<rtl::OUString>::const_iterator it;
+ typedef std::vector<OUString>::const_iterator it;
for (it i = vecExcludeVersions.begin(); i != vecExcludeVersions.end();
++i, ++j)
{
@@ -216,7 +216,7 @@ NodeJava::NodeJava(Layer layer):
void NodeJava::load()
{
- const rtl::OString sExcMsg("[Java framework] Error in function NodeJava::load"
+ const OString sExcMsg("[Java framework] Error in function NodeJava::load"
"(elements.cxx).");
if (SHARED == m_layer)
{
@@ -249,7 +249,7 @@ void NodeJava::load()
//Read the user elements
- rtl::OString sSettingsPath = getSettingsPath();
+ OString sSettingsPath = getSettingsPath();
//There must not be a share settings file
CXmlDocPtr docUser(xmlParseFile(sSettingsPath.getStr()));
if (docUser == NULL)
@@ -290,7 +290,7 @@ void NodeJava::load()
{
CXmlCharPtr sUser(xmlNodeListGetString(
docUser, cur->children, 1));
- m_userClassPath = boost::optional<rtl::OUString>(rtl::OUString(sUser));
+ m_userClassPath = boost::optional<OUString>(OUString(sUser));
}
}
else if (xmlStrcmp(cur->name, (xmlChar*) "javaInfo") == 0)
@@ -316,8 +316,8 @@ void NodeJava::load()
if (xmlStrcmp(sNil, (xmlChar*) "false") == 0)
{
if ( ! m_vmParameters)
- m_vmParameters = boost::optional<std::vector<rtl::OUString> >(
- std::vector<rtl::OUString> ());
+ m_vmParameters = boost::optional<std::vector<OUString> >(
+ std::vector<OUString> ());
xmlNode * pOpt = cur->children;
while (pOpt != NULL)
@@ -342,8 +342,8 @@ void NodeJava::load()
if (xmlStrcmp(sNil, (xmlChar*) "false") == 0)
{
if (! m_JRELocations)
- m_JRELocations = boost::optional<std::vector<rtl::OUString> >(
- std::vector<rtl::OUString>());
+ m_JRELocations = boost::optional<std::vector<OUString> >(
+ std::vector<OUString>());
xmlNode * pLoc = cur->children;
while (pLoc != NULL)
@@ -363,9 +363,9 @@ void NodeJava::load()
}
}
-::rtl::OString NodeJava::getSettingsPath() const
+OString NodeJava::getSettingsPath() const
{
- ::rtl::OString ret;
+ OString ret;
switch (m_layer)
{
case USER: ret = getUserSettingsPath(); break;
@@ -376,9 +376,9 @@ void NodeJava::load()
return ret;
}
-::rtl::OUString NodeJava::getSettingsURL() const
+OUString NodeJava::getSettingsURL() const
{
- ::rtl::OUString ret;
+ OUString ret;
switch (m_layer)
{
case USER: ret = BootParams::getUserData(); break;
@@ -391,14 +391,14 @@ void NodeJava::load()
bool NodeJava::prepareSettingsDocument() const
{
- rtl::OString sExcMsg(
+ OString sExcMsg(
"[Java framework] Error in function prepareSettingsDocument"
" (elements.cxx).");
if (!createSettingsDocument())
{
return false;
}
- rtl::OString sSettings = getSettingsPath();
+ OString sSettings = getSettingsPath();
CXmlDocPtr doc(xmlParseFile(sSettings.getStr()));
if (!doc)
throw FrameworkException(JFW_E_ERROR, sExcMsg);
@@ -416,7 +416,7 @@ bool NodeJava::prepareSettingsDocument() const
void NodeJava::write() const
{
- rtl::OString sExcMsg("[Java framework] Error in function NodeJava::writeSettings "
+ OString sExcMsg("[Java framework] Error in function NodeJava::writeSettings "
"(elements.cxx).");
CXmlDocPtr docUser;
CXPathContextPtr contextUser;
@@ -429,7 +429,7 @@ void NodeJava::write() const
}
//Read the user elements
- rtl::OString sSettingsPath = getSettingsPath();
+ OString sSettingsPath = getSettingsPath();
docUser = xmlParseFile(sSettingsPath.getStr());
if (docUser == NULL)
throw FrameworkException(JFW_E_ERROR, sExcMsg);
@@ -448,7 +448,7 @@ void NodeJava::write() const
//The element must exist
if (m_enabled)
{
- rtl::OString sExpression= rtl::OString(
+ OString sExpression= OString(
"/jf:java/jf:enabled");
pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
contextUser);
@@ -471,7 +471,7 @@ void NodeJava::write() const
//The element must exist
if (m_userClassPath)
{
- rtl::OString sExpression= rtl::OString(
+ OString sExpression= OString(
"/jf:java/jf:userClassPath");
pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
contextUser);
@@ -486,7 +486,7 @@ void NodeJava::write() const
//set <javaInfo> element
if (m_javaInfo)
{
- rtl::OString sExpression= rtl::OString(
+ OString sExpression= OString(
"/jf:java/jf:javaInfo");
pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
contextUser);
@@ -499,7 +499,7 @@ void NodeJava::write() const
//set <vmParameters> element
if (m_vmParameters)
{
- rtl::OString sExpression= rtl::OString(
+ OString sExpression= OString(
"/jf:java/jf:vmParameters");
pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
contextUser);
@@ -526,7 +526,7 @@ void NodeJava::write() const
xmlAddChild(vmParameters, nodeCrLf);
}
- typedef std::vector<rtl::OUString>::const_iterator cit;
+ typedef std::vector<OUString>::const_iterator cit;
for (cit i = m_vmParameters->begin(); i != m_vmParameters->end(); ++i)
{
xmlNewTextChild(vmParameters, NULL, (xmlChar*) "param",
@@ -540,7 +540,7 @@ void NodeJava::write() const
//set <jreLocations> element
if (m_JRELocations)
{
- rtl::OString sExpression= rtl::OString(
+ OString sExpression= OString(
"/jf:java/jf:jreLocations");
pathObj = xmlXPathEvalExpression((xmlChar*) sExpression.getStr(),
contextUser);
@@ -567,7 +567,7 @@ void NodeJava::write() const
xmlAddChild(jreLocationsNode, nodeCrLf);
}
- typedef std::vector<rtl::OUString>::const_iterator cit;
+ typedef std::vector<OUString>::const_iterator cit;
for (cit i = m_JRELocations->begin(); i != m_JRELocations->end(); ++i)
{
xmlNewTextChild(jreLocationsNode, NULL, (xmlChar*) "location",
@@ -588,9 +588,9 @@ void NodeJava::setEnabled(sal_Bool bEnabled)
}
-void NodeJava::setUserClassPath(const rtl::OUString & sClassPath)
+void NodeJava::setUserClassPath(const OUString & sClassPath)
{
- m_userClassPath = boost::optional<rtl::OUString>(sClassPath);
+ m_userClassPath = boost::optional<OUString>(sClassPath);
}
void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect)
@@ -613,7 +613,7 @@ void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect)
else
{
m_javaInfo->m_bEmptyNode = true;
- rtl::OUString sEmpty;
+ OUString sEmpty;
m_javaInfo->sVendor = sEmpty;
m_javaInfo->sLocation = sEmpty;
m_javaInfo->sVersion = sEmpty;
@@ -627,14 +627,14 @@ void NodeJava::setVmParameters(rtl_uString * * arOptions, sal_Int32 size)
{
OSL_ASSERT( !(arOptions == 0 && size != 0));
if ( ! m_vmParameters)
- m_vmParameters = boost::optional<std::vector<rtl::OUString> >(
- std::vector<rtl::OUString>());
+ m_vmParameters = boost::optional<std::vector<OUString> >(
+ std::vector<OUString>());
m_vmParameters->clear();
if (arOptions != NULL)
{
for (int i = 0; i < size; i++)
{
- const rtl::OUString sOption(static_cast<rtl_uString*>(arOptions[i]));
+ const OUString sOption(static_cast<rtl_uString*>(arOptions[i]));
m_vmParameters->push_back(sOption);
}
}
@@ -644,17 +644,17 @@ void NodeJava::setJRELocations(rtl_uString * * arLocations, sal_Int32 size)
{
OSL_ASSERT( !(arLocations == 0 && size != 0));
if (! m_JRELocations)
- m_JRELocations = boost::optional<std::vector<rtl::OUString> > (
- std::vector<rtl::OUString>());
+ m_JRELocations = boost::optional<std::vector<OUString> > (
+ std::vector<OUString>());
m_JRELocations->clear();
if (arLocations != NULL)
{
for (int i = 0; i < size; i++)
{
- const rtl::OUString & sLocation = static_cast<rtl_uString*>(arLocations[i]);
+ const OUString & sLocation = static_cast<rtl_uString*>(arLocations[i]);
//only add the path if not already present
- std::vector<rtl::OUString>::const_iterator it =
+ std::vector<OUString>::const_iterator it =
std::find(m_JRELocations->begin(), m_JRELocations->end(),
sLocation);
if (it == m_JRELocations->end())
@@ -667,14 +667,14 @@ void NodeJava::addJRELocation(rtl_uString * sLocation)
{
OSL_ASSERT( sLocation);
if (!m_JRELocations)
- m_JRELocations = boost::optional<std::vector<rtl::OUString> >(
- std::vector<rtl::OUString> ());
+ m_JRELocations = boost::optional<std::vector<OUString> >(
+ std::vector<OUString> ());
//only add the path if not already present
- std::vector<rtl::OUString>::const_iterator it =
+ std::vector<OUString>::const_iterator it =
std::find(m_JRELocations->begin(), m_JRELocations->end(),
- rtl::OUString(sLocation));
+ OUString(sLocation));
if (it == m_JRELocations->end())
- m_JRELocations->push_back(rtl::OUString(sLocation));
+ m_JRELocations->push_back(OUString(sLocation));
}
const boost::optional<sal_Bool> & NodeJava::getEnabled() const
@@ -682,18 +682,18 @@ const boost::optional<sal_Bool> & NodeJava::getEnabled() const
return m_enabled;
}
-const boost::optional<std::vector<rtl::OUString> >&
+const boost::optional<std::vector<OUString> >&
NodeJava::getJRELocations() const
{
return m_JRELocations;
}
-const boost::optional<rtl::OUString> & NodeJava::getUserClassPath() const
+const boost::optional<OUString> & NodeJava::getUserClassPath() const
{
return m_userClassPath;
}
-const boost::optional<std::vector<rtl::OUString> > & NodeJava::getVmParameters() const
+const boost::optional<std::vector<OUString> > & NodeJava::getVmParameters() const
{
return m_vmParameters;
}
@@ -740,13 +740,13 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL) const
bool NodeJava::createSettingsDocument() const
{
- const rtl::OUString sURL = getSettingsURL();
+ const OUString sURL = getSettingsURL();
if (sURL.isEmpty())
{
return false;
}
//make sure there is a user directory
- rtl::OString sExcMsg("[Java framework] Error in function createSettingsDocument "
+ OString sExcMsg("[Java framework] Error in function createSettingsDocument "
"(elements.cxx).");
// check if javasettings.xml already exist
if (FILE_OK == checkSettingsFileStatus(sURL))
@@ -787,7 +787,7 @@ bool NodeJava::createSettingsDocument() const
if (xmlAddPrevSibling(root, com) == NULL)
throw FrameworkException(JFW_E_ERROR, sExcMsg);
- const rtl::OString path = getSettingsPath();
+ const OString path = getSettingsPath();
if (xmlSaveFormatFileEnc(path.getStr(), doc,"UTF-8", 1) == -1)
throw FrameworkException(JFW_E_ERROR, sExcMsg);
return true;
@@ -806,7 +806,7 @@ CNodeJavaInfo::~CNodeJavaInfo()
void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
{
- rtl::OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode "
+ OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode "
"(elements.cxx).");
OSL_ASSERT(pJavaInfo && pDoc);
@@ -874,7 +874,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
CXmlCharPtr xmlFeatures;
xmlFeatures = xmlNodeListGetString(
pDoc, cur->children, 1);
- rtl::OUString sFeatures = xmlFeatures;
+ OUString sFeatures = xmlFeatures;
nFeatures = sFeatures.toInt64(16);
}
else if (xmlStrcmp(cur->name, (xmlChar*) "requirements") == 0)
@@ -882,7 +882,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
CXmlCharPtr xmlRequire;
xmlRequire = xmlNodeListGetString(
pDoc, cur->children, 1);
- rtl::OUString sRequire = xmlRequire;
+ OUString sRequire = xmlRequire;
nRequirements = sRequire.toInt64(16);
#ifdef MACOSX
//javaldx is not used anymore in the mac build. In case the Java
@@ -931,7 +931,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
//javaInfo@vendorUpdate
//creates the attribute if necessary
- rtl::OString sUpdated = getElementUpdated();
+ OString sUpdated = getElementUpdated();
xmlSetProp(pJavaInfoNode, (xmlChar*)"vendorUpdate",
(xmlChar*) sUpdated.getStr());
@@ -992,7 +992,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
xmlAddChild(pJavaInfoNode, nodeCrLf);
//Create the features element
- rtl::OUString sFeatures = rtl::OUString::valueOf(
+ OUString sFeatures = OUString::valueOf(
(sal_Int64)nFeatures, 16);
xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "features",
CXmlCharPtr(sFeatures));
@@ -1002,7 +1002,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
//Create the requirements element
- rtl::OUString sRequirements = rtl::OUString::valueOf(
+ OUString sRequirements = OUString::valueOf(
(sal_Int64) nRequirements, 16);
xmlNewTextChild(pJavaInfoNode, NULL, (xmlChar*) "requirements",
CXmlCharPtr(sRequirements));
@@ -1097,23 +1097,23 @@ bool MergedSettings::getEnabled() const
{
return m_bEnabled;
}
-const rtl::OUString& MergedSettings::getUserClassPath() const
+const OUString& MergedSettings::getUserClassPath() const
{
return m_sClassPath;
}
-::std::vector< ::rtl::OString> MergedSettings::getVmParametersUtf8() const
+::std::vector< OString> MergedSettings::getVmParametersUtf8() const
{
- ::std::vector< ::rtl::OString> ret;
- typedef ::std::vector< ::rtl::OUString>::const_iterator cit;
+ ::std::vector< OString> ret;
+ typedef ::std::vector< OUString>::const_iterator cit;
for (cit i = m_vmParams.begin(); i != m_vmParams.end(); ++i)
{
- ret.push_back( ::rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
+ ret.push_back( OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
}
return ret;
}
-const ::rtl::OString & MergedSettings::getJavaInfoAttrVendorUpdate() const
+const OString & MergedSettings::getJavaInfoAttrVendorUpdate() const
{
return m_javaInfo.sAttrVendorUpdate;
}
@@ -1141,7 +1141,7 @@ void MergedSettings::getVmParametersArray(
return;
int j=0;
- typedef std::vector<rtl::OUString>::const_iterator it;
+ typedef std::vector<OUString>::const_iterator it;
for (it i = m_vmParams.begin(); i != m_vmParams.end();
++i, ++j)
{
@@ -1163,7 +1163,7 @@ void MergedSettings::getJRELocations(
return;
int j=0;
- typedef std::vector<rtl::OUString>::const_iterator it;
+ typedef std::vector<OUString>::const_iterator it;
for (it i = m_JRELocations.begin(); i != m_JRELocations.end();
++i, ++j)
{
@@ -1172,7 +1172,7 @@ void MergedSettings::getJRELocations(
}
*size = m_JRELocations.size();
}
-const std::vector<rtl::OUString> & MergedSettings::getJRELocations() const
+const std::vector<OUString> & MergedSettings::getJRELocations() const
{
return m_JRELocations;
}
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 8e3e4aa51c2f..0cc213f29a48 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -35,7 +35,7 @@ namespace jfw
/** gets the value of the updated element from the javavendors.xml.
*/
-rtl::OString getElementUpdated();
+OString getElementUpdated();
/** create the child elements within the root structure for each platform.
@@ -66,7 +66,7 @@ public:
It is not used, when the javaInfo node is written.
see writeToNode
*/
- ::rtl::OString sAttrVendorUpdate;
+ OString sAttrVendorUpdate;
/** contains the nil value of the /java/javaInfo@xsi:nil attribute.
Default is true;
*/
@@ -78,9 +78,9 @@ public:
jfw_findAndSelectJRE sets the attribute to true.
*/
bool bAutoSelect;
- ::rtl::OUString sVendor;
- ::rtl::OUString sLocation;
- ::rtl::OUString sVersion;
+ OUString sVendor;
+ OUString sLocation;
+ OUString sVersion;
sal_uInt64 nFeatures;
sal_uInt64 nRequirements;
::rtl::ByteSequence arVendorData;
@@ -137,11 +137,11 @@ private:
depends on the member m_layer and the bootstrap parameters
UNO_JAVA_JFW_USER_DATA and UNO_JAVA_JFW_SHARED_DATA.
*/
- ::rtl::OString getSettingsPath() const;
+ OString getSettingsPath() const;
/** returns the file URL to the data file which is to be used. See getSettingsPath.
*/
- ::rtl::OUString getSettingsURL() const;
+ OUString getSettingsURL() const;
/** Verifies if the respective settings file exist.
*/
@@ -162,7 +162,7 @@ private:
If /java/userClassPath@xsi:nil == true then the value is uninitialized
after a call to load().
*/
- boost::optional< ::rtl::OUString> m_userClassPath;
+ boost::optional< OUString> m_userClassPath;
/** User configurable option. /java/javaInfo
If /java/javaInfo@xsi:nil == true then the value is uninitialized
after a call to load.
@@ -172,12 +172,12 @@ private:
If /java/vmParameters@xsi:nil == true then the value is uninitialized
after a call to load.
*/
- boost::optional< ::std::vector< ::rtl::OUString> > m_vmParameters;
+ boost::optional< ::std::vector< OUString> > m_vmParameters;
/** User configurable option. /java/jreLocations
If /java/jreLocaltions@xsi:nil == true then the value is uninitialized
after a call to load.
*/
- boost::optional< ::std::vector< ::rtl::OUString> > m_JRELocations;
+ boost::optional< ::std::vector< OUString> > m_JRELocations;
public:
@@ -190,7 +190,7 @@ public:
/** sets m_sUserClassPath. See setEnabled.
*/
- void setUserClassPath(const ::rtl::OUString & sClassPath);
+ void setUserClassPath(const OUString & sClassPath);
/** sets m_aInfo. See setEnabled.
@param bAutoSelect
@@ -232,7 +232,7 @@ public:
const boost::optional<sal_Bool> & getEnabled() const;
/** returns the value of the element /java/userClassPath.
*/
- const boost::optional< ::rtl::OUString> & getUserClassPath() const;
+ const boost::optional< OUString> & getUserClassPath() const;
/** returns the value of the element /java/javaInfo.
*/
@@ -240,11 +240,11 @@ public:
/** returns the parameters from the element /java/vmParameters/param.
*/
- const boost::optional< ::std::vector< ::rtl::OUString> > & getVmParameters() const;
+ const boost::optional< ::std::vector< OUString> > & getVmParameters() const;
/** returns the parameters from the element /java/jreLocations/location.
*/
- const boost::optional< ::std::vector< ::rtl::OUString> > & getJRELocations() const;
+ const boost::optional< ::std::vector< OUString> > & getJRELocations() const;
};
/** merges the settings for shared, user and installation during construction.
@@ -277,11 +277,11 @@ private:
bool m_bEnabled;
- ::rtl::OUString m_sClassPath;
+ OUString m_sClassPath;
- ::std::vector< ::rtl::OUString> m_vmParams;
+ ::std::vector< OUString> m_vmParams;
- ::std::vector< ::rtl::OUString> m_JRELocations;
+ ::std::vector< OUString> m_JRELocations;
CNodeJavaInfo m_javaInfo;
@@ -293,9 +293,9 @@ public:
*/
bool getEnabled() const;
- const ::rtl::OUString & getUserClassPath() const;
+ const OUString & getUserClassPath() const;
- ::std::vector< ::rtl::OString> getVmParametersUtf8() const;
+ ::std::vector< OString> getVmParametersUtf8() const;
/** returns a JavaInfo structure representing the node
/java/javaInfo. Every time a new JavaInfo structure is created
which needs to be freed by the caller.
@@ -305,7 +305,7 @@ public:
/** returns the value of the attribute /java/javaInfo[@vendorUpdate].
*/
- ::rtl::OString const & getJavaInfoAttrVendorUpdate() const;
+ OString const & getJavaInfoAttrVendorUpdate() const;
#ifdef WNT
/** returns the javaInfo@autoSelect attribute.
@@ -326,23 +326,23 @@ public:
*/
void getJRELocations(rtl_uString *** parLocations, sal_Int32 * size) const;
- const ::std::vector< ::rtl::OUString> & getJRELocations() const;
+ const ::std::vector< OUString> & getJRELocations() const;
};
class VersionInfo
{
- ::std::vector< ::rtl::OUString> vecExcludeVersions;
+ ::std::vector< OUString> vecExcludeVersions;
rtl_uString ** arVersions;
public:
VersionInfo();
~VersionInfo();
- void addExcludeVersion(const ::rtl::OUString& sVersion);
+ void addExcludeVersion(const OUString& sVersion);
- ::rtl::OUString sMinVersion;
- ::rtl::OUString sMaxVersion;
+ OUString sMinVersion;
+ OUString sMaxVersion;
/** The caller DOES NOT get ownership of the strings. That is he
does not need to release the strings.
@@ -358,16 +358,16 @@ struct PluginLibrary
PluginLibrary()
{
}
- PluginLibrary(rtl::OUString vendor,::rtl::OUString path) :
+ PluginLibrary(OUString vendor,OUString path) :
sVendor(vendor), sPath(path)
{
}
/** contains the vendor string which is later userd in the xml API
*/
- ::rtl::OUString sVendor;
+ OUString sVendor;
/** File URL the plug-in library
*/
- ::rtl::OUString sPath;
+ OUString sPath;
};
} //end namespace
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 7a3975b7c18b..ed907d69f494 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -123,7 +123,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
//get the list of paths to jre locations which have been
//added manually
const jfw::MergedSettings settings;
- const std::vector<rtl::OUString>& vecJRELocations =
+ const std::vector<OUString>& vecJRELocations =
settings.getJRELocations();
//Use every plug-in library to get Java installations.
typedef std::vector<jfw::PluginLibrary>::const_iterator ci_pl;
@@ -139,7 +139,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
if (pluginLib.is() == sal_False)
{
- rtl::OString msg = rtl::OUStringToOString(
+ OString msg = OUStringToOString(
library.sPath, osl_getThreadTextEncoding());
fprintf(stderr,"[jvmfwk] Could not load plugin %s\n" \
"Modify the javavendors.xml accordingly!\n", msg.getStr());
@@ -147,7 +147,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
}
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
(jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString("jfw_plugin_getAllJavaInfos"));
+ OUString("jfw_plugin_getAllJavaInfos"));
#else
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
jfw_plugin_getAllJavaInfos;
@@ -183,7 +183,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
#ifndef DISABLE_DYNLOADING
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString("jfw_plugin_getJavaInfoByPath"));
+ OUString("jfw_plugin_getJavaInfoByPath"));
OSL_ASSERT(jfw_plugin_getJavaInfoByPathFunc);
if (jfw_plugin_getJavaInfoByPathFunc == NULL)
return JFW_E_ERROR;
@@ -192,7 +192,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
jfw_plugin_getJavaInfoByPath;
#endif
- typedef std::vector<rtl::OUString>::const_iterator citLoc;
+ typedef std::vector<OUString>::const_iterator citLoc;
//Check every manually added location
for (citLoc ii = vecJRELocations.begin();
ii != vecJRELocations.end(); ++ii)
@@ -300,8 +300,8 @@ javaFrameworkError SAL_CALL jfw_startVM(
if (ppVM == NULL)
return JFW_E_INVALID_ARG;
- std::vector<rtl::OString> vmParams;
- rtl::OString sUserClassPath;
+ std::vector<OString> vmParams;
+ OString sUserClassPath;
jfw::CJavaInfo aInfo;
if (pInfo == NULL)
{
@@ -343,7 +343,7 @@ javaFrameworkError SAL_CALL jfw_startVM(
}
#endif
//check if the javavendors.xml has changed after a Java was selected
- rtl::OString sVendorUpdate = jfw::getElementUpdated();
+ OString sVendorUpdate = jfw::getElementUpdated();
if (sVendorUpdate != settings.getJavaInfoAttrVendorUpdate())
return JFW_E_INVALID_SETTINGS;
@@ -385,14 +385,14 @@ javaFrameworkError SAL_CALL jfw_startVM(
//get the function jfw_plugin_startJavaVirtualMachine
jfw::VendorSettings aVendorSettings;
- rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(pInfo->sVendor);
+ OUString sLibPath = aVendorSettings.getPluginLibrary(pInfo->sVendor);
#ifndef DISABLE_DYNLOADING
osl::Module modulePlugin(sLibPath);
if ( ! modulePlugin)
return JFW_E_NO_PLUGIN;
- rtl::OUString sFunctionName("jfw_plugin_startJavaVirtualMachine");
+ OUString sFunctionName("jfw_plugin_startJavaVirtualMachine");
jfw_plugin_startJavaVirtualMachine_ptr pFunc =
(jfw_plugin_startJavaVirtualMachine_ptr)
osl_getFunctionSymbol(modulePlugin, sFunctionName.pData);
@@ -423,7 +423,7 @@ javaFrameworkError SAL_CALL jfw_startVM(
//add the options set by options dialog
int index = 2;
- typedef std::vector<rtl::OString>::const_iterator cit;
+ typedef std::vector<OString>::const_iterator cit;
for (cit i = vmParams.begin(); i != vmParams.end(); ++i)
{
arOpt[index].optionString = const_cast<sal_Char*>(i->getStr());
@@ -516,7 +516,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
(jfw_plugin_getAllJavaInfos_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString("jfw_plugin_getAllJavaInfos"));
+ OUString("jfw_plugin_getAllJavaInfos"));
#else
jfw_plugin_getAllJavaInfos_ptr getAllJavaFunc =
jfw_plugin_getAllJavaInfos;
@@ -584,7 +584,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
//get the list of paths to jre locations which have been added manually
const jfw::MergedSettings settings;
//node.loadFromSettings();
- const std::vector<rtl::OUString> & vecJRELocations =
+ const std::vector<OUString> & vecJRELocations =
settings.getJRELocations();
//use every plug-in to determine the JavaInfo objects
bool bInfoFound = false;
@@ -602,7 +602,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
//get the function from the plugin
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString("jfw_plugin_getJavaInfoByPath"));
+ OUString("jfw_plugin_getJavaInfoByPath"));
#else
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
jfw_plugin_getJavaInfoByPath;
@@ -611,7 +611,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
if (jfw_plugin_getJavaInfoByPathFunc == NULL)
return JFW_E_ERROR;
- typedef std::vector<rtl::OUString>::const_iterator citLoc;
+ typedef std::vector<OUString>::const_iterator citLoc;
for (citLoc it = vecJRELocations.begin();
it != vecJRELocations.end(); ++it)
{
@@ -689,9 +689,9 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
return sal_True;
if (pInfoA == NULL || pInfoB == NULL)
return sal_False;
- rtl::OUString sVendor(pInfoA->sVendor);
- rtl::OUString sLocation(pInfoA->sLocation);
- rtl::OUString sVersion(pInfoA->sVersion);
+ OUString sVendor(pInfoA->sVendor);
+ OUString sLocation(pInfoA->sLocation);
+ OUString sVersion(pInfoA->sVersion);
rtl::ByteSequence sData(pInfoA->arVendorData);
if (sVendor.equals(pInfoB->sVendor) == sal_True
&& sLocation.equals(pInfoB->sLocation) == sal_True
@@ -728,14 +728,14 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
if (jfw::getMode() == jfw::JFW_MODE_DIRECT)
{
- rtl::OUString sJRE = jfw::BootParams::getJREHome();
+ OUString sJRE = jfw::BootParams::getJREHome();
jfw::CJavaInfo aInfo;
if ((errcode = jfw_getJavaInfoByPath(sJRE.pData, & aInfo.pInfo))
!= JFW_E_NONE)
throw jfw::FrameworkException(
JFW_E_CONFIGURATION,
- rtl::OString(
+ OString(
"[Java framework] The JRE specified by the bootstrap "
"variable UNO_JAVA_JFW_JREHOME or UNO_JAVA_JFW_ENV_JREHOME "
" could not be recognized. Check the values and make sure that you "
@@ -756,7 +756,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
//If the javavendors.xml has changed, then the current selected
//Java is not valid anymore
// /java/javaInfo/@vendorUpdate != javaSelection/updated (javavendors.xml)
- rtl::OString sUpdated = jfw::getElementUpdated();
+ OString sUpdated = jfw::getElementUpdated();
if (sUpdated.equals(settings.getJavaInfoAttrVendorUpdate()) == sal_False)
return JFW_E_INVALID_SETTINGS;
@@ -804,8 +804,8 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
sarModules.reset(new osl::Module[vecPlugins.size()]);
osl::Module * arModules = sarModules.get();
#endif
- typedef std::vector<rtl::OUString>::const_iterator CIT_VENDOR;
- std::vector<rtl::OUString> vecVendors =
+ typedef std::vector<OUString>::const_iterator CIT_VENDOR;
+ std::vector<OUString> vecVendors =
aVendorSettings.getSupportedVendors();
//Use every plug-in library to determine if the path represents a
@@ -824,7 +824,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
osl::Module & pluginLib = arModules[cModule];
if (pluginLib.is() == sal_False)
{
- rtl::OString msg = rtl::OUStringToOString(
+ OString msg = OUStringToOString(
library.sPath, osl_getThreadTextEncoding());
fprintf(stderr,"[jvmfwk] Could not load plugin %s\n" \
"Modify the javavendors.xml accordingly!\n", msg.getStr());
@@ -833,7 +833,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
(jfw_plugin_getJavaInfoByPath_ptr) pluginLib.getFunctionSymbol(
- rtl::OUString("jfw_plugin_getJavaInfoByPath"));
+ OUString("jfw_plugin_getJavaInfoByPath"));
#else
jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
jfw_plugin_getJavaInfoByPath;
@@ -866,7 +866,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
}
else
{
- rtl::OUString sVendor(pInfo->sVendor);
+ OUString sVendor(pInfo->sVendor);
CIT_VENDOR ivendor = std::find(vecVendors.begin(), vecVendors.end(),
sVendor);
if (ivendor != vecVendors.end())
@@ -1174,11 +1174,11 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
jfw::CJavaInfo aInfo;
aInfo = (const ::JavaInfo*) pInfo; //makes a copy of pInfo
#ifndef DISABLE_DYNLOADING
- rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor());
+ OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor());
osl::Module modulePlugin(sLibPath);
if ( ! modulePlugin)
return JFW_E_NO_PLUGIN;
- rtl::OUString sFunctionName("jfw_plugin_existJRE");
+ OUString sFunctionName("jfw_plugin_existJRE");
jfw_plugin_existJRE_ptr pFunc =
(jfw_plugin_existJRE_ptr)
osl_getFunctionSymbol(modulePlugin, sFunctionName.pData);
@@ -1314,20 +1314,20 @@ CJavaInfo::operator JavaInfo const * () const
return pInfo;
}
-rtl::OUString CJavaInfo::getVendor() const
+OUString CJavaInfo::getVendor() const
{
if (pInfo)
- return rtl::OUString(pInfo->sVendor);
+ return OUString(pInfo->sVendor);
else
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString CJavaInfo::getLocation() const
+OUString CJavaInfo::getLocation() const
{
if (pInfo)
- return rtl::OUString(pInfo->sLocation);
+ return OUString(pInfo->sLocation);
else
- return rtl::OUString();
+ return OUString();
}
sal_uInt64 CJavaInfo::getFeatures() const
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 4ac6c63af78b..a884cd8ef3ff 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -100,8 +100,8 @@ public:
operator ::JavaInfo const * () const;
::JavaInfo* cloneJavaInfo() const;
- rtl::OUString getVendor() const;
- rtl::OUString getLocation() const;
+ OUString getVendor() const;
+ OUString getLocation() const;
sal_uInt64 getFeatures() const;
};
@@ -109,12 +109,12 @@ class FrameworkException
{
public:
- FrameworkException(javaFrameworkError err, const rtl::OString& msg):
+ FrameworkException(javaFrameworkError err, const OString& msg):
errorCode(err), message(msg)
{
}
javaFrameworkError errorCode;
- rtl::OString message;
+ OString message;
};
}
#endif
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 79bf2d5fb7e0..a9b38ffa5c0d 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -32,11 +32,6 @@
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
#define UNO_JAVA_JFW_PARAMETER "UNO_JAVA_JFW_PARAMETER_"
#define UNO_JAVA_JFW_JREHOME "UNO_JAVA_JFW_JREHOME"
@@ -54,29 +49,29 @@ bool g_bJavaSet = false;
namespace {
-rtl::OString getVendorSettingsPath(rtl::OUString const & sURL)
+OString getVendorSettingsPath(OUString const & sURL)
{
if (sURL.isEmpty())
- return rtl::OString();
- rtl::OUString sSystemPathSettings;
+ return OString();
+ OUString sSystemPathSettings;
if (osl_getSystemPathFromFileURL(sURL.pData,
& sSystemPathSettings.pData) != osl_File_E_None)
throw FrameworkException(
JFW_E_ERROR,
- rtl::OString("[Java framework] Error in function "
+ OString("[Java framework] Error in function "
"getVendorSettingsPath (fwkbase.cxx) "));
- rtl::OString osSystemPathSettings =
- rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
+ OString osSystemPathSettings =
+ OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
return osSystemPathSettings;
}
-rtl::OUString getParam(const char * name)
+OUString getParam(const char * name)
{
- rtl::OUString retVal;
- if (Bootstrap::get()->getFrom(rtl::OUString::createFromAscii(name), retVal))
+ OUString retVal;
+ if (Bootstrap::get()->getFrom(OUString::createFromAscii(name), retVal))
{
#if OSL_DEBUG_LEVEL >=2
- rtl::OString sValue = rtl::OUStringToOString(retVal, osl_getThreadTextEncoding());
+ OString sValue = OUStringToOString(retVal, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework] Using bootstrap parameter %s = %s.\n",
name, sValue.getStr());
#endif
@@ -84,7 +79,7 @@ rtl::OUString getParam(const char * name)
return retVal;
}
-rtl::OUString getParamFirstUrl(const char * name)
+OUString getParamFirstUrl(const char * name)
{
// Some parameters can consist of multiple URLs (separated by space
// characters, although trim() harmlessly also removes other white-space),
@@ -175,7 +170,7 @@ std::vector<PluginLibrary> VendorSettings::getPluginData()
return vecPlugins;
}
-VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor)
+VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor)
{
OSL_ASSERT(!sVendor.isEmpty());
VersionInfo aVersionInfo;
@@ -259,7 +254,7 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor)
std::vector<OUString> VendorSettings::getSupportedVendors()
{
- std::vector<rtl::OUString> vecVendors;
+ std::vector<OUString> vecVendors;
//get the nodeset for the library elements
jfw::CXPathObjectPtr result;
result = xmlXPathEvalExpression(
@@ -268,7 +263,7 @@ std::vector<OUString> VendorSettings::getSupportedVendors()
if (xmlXPathNodeSetIsEmpty(result->nodesetval))
throw FrameworkException(
JFW_E_ERROR,
- rtl::OString("[Java framework] Error in function getSupportedVendors (fwkbase.cxx)."));
+ OString("[Java framework] Error in function getSupportedVendors (fwkbase.cxx)."));
//get the values of the library elements + vendor attribute
xmlNode* cur = result->nodesetval->nodeTab[0];
@@ -337,7 +332,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
OUStringToOString(sValue, osl_getThreadTextEncoding());
vecParams.push_back(sParam);
#if OSL_DEBUG_LEVEL >=2
- rtl::OString sParamName = rtl::OUStringToOString(sName, osl_getThreadTextEncoding());
+ OString sParamName = OUStringToOString(sName, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework] Using bootstrap parameter %s"
" = %s.\n", sParamName.getStr(), sParam.getStr());
#endif
@@ -348,25 +343,25 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
return vecParams;
}
-rtl::OUString BootParams::getUserData()
+OUString BootParams::getUserData()
{
return getParamFirstUrl(UNO_JAVA_JFW_USER_DATA);
}
-rtl::OUString BootParams::getSharedData()
+OUString BootParams::getSharedData()
{
return getParamFirstUrl(UNO_JAVA_JFW_SHARED_DATA);
}
-rtl::OString BootParams::getClasspath()
+OString BootParams::getClasspath()
{
- rtl::OString sClassPath;
- rtl::OUString sCP;
+ OString sClassPath;
+ OUString sCP;
if (Bootstrap::get()->getFrom(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH)),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH)),
sCP) == sal_True)
{
- sClassPath = rtl::OUStringToOString(
+ sClassPath = OUStringToOString(
sCP, osl_getThreadTextEncoding());
#if OSL_DEBUG_LEVEL >=2
fprintf(stderr,"[Java framework] Using bootstrap parameter "
@@ -374,16 +369,16 @@ rtl::OString BootParams::getClasspath()
#endif
}
- rtl::OUString sEnvCP;
+ OUString sEnvCP;
if (Bootstrap::get()->getFrom(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)),
sEnvCP) == sal_True)
{
char * pCp = getenv("CLASSPATH");
if (pCp)
{
char szSep[] = {SAL_PATHSEPARATOR,0};
- sClassPath += rtl::OString(szSep) + rtl::OString(pCp);
+ sClassPath += OString(szSep) + OString(pCp);
}
#if OSL_DEBUG_LEVEL >=2
fprintf(stderr,"[Java framework] Using bootstrap parameter "
@@ -394,10 +389,10 @@ rtl::OString BootParams::getClasspath()
return sClassPath;
}
-rtl::OUString BootParams::getVendorSettings()
+OUString BootParams::getVendorSettings()
{
- rtl::OUString sVendor;
- rtl::OUString sName(
+ OUString sVendor;
+ OUString sName(
RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_VENDOR_SETTINGS));
if (Bootstrap::get()->getFrom(sName ,sVendor) == sal_True)
{
@@ -406,13 +401,13 @@ rtl::OUString BootParams::getVendorSettings()
if (s != FILE_OK)
{
//This bootstrap parameter can contain a relative URL
- rtl::OUString sAbsoluteUrl;
- rtl::OUString sBaseDir = getLibraryLocation();
+ OUString sAbsoluteUrl;
+ OUString sBaseDir = getLibraryLocation();
if (File::getAbsoluteFileURL(sBaseDir, sVendor, sAbsoluteUrl)
!= File::E_None)
throw FrameworkException(
JFW_E_CONFIGURATION,
- rtl::OString("[Java framework] Invalid value for bootstrap variable: "
+ OString("[Java framework] Invalid value for bootstrap variable: "
UNO_JAVA_JFW_VENDOR_SETTINGS));
sVendor = sAbsoluteUrl;
s = checkFileURL(sVendor);
@@ -420,12 +415,12 @@ rtl::OUString BootParams::getVendorSettings()
{
throw FrameworkException(
JFW_E_CONFIGURATION,
- rtl::OString("[Java framework] Invalid value for bootstrap variable: "
+ OString("[Java framework] Invalid value for bootstrap variable: "
UNO_JAVA_JFW_VENDOR_SETTINGS));
}
}
#if OSL_DEBUG_LEVEL >=2
- rtl::OString sValue = rtl::OUStringToOString(sVendor, osl_getThreadTextEncoding());
+ OString sValue = OUStringToOString(sVendor, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework] Using bootstrap parameter "
UNO_JAVA_JFW_VENDOR_SETTINGS" = %s.\n", sValue.getStr());
#endif
@@ -433,20 +428,20 @@ rtl::OUString BootParams::getVendorSettings()
return sVendor;
}
-rtl::OUString BootParams::getJREHome()
+OUString BootParams::getJREHome()
{
- rtl::OUString sJRE;
- rtl::OUString sEnvJRE;
+ OUString sJRE;
+ OUString sEnvJRE;
sal_Bool bJRE = Bootstrap::get()->getFrom(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME)) ,sJRE);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME)) ,sJRE);
sal_Bool bEnvJRE = Bootstrap::get()->getFrom(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME)) ,sEnvJRE);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME)) ,sEnvJRE);
if (bJRE == sal_True && bEnvJRE == sal_True)
{
throw FrameworkException(
JFW_E_CONFIGURATION,
- rtl::OString("[Java framework] Both bootstrap parameter "
+ OString("[Java framework] Both bootstrap parameter "
UNO_JAVA_JFW_JREHOME" and "
UNO_JAVA_JFW_ENV_JREHOME" are set. However only one of them can be set."
"Check bootstrap parameters: environment variables, command line "
@@ -459,16 +454,16 @@ rtl::OUString BootParams::getJREHome()
{
throw FrameworkException(
JFW_E_CONFIGURATION,
- rtl::OString("[Java framework] Both bootstrap parameter "
+ OString("[Java framework] Both bootstrap parameter "
UNO_JAVA_JFW_ENV_JREHOME" is set, but the environment variable "
"JAVA_HOME is not set."));
}
- rtl::OString osJRE(pJRE);
- rtl::OUString usJRE = rtl::OStringToOUString(osJRE, osl_getThreadTextEncoding());
+ OString osJRE(pJRE);
+ OUString usJRE = OStringToOUString(osJRE, osl_getThreadTextEncoding());
if (File::getFileURLFromSystemPath(usJRE, sJRE) != File::E_None)
throw FrameworkException(
JFW_E_ERROR,
- rtl::OString("[Java framework] Error in function BootParams::getJREHome() "
+ OString("[Java framework] Error in function BootParams::getJREHome() "
"(fwkbase.cxx)."));
#if OSL_DEBUG_LEVEL >=2
fprintf(stderr,"[Java framework] Using bootstrap parameter "
@@ -481,7 +476,7 @@ rtl::OUString BootParams::getJREHome()
{
throw FrameworkException(
JFW_E_CONFIGURATION,
- rtl::OString("[Java framework] The bootstrap parameter "
+ OString("[Java framework] The bootstrap parameter "
UNO_JAVA_JFW_ENV_JREHOME" or " UNO_JAVA_JFW_JREHOME
" must be set in direct mode."));
}
@@ -489,7 +484,7 @@ rtl::OUString BootParams::getJREHome()
#if OSL_DEBUG_LEVEL >=2
if (bJRE == sal_True)
{
- rtl::OString sValue = rtl::OUStringToOString(sJRE, osl_getThreadTextEncoding());
+ OString sValue = OUStringToOString(sJRE, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework] Using bootstrap parameter "
UNO_JAVA_JFW_JREHOME" = %s.\n", sValue.getStr());
}
@@ -497,14 +492,14 @@ rtl::OUString BootParams::getJREHome()
return sJRE;
}
-rtl::OUString BootParams::getClasspathUrls()
+OUString BootParams::getClasspathUrls()
{
- rtl::OUString sParams;
+ OUString sParams;
Bootstrap::get()->getFrom(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH_URLS)),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH_URLS)),
sParams);
#if OSL_DEBUG_LEVEL >=2
- rtl::OString sValue = rtl::OUStringToOString(sParams, osl_getThreadTextEncoding());
+ OString sValue = OUStringToOString(sParams, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework] Using bootstrap parameter "
UNO_JAVA_JFW_CLASSPATH_URLS " = %s.\n", sValue.getStr());
#endif
@@ -520,27 +515,27 @@ JFW_MODE getMode()
{
//check if either of the "direct mode" bootstrap variables is set
bool bDirectMode = true;
- rtl::OUString sValue;
+ OUString sValue;
const rtl::Bootstrap * aBoot = Bootstrap::get();
- rtl::OUString sJREHome(
+ OUString sJREHome(
RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME));
if (aBoot->getFrom(sJREHome, sValue) == sal_False)
{
- rtl::OUString sEnvJRE(
+ OUString sEnvJRE(
RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME));
if (aBoot->getFrom(sEnvJRE, sValue) == sal_False)
{
- rtl::OUString sClasspath(
+ OUString sClasspath(
RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH));
if (aBoot->getFrom(sClasspath, sValue) == sal_False)
{
- rtl::OUString sEnvClasspath(
+ OUString sEnvClasspath(
RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH));
if (aBoot->getFrom(sEnvClasspath, sValue) == sal_False)
{
- rtl::OUString sParams = rtl::OUString(
+ OUString sParams = OUString(
RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_PARAMETER)) +
- rtl::OUString::valueOf((sal_Int32)1);
+ OUString::valueOf((sal_Int32)1);
if (aBoot->getFrom(sParams, sValue) == sal_False)
{
bDirectMode = false;
@@ -560,23 +555,23 @@ JFW_MODE getMode()
return g_mode;
}
-rtl::OUString getApplicationClassPath()
+OUString getApplicationClassPath()
{
OSL_ASSERT(getMode() == JFW_MODE_APPLICATION);
- rtl::OUString retVal;
- rtl::OUString sParams = BootParams::getClasspathUrls();
+ OUString retVal;
+ OUString sParams = BootParams::getClasspathUrls();
if (sParams.isEmpty())
return retVal;
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
sal_Int32 index = 0;
char szClassPathSep[] = {SAL_PATHSEPARATOR,0};
do
{
- ::rtl::OUString token( sParams.getToken( 0, ' ', index ).trim() );
+ OUString token( sParams.getToken( 0, ' ', index ).trim() );
if (!token.isEmpty())
{
- ::rtl::OUString systemPathElement;
+ OUString systemPathElement;
oslFileError rc = osl_getSystemPathFromFileURL(
token.pData, &systemPathElement.pData );
OSL_ASSERT( rc == osl_File_E_None );
@@ -593,11 +588,11 @@ rtl::OUString getApplicationClassPath()
return buf.makeStringAndClear();
}
-rtl::OString makeClassPathOption(OUString const & sUserClassPath)
+OString makeClassPathOption(OUString const & sUserClassPath)
{
//Compose the class path
- rtl::OString sPaths;
- rtl::OUStringBuffer sBufCP(4096);
+ OString sPaths;
+ OUStringBuffer sBufCP(4096);
// append all user selected jars to the class path
if (!sUserClassPath.isEmpty())
@@ -615,38 +610,38 @@ rtl::OString makeClassPathOption(OUString const & sUserClassPath)
sBufCP.append(sAppCP);
}
- sPaths = rtl::OUStringToOString(
+ sPaths = OUStringToOString(
sBufCP.makeStringAndClear(), osl_getThreadTextEncoding());
- rtl::OString sOptionClassPath("-Djava.class.path=");
+ OString sOptionClassPath("-Djava.class.path=");
sOptionClassPath += sPaths;
return sOptionClassPath;
}
-rtl::OString getUserSettingsPath()
+OString getUserSettingsPath()
{
return getSettingsPath(BootParams::getUserData());
}
-rtl::OString getSharedSettingsPath()
+OString getSharedSettingsPath()
{
return getSettingsPath(BootParams::getSharedData());
}
-rtl::OString getSettingsPath( const rtl::OUString & sURL)
+OString getSettingsPath( const OUString & sURL)
{
if (sURL.isEmpty())
- return rtl::OString();
- rtl::OUString sPath;
+ return OString();
+ OUString sPath;
if (osl_getSystemPathFromFileURL(sURL.pData,
& sPath.pData) != osl_File_E_None)
throw FrameworkException(
- JFW_E_ERROR, rtl::OString(
+ JFW_E_ERROR, OString(
"[Java framework] Error in function ::getSettingsPath (fwkbase.cxx)."));
- return rtl::OUStringToOString(sPath,osl_getThreadTextEncoding());
+ return OUStringToOString(sPath,osl_getThreadTextEncoding());
}
-rtl::OString getVendorSettingsPath()
+OString getVendorSettingsPath()
{
return getVendorSettingsPath(BootParams::getVendorSettings());
}
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 9eb0f0648f47..45a7dd2ac8c5 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -27,7 +27,7 @@ namespace jfw
class VendorSettings
{
- ::rtl::OUString m_xmlDocVendorSettingsFileUrl;
+ OUString m_xmlDocVendorSettingsFileUrl;
CXmlDocPtr m_xmlDocVendorSettings;
CXPathContextPtr m_xmlPathContextVendorSettings;
@@ -45,11 +45,11 @@ public:
/* returns the file URL to the plugin.
*/
- ::rtl::OUString getPluginLibrary(const ::rtl::OUString& sVendor);
+ OUString getPluginLibrary(const OUString& sVendor);
- VersionInfo getVersionInformation(const ::rtl::OUString & sVendor);
+ VersionInfo getVersionInformation(const OUString & sVendor);
- ::std::vector< ::rtl::OUString> getSupportedVendors();
+ ::std::vector< OUString> getSupportedVendors();
};
/* The class offers functions to retrieve verified bootstrap parameters.
@@ -62,24 +62,24 @@ namespace BootParams
In direct mode either of them must be set. If not an exception is thrown.
*/
-::rtl::OUString getJREHome();
+OUString getJREHome();
-::std::vector< ::rtl::OString> getVMParameters();
+::std::vector< OString> getVMParameters();
-::rtl::OUString getUserData();
+OUString getUserData();
-::rtl::OUString getSharedData();
+OUString getSharedData();
/* returns the file URL to the vendor settings xml file.
*/
-::rtl::OUString getVendorSettings();
+OUString getVendorSettings();
/* User the parameter UNO_JAVA_JFW_CLASSPATH and UNO_JAVA_JFW_ENV_CLASSPATH
to compose a classpath
*/
-::rtl::OString getClasspath();
+OString getClasspath();
-::rtl::OUString getClasspathUrls();
+OUString getClasspathUrls();
} //end namespace
@@ -97,9 +97,9 @@ JFW_MODE getMode();
/** creates the -Djava.class.path option with the complete classpath, including
the paths which are set by UNO_JAVA_JFW_CLASSPATH_URLS.
*/
-::rtl::OString makeClassPathOption(::rtl::OUString const & sUserClassPath);
+OString makeClassPathOption(OUString const & sUserClassPath);
-::rtl::OString getSettingsPath( const ::rtl::OUString & sURL);
+OString getSettingsPath( const OUString & sURL);
/** Get the system path to the javasettings.xml
Converts the URL returned from getUserSettingsURL to a
@@ -107,20 +107,20 @@ JFW_MODE getMode();
does not exist.
@throws FrameworkException
*/
-::rtl::OString getUserSettingsPath();
+OString getUserSettingsPath();
/** Returns the system path of the share settings file.
Returns a valid string or throws an exception.
@throws FrameworkException
*/
-::rtl::OString getSharedSettingsPath();
+OString getSharedSettingsPath();
/* returns a valid string or throws an exception.
@throws FrameworkException
*/
-::rtl::OString getVendorSettingsPath();
+OString getVendorSettingsPath();
-::rtl::OUString buildClassPathFromDirectory(const ::rtl::OUString & relPath);
+OUString buildClassPathFromDirectory(const OUString & relPath);
/** Called from writeJavaInfoData. It sets the process identifier. When
java is to be started, then the current id is compared to the one set by
@@ -137,7 +137,7 @@ void setJavaSelected();
bool wasJavaSelectedInSameProcess();
/* Only for application mode.
*/
-::rtl::OUString getApplicationClassPath();
+OUString getApplicationClassPath();
}
#endif
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 8caf06d3741f..36007eda93fd 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -49,9 +49,6 @@
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
namespace jfw
{
@@ -193,13 +190,13 @@ rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data)
return ret;
}
-rtl::OUString getDirFromFile(const rtl::OUString& usFilePath)
+OUString getDirFromFile(const OUString& usFilePath)
{
sal_Int32 index= usFilePath.lastIndexOf('/');
- return rtl::OUString(usFilePath.getStr(), index);
+ return OUString(usFilePath.getStr(), index);
}
-rtl::OUString getExecutableDirectory()
+OUString getExecutableDirectory()
{
rtl_uString* sExe = NULL;
if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
@@ -207,14 +204,14 @@ rtl::OUString getExecutableDirectory()
JFW_E_ERROR,
"[Java framework] Error in function getExecutableDirectory (fwkutil.cxx)");
- rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
+ OUString ouExe(sExe, SAL_NO_ACQUIRE);
return getDirFromFile(ouExe);
}
-rtl::OUString findPlugin(
- const rtl::OUString & baseUrl, const rtl::OUString & plugin)
+OUString findPlugin(
+ const OUString & baseUrl, const OUString & plugin)
{
- rtl::OUString expandedPlugin;
+ OUString expandedPlugin;
try
{
expandedPlugin = cppu::bootstrap_expandUri(plugin);
@@ -223,13 +220,13 @@ rtl::OUString findPlugin(
{
throw FrameworkException(
JFW_E_ERROR,
- (rtl::OString(
+ (OString(
RTL_CONSTASCII_STRINGPARAM(
"[Java framework] IllegalArgumentException in"
" findPlugin: "))
- + rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding())));
+ + OUStringToOString(e.Message, osl_getThreadTextEncoding())));
}
- rtl::OUString sUrl;
+ OUString sUrl;
try
{
sUrl = rtl::Uri::convertRelToAbs(baseUrl, expandedPlugin);
@@ -238,20 +235,20 @@ rtl::OUString findPlugin(
{
throw FrameworkException(
JFW_E_ERROR,
- (rtl::OString(
+ (OString(
RTL_CONSTASCII_STRINGPARAM(
"[Java framework] rtl::MalformedUriException in"
" findPlugin: "))
- + rtl::OUStringToOString(
+ + OUStringToOString(
e.getMessage(), osl_getThreadTextEncoding())));
}
if (checkFileURL(sUrl) == jfw::FILE_OK)
{
return sUrl;
}
- rtl::OUString retVal;
- rtl::OUString sProgDir = getExecutableDirectory();
- sUrl = sProgDir + rtl::OUString("/")
+ OUString retVal;
+ OUString sProgDir = getExecutableDirectory();
+ sUrl = sProgDir + OUString("/")
+ plugin;
jfw::FileStatus s = checkFileURL(sUrl);
if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
@@ -260,16 +257,16 @@ rtl::OUString findPlugin(
//use PATH, LD_LIBRARY_PATH etc. to locate the plugin
if (plugin.indexOf('/') == -1)
{
- rtl::OUString url;
+ OUString url;
#ifdef UNX
#if defined(MACOSX)
- rtl::OUString path = rtl::OUString("DYLD_LIBRARY_PATH");
+ OUString path = OUString("DYLD_LIBRARY_PATH");
#elif defined(AIX)
- rtl::OUString path = rtl::OUString("LIBPATH");
+ OUString path = OUString("LIBPATH");
#else
- rtl::OUString path = rtl::OUString("LD_LIBRARY_PATH");
+ OUString path = OUString("LD_LIBRARY_PATH");
#endif
- rtl::OUString env_path;
+ OUString env_path;
oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);
if (err != osl_Process_E_None && err != osl_Process_E_NotFound)
throw FrameworkException(
@@ -297,11 +294,11 @@ rtl::OUString findPlugin(
return retVal;
}
-rtl::OUString getLibraryLocation()
+OUString getLibraryLocation()
{
- rtl::OString sExcMsg("[Java framework] Error in function getLibraryLocation "
+ OString sExcMsg("[Java framework] Error in function getLibraryLocation "
"(fwkutil.cxx).");
- rtl::OUString libraryFileUrl;
+ OUString libraryFileUrl;
if (!osl::Module::getUrlFromAddress(
reinterpret_cast< oslGenericFunction >(getLibraryLocation),
@@ -311,7 +308,7 @@ rtl::OUString getLibraryLocation()
return getDirFromFile(libraryFileUrl);
}
-jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
+jfw::FileStatus checkFileURL(const OUString & sURL)
{
jfw::FileStatus ret = jfw::FILE_OK;
DirectoryItem item;
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 1509fb74e89d..0411869f8b72 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -37,7 +37,7 @@ namespace jfw
/** Returns the file URL of the directory where the framework library
(this library) resides.
*/
-rtl::OUString getLibraryLocation();
+OUString getLibraryLocation();
/** provides a bootstrap class which already knows the values from the
jvmfkwrc file.
@@ -45,13 +45,13 @@ rtl::OUString getLibraryLocation();
struct Bootstrap :
public ::rtl::StaticWithInit< const rtl::Bootstrap *, Bootstrap > {
const rtl::Bootstrap * operator () () {
- ::rtl::OUStringBuffer buf(256);
+ OUStringBuffer buf(256);
buf.append(getLibraryLocation());
buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));
- ::rtl::OUString sIni = buf.makeStringAndClear();
+ OUString sIni = buf.makeStringAndClear();
::rtl::Bootstrap * bootstrap = new ::rtl::Bootstrap(sIni);
#if OSL_DEBUG_LEVEL >=2
- rtl::OString o = rtl::OUStringToOString( sIni , osl_getThreadTextEncoding() );
+ OString o = OUStringToOString( sIni , osl_getThreadTextEncoding() );
fprintf(stderr, "[Java framework] Using configuration file %s\n" , o.getStr() );
#endif
return bootstrap;
@@ -63,14 +63,14 @@ struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {};
rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData);
rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data);
-rtl::OUString getPlatform();
+OUString getPlatform();
-rtl::OUString getDirFromFile(const rtl::OUString& usFilePath);
+OUString getDirFromFile(const OUString& usFilePath);
/** Returns the file URL of the folder where the executable resides.
*/
-rtl::OUString getExecutableDirectory();
+OUString getExecutableDirectory();
/** Locates the plugin library and returns the file URL.
First tries to locate plugin relative to baseUrl (if relative);
@@ -85,8 +85,8 @@ rtl::OUString getExecutableDirectory();
@param plugin
The argument is an absolute or relative URL or just the name of the plugin.
*/
-rtl::OUString findPlugin(
- const rtl::OUString & baseUrl, const rtl::OUString & plugin);
+OUString findPlugin(
+ const OUString & baseUrl, const OUString & plugin);
enum FileStatus
@@ -110,13 +110,13 @@ enum FileStatus
@exception
Errors occurred during determining if the file exists
*/
-FileStatus checkFileURL(const rtl::OUString & path);
+FileStatus checkFileURL(const OUString & path);
bool isAccessibilitySupportDesired();
-rtl::OUString buildClassPathFromDirectory(const rtl::OUString & relPath);
+OUString buildClassPathFromDirectory(const OUString & relPath);
-rtl::OUString retrieveClassPath( ::rtl::OUString const & macro );
+OUString retrieveClassPath( OUString const & macro );
}
#endif
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index a9ea83e24e7c..30b1d078ce2c 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -124,10 +124,10 @@ CXmlCharPtr::CXmlCharPtr(xmlChar * aChar)
{
}
-CXmlCharPtr::CXmlCharPtr(const ::rtl::OUString & s):
+CXmlCharPtr::CXmlCharPtr(const OUString & s):
_object(NULL)
{
- ::rtl::OString o = ::rtl::OUStringToOString(s, RTL_TEXTENCODING_UTF8);
+ OString o = OUStringToOString(s, RTL_TEXTENCODING_UTF8);
_object = xmlCharStrdup(o.getStr());
}
CXmlCharPtr::CXmlCharPtr():_object(NULL)
@@ -153,20 +153,20 @@ CXmlCharPtr::operator xmlChar*() const
return _object;
}
-CXmlCharPtr::operator ::rtl::OUString()
+CXmlCharPtr::operator OUString()
{
- ::rtl::OUString ret;
+ OUString ret;
if (_object != NULL)
{
- ::rtl::OString aOStr((sal_Char*)_object);
- ret = ::rtl::OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8);
+ OString aOStr((sal_Char*)_object);
+ ret = OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8);
}
return ret;
}
-CXmlCharPtr::operator ::rtl::OString()
+CXmlCharPtr::operator OString()
{
- return ::rtl::OString((sal_Char*) _object);
+ return OString((sal_Char*) _object);
}
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 7035f2ed9698..4ee92d18c73e 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -88,12 +88,12 @@ class CXmlCharPtr
public:
CXmlCharPtr();
CXmlCharPtr(xmlChar* aDoc);
- CXmlCharPtr(const ::rtl::OUString &);
+ CXmlCharPtr(const OUString &);
~CXmlCharPtr();
CXmlCharPtr & operator = (xmlChar* pObj);
operator xmlChar* () const;
- operator ::rtl::OUString ();
- operator ::rtl::OString ();
+ operator OUString ();
+ operator OString ();
};
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index bbe68eb14f85..c34ba06d5f9c 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -28,7 +28,7 @@
#include "boost/unordered_map.hpp"
#include "po.hxx"
-typedef boost::unordered_map<rtl::OString, rtl::OString, rtl::OStringHash> OStringHashMap;
+typedef boost::unordered_map<OString, OString, OStringHash> OStringHashMap;
//
@@ -41,22 +41,22 @@ friend class CfgParser;
friend class CfgExport;
friend class CfgMerge;
private:
- rtl::OString sTagType;
- rtl::OString sIdentifier;
+ OString sTagType;
+ OString sIdentifier;
- rtl::OString sResTyp;
+ OString sResTyp;
- rtl::OString sTextTag;
- rtl::OString sEndTextTag;
+ OString sTextTag;
+ OString sEndTextTag;
OStringHashMap sText;
public:
- CfgStackData(const rtl::OString &rTag, const rtl::OString &rId)
+ CfgStackData(const OString &rTag, const OString &rId)
: sTagType( rTag ), sIdentifier( rId )
{}
- const rtl::OString &GetTagType() { return sTagType; }
- const rtl::OString &GetIdentifier() { return sIdentifier; }
+ const OString &GetTagType() { return sTagType; }
+ const OString &GetIdentifier() { return sIdentifier; }
};
@@ -75,7 +75,7 @@ public:
CfgStack() {}
~CfgStack();
- CfgStackData *Push(const rtl::OString &rTag, const rtl::OString &rId);
+ CfgStackData *Push(const OString &rTag, const OString &rId);
CfgStackData *Pop()
{
if (maList.empty())
@@ -87,7 +87,7 @@ public:
CfgStackData *GetStackData();
- rtl::OString GetAccessPath( size_t nPos );
+ OString GetAccessPath( size_t nPos );
size_t size() const { return maList.size(); }
};
@@ -99,11 +99,11 @@ public:
class CfgParser
{
protected:
- rtl::OString sCurrentResTyp;
- rtl::OString sCurrentIsoLang;
- rtl::OString sCurrentText;
+ OString sCurrentResTyp;
+ OString sCurrentIsoLang;
+ OString sCurrentText;
- rtl::OString sLastWhitespace;
+ OString sLastWhitespace;
CfgStack aStack;
CfgStackData *pStackData;
@@ -111,24 +111,24 @@ protected:
sal_Bool bLocalize;
virtual void WorkOnText(
- rtl::OString &rText,
- const rtl::OString &rLangIndex )=0;
+ OString &rText,
+ const OString &rLangIndex )=0;
virtual void WorkOnResourceEnd()=0;
- virtual void Output(const rtl::OString & rOutput)=0;
+ virtual void Output(const OString & rOutput)=0;
- void Error(const rtl::OString &rError);
+ void Error(const OString &rError);
private:
int ExecuteAnalyzedToken( int nToken, char *pToken );
- std::vector<rtl::OString> aLanguages;
+ std::vector<OString> aLanguages;
void AddText(
- rtl::OString &rText,
- const rtl::OString &rIsoLang,
- const rtl::OString &rResTyp );
+ OString &rText,
+ const OString &rIsoLang,
+ const OString &rResTyp );
- sal_Bool IsTokenClosed(const rtl::OString &rToken);
+ sal_Bool IsTokenClosed(const OString &rToken);
public:
CfgParser();
@@ -144,19 +144,19 @@ public:
class CfgExport : public CfgParser
{
private:
- rtl::OString sPath;
- std::vector<rtl::OString> aLanguages;
+ OString sPath;
+ std::vector<OString> aLanguages;
PoOfstream pOutputStream;
protected:
virtual void WorkOnText(
- rtl::OString &rText,
- const rtl::OString &rIsoLang
+ OString &rText,
+ const OString &rIsoLang
);
void WorkOnResourceEnd();
- void Output(const rtl::OString& rOutput);
+ void Output(const OString& rOutput);
public:
CfgExport(
const OString &rOutputFile,
@@ -174,20 +174,20 @@ class CfgMerge : public CfgParser
{
private:
MergeDataFile *pMergeDataFile;
- std::vector<rtl::OString> aLanguages;
+ std::vector<OString> aLanguages;
ResData *pResData;
- rtl::OString sFilename;
+ OString sFilename;
sal_Bool bEnglish;
std::ofstream pOutputStream;
protected:
- virtual void WorkOnText(rtl::OString &rText, const rtl::OString &rLangIndex);
+ virtual void WorkOnText(OString &rText, const OString &rLangIndex);
void WorkOnResourceEnd();
- void Output(const rtl::OString& rOutput);
+ void Output(const OString& rOutput);
public:
CfgMerge(
const OString &rMergeSource, const OString &rOutputFile,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 8dc9ab8a3273..9575dcda564e 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -46,16 +46,16 @@
class PFormEntrys;
class MergeData;
-typedef boost::unordered_map<rtl::OString, rtl::OString, rtl::OStringHash>
+typedef boost::unordered_map<OString, OString, OStringHash>
OStringHashMap;
-typedef boost::unordered_map<rtl::OString, bool, rtl::OStringHash>
+typedef boost::unordered_map<OString, bool, OStringHash>
OStringBoolHashMap;
-typedef boost::unordered_map<rtl::OString, PFormEntrys*, rtl::OStringHash>
+typedef boost::unordered_map<OString, PFormEntrys*, OStringHash>
PFormEntrysHashMap;
-typedef boost::unordered_map<rtl::OString, MergeData*, rtl::OStringHash>
+typedef boost::unordered_map<OString, MergeData*, OStringHash>
MergeDataHashMap;
#define SOURCE_LANGUAGE "en-US"
@@ -109,10 +109,10 @@ public:
class ResData
{
public:
- ResData(const rtl::OString &rPF, const rtl::OString &rGId);
- ResData(const rtl::OString &rPF, const rtl::OString &rGId , const rtl::OString &rFilename);
+ ResData(const OString &rPF, const OString &rGId);
+ ResData(const OString &rPF, const OString &rGId , const OString &rFilename);
~ResData();
- sal_Bool SetId(const rtl::OString &rId, sal_uInt16 nLevel);
+ sal_Bool SetId(const OString &rId, sal_uInt16 nLevel);
sal_Int32 nWidth;
sal_uInt16 nChildIndex;
@@ -128,11 +128,11 @@ public:
sal_Bool bRestMerged;
- rtl::OString sResTyp;
- rtl::OString sId;
- rtl::OString sGId;
- rtl::OString sHelpId;
- rtl::OString sFilename;
+ OString sResTyp;
+ OString sId;
+ OString sGId;
+ OString sHelpId;
+ OString sFilename;
OStringHashMap sText;
sal_uInt16 nTextRefId;
@@ -146,7 +146,7 @@ public:
OStringHashMap sTitle;
sal_uInt16 nTitleRefId;
- rtl::OString sTextTyp;
+ OString sTextTyp;
ExportList *pStringList;
ExportList *pUIEntries;
@@ -154,7 +154,7 @@ public:
ExportList *pFilterList;
ExportList *pPairedList;
- rtl::OString sPForm;
+ OString sPForm;
};
@@ -196,57 +196,57 @@ private:
ResStack aResStack; // stack for parsing recursive
- rtl::OString sActPForm; // hold cur. system
+ OString sActPForm; // hold cur. system
sal_Bool bDefine; // cur. res. in a define?
sal_Bool bNextMustBeDefineEOL; // define but no \ at lineend
std::size_t nLevel; // res. recursiv? how deep?
sal_uInt16 nList; // cur. res. is String- or FilterList
- rtl::OString m_sListLang;
+ OString m_sListLang;
std::size_t nListIndex;
std::size_t nListLevel;
bool bSkipFile;
sal_Bool bMergeMode;
- rtl::OString sMergeSrc;
- rtl::OString sLastListLine;
+ OString sMergeSrc;
+ OString sLastListLine;
sal_Bool bError; // any errors while export?
sal_Bool bReadOver;
sal_Bool bDontWriteOutput;
- rtl::OString sLastTextTyp;
+ OString sLastTextTyp;
bool isInitialized;
- rtl::OString sFilename;
- rtl::OString sLanguages;
+ OString sFilename;
+ OString sLanguages;
- std::vector<rtl::OString> aLanguages;
+ std::vector<OString> aLanguages;
sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False );// called befor dest. cur ResData
sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
- const rtl::OString &rTyp, sal_Bool bCreateNew = sal_False );
+ const OString &rTyp, sal_Bool bCreateNew = sal_False );
- rtl::OString MergePairedList( rtl::OString const & sLine , rtl::OString const & sText );
+ OString MergePairedList( OString const & sLine , OString const & sText );
- rtl::OString FullId(); // creates cur. GID
+ OString FullId(); // creates cur. GID
- rtl::OString GetPairedListID(const rtl::OString & rText);
- rtl::OString GetPairedListString(const rtl::OString& rText);
- rtl::OString StripList(const rtl::OString& rText);
+ OString GetPairedListID(const OString & rText);
+ OString GetPairedListString(const OString& rText);
+ OString StripList(const OString& rText);
- void InsertListEntry(const rtl::OString &rText, const rtl::OString &rLine);
- void CleanValue( rtl::OString &rValue );
- rtl::OString GetText(const rtl::OString &rSource, int nToken);
+ void InsertListEntry(const OString &rText, const OString &rLine);
+ void CleanValue( OString &rValue );
+ OString GetText(const OString &rSource, int nToken);
- sal_Bool PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
- rtl::OString &rLangIndex, ResData *pResData);
- void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const rtl::OString& rTextType );
+ sal_Bool PrepareTextToMerge(OString &rText, sal_uInt16 nTyp,
+ OString &rLangIndex, ResData *pResData);
+ void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString& rTextType );
void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
- void ConvertMergeContent( rtl::OString &rText );
+ void ConvertMergeContent( OString &rText );
- void WriteToMerged(const rtl::OString &rText , bool bSDFContent);
+ void WriteToMerged(const OString &rText , bool bSDFContent);
void SetChildWithText();
void InitLanguages( bool bMergeMode = false );
- void CutComment( rtl::OString &rText );
+ void CutComment( OString &rText );
public:
Export(const OString &rOutput, const OString &rLanguage);
@@ -273,8 +273,8 @@ class PFormEntrys
{
friend class MergeDataFile;
private:
- rtl::OString data_; //TODO
- rtl::OString sHelpText; // empty string
+ OString data_; //TODO
+ OString sHelpText; // empty string
OStringHashMap sText;
OStringBoolHashMap bTextFirst;
OStringHashMap sQuickHelpText;
@@ -283,9 +283,9 @@ private:
OStringBoolHashMap bTitleFirst;
public:
- PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
- void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
- const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
+ PFormEntrys( const OString &rPForm ) : data_( rPForm ) {};
+ void InsertEntry(const OString &rId, const OString &rText,
+ const OString &rQuickHelpText, const OString &rTitle)
{
sText[ rId ] = rText;
@@ -295,8 +295,8 @@ public:
sTitle[ rId ] = rTitle;
bTitleFirst[ rId ] = true;
}
- sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
- sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
+ sal_Bool GetText( OString &rReturn, sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel = sal_False );
+ sal_Bool GetTransex3Text( OString &rReturn, sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel = sal_False );
};
@@ -313,19 +313,19 @@ class MergeDataFile;
class MergeData
{
public:
- rtl::OString sTyp;
- rtl::OString sGID;
- rtl::OString sLID;
- rtl::OString sFilename;
+ OString sTyp;
+ OString sGID;
+ OString sLID;
+ OString sFilename;
PFormEntrysHashMap aMap;
public:
- MergeData( const rtl::OString &rTyp, const rtl::OString &rGID, const rtl::OString &rLID , const rtl::OString &rFilename )
+ MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename )
: sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename ) {};
~MergeData();
PFormEntrys* GetPFormEntries();
void Insert( PFormEntrys* pfEntrys );
- PFormEntrys* GetPFObject( const rtl::OString &rPFO );
+ PFormEntrys* GetPFObject( const OString &rPFO );
sal_Bool operator==( ResData *pData );
};
@@ -341,43 +341,43 @@ public:
class MergeDataFile
{
private:
- rtl::OString sErrorLog;
+ OString sErrorLog;
MergeDataHashMap aMap;
- std::set<rtl::OString> aLanguageSet;
+ std::set<OString> aLanguageSet;
MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
- void InsertEntry(const rtl::OString &rTYP, const rtl::OString &rGID,
- const rtl::OString &rLID, const rtl::OString &rPFO,
- const rtl::OString &nLang, const rtl::OString &rTEXT,
- const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
- const rtl::OString &sFilename, bool bCaseSensitive);
+ void InsertEntry(const OString &rTYP, const OString &rGID,
+ const OString &rLID, const OString &rPFO,
+ const OString &nLang, const OString &rTEXT,
+ const OString &rQHTEXT, const OString &rTITLE,
+ const OString &sFilename, bool bCaseSensitive);
public:
explicit MergeDataFile(
- const rtl::OString &rFileName, const rtl::OString& rFile,
+ const OString &rFileName, const OString& rFile,
bool bCaseSensitive, bool bWithQtz = true );
~MergeDataFile();
- std::vector<rtl::OString> GetLanguages() const;
+ std::vector<OString> GetLanguages() const;
const MergeDataHashMap& getMap() const { return aMap; }
PFormEntrys *GetPFormEntrys( ResData *pResData );
PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
- static rtl::OString CreateKey(const rtl::OString& rTYP, const rtl::OString& rGID,
- const rtl::OString& rLID, const rtl::OString& rFilename , bool bCaseSensitive = false);
+ static OString CreateKey(const OString& rTYP, const OString& rGID,
+ const OString& rLID, const OString& rFilename , bool bCaseSensitive = false);
};
class QueueEntry
{
public:
- QueueEntry(int nTypVal, const rtl::OString &rLineVal)
+ QueueEntry(int nTypVal, const OString &rLineVal)
: nTyp(nTypVal), sLine(rLineVal)
{
}
int nTyp;
- rtl::OString sLine;
+ OString sLine;
};
class ParserQueue
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 1f11726182f6..95aad6d15ab3 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -27,18 +27,18 @@
class HelpParser
{
private:
- rtl::OString sHelpFile;
+ OString sHelpFile;
#if OSL_DEBUG_LEVEL > 2
/// Debugmethod, prints the content of the map to stdout
- static void Dump(LangHashMap* rElem_in , const rtl::OString & sKey_in);
+ static void Dump(LangHashMap* rElem_in , const OString & sKey_in);
/// Debugmethod, prints the content of the map to stdout
static void Dump(XMLHashMap* rElem_in);
#endif
public:
- HelpParser( const rtl::OString &rHelpFile );
+ HelpParser( const OString &rHelpFile );
~HelpParser(){};
/// Method append a PO file with the content of a parsed XML file
@@ -48,13 +48,13 @@ public:
/// Method merges the String from the POfile into XMLfile. Both Strings must
/// point to existing files.
- bool Merge( const rtl::OString &rPOFile_in, const rtl::OString &rDestinationFile_in ,
- const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile );
+ bool Merge( const OString &rPOFile_in, const OString &rDestinationFile_in ,
+ const OString& sLanguage , MergeDataFile& aMergeDataFile );
private:
- bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage , rtl::OString const & sPath );
+ bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const OString& sLanguage , OString const & sPath );
- void ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
+ void ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 8c5940cbdfee..8441824339ba 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -25,7 +25,7 @@
#include "common.hxx"
#include "export.hxx"
-typedef std::vector< rtl::OString* > LngLineList;
+typedef std::vector< OString* > LngLineList;
#define LNG_OK 0x0000
#define LNG_COULD_NOT_OPEN 0x0001
@@ -39,17 +39,17 @@ class LngParser
private:
sal_uInt16 nError;
LngLineList *pLines;
- rtl::OString sSource;
+ OString sSource;
sal_Bool bULF;
- std::vector<rtl::OString> aLanguages;
+ std::vector<OString> aLanguages;
- bool isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in);
- void ReadLine(const rtl::OString &rLine_in,
+ bool isNextGroup(OString &sGroup_out, const OString &sLine_in);
+ void ReadLine(const OString &rLine_in,
OStringHashMap &rText_inout);
void WritePO(PoOfstream &aPOStream, OStringHashMap &rText_inout,
- const rtl::OString &rActFileName, const rtl::OString &rID);
+ const OString &rActFileName, const OString &rID);
public:
- LngParser(const rtl::OString &rLngFile,
+ LngParser(const OString &rLngFile,
sal_Bool bULFFormat);
~LngParser();
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 55867d3f70ab..8daf546fcc7f 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -56,21 +56,21 @@ using namespace std;
class XMLAttribute
{
private:
- rtl::OUString sName;
- rtl::OUString sValue;
+ OUString sName;
+ OUString sValue;
public:
/// creates an attribute
XMLAttribute(
- const rtl::OUString &rName, // attributes name
- const rtl::OUString &rValue // attributes data
+ const OUString &rName, // attributes name
+ const OUString &rValue // attributes data
)
: sName( rName ), sValue( rValue ) {}
- rtl::OUString GetName() const { return sName; }
- rtl::OUString GetValue() const { return sValue; }
+ OUString GetName() const { return sName; }
+ OUString GetValue() const { return sValue; }
- void setValue(const rtl::OUString &rValue){sValue=rValue;}
+ void setValue(const OUString &rValue){sValue=rValue;}
/// returns true if two attributes are equal and have the same value
sal_Bool IsEqual(
@@ -164,16 +164,16 @@ public:
//-------------------------------------------------------------------------
/// Mapping numeric Language code <-> XML Element
-typedef boost::unordered_map<rtl::OString, XMLElement*, rtl::OStringHash> LangHashMap;
+typedef boost::unordered_map<OString, XMLElement*, OStringHash> LangHashMap;
/// Mapping XML Element string identifier <-> Language Map
-typedef boost::unordered_map<rtl::OString, LangHashMap*, rtl::OStringHash> XMLHashMap;
+typedef boost::unordered_map<OString, LangHashMap*, OStringHash> XMLHashMap;
/// Mapping iso alpha string code <-> iso numeric code
-typedef boost::unordered_map<rtl::OString, int, rtl::OStringHash> HashMap;
+typedef boost::unordered_map<OString, int, OStringHash> HashMap;
/// Mapping XML tag names <-> have localizable strings
-typedef boost::unordered_map<rtl::OString, sal_Bool, rtl::OStringHash> TagMap;
+typedef boost::unordered_map<OString, sal_Bool, OStringHash> TagMap;
/** Holds information of a XML file, is root node of tree
*/
@@ -183,7 +183,7 @@ class XMLFile : public XMLParentNode
{
public:
XMLFile(
- const rtl::OUString &rFileName // the file name, empty if created from memory stream
+ const OUString &rFileName // the file name, empty if created from memory stream
);
XMLFile( const XMLFile& obj ) ;
~XMLFile();
@@ -193,7 +193,7 @@ public:
void Extract( XMLFile *pCur = NULL );
XMLHashMap* GetStrings(){return XMLStrings;}
- void Write( rtl::OString const &rFilename );
+ void Write( OString const &rFilename );
sal_Bool Write( ofstream &rStream , XMLNode *pCur = NULL );
bool CheckExportStatus( XMLParentNode *pCur = NULL );// , int pos = 0 );
@@ -203,25 +203,25 @@ public:
virtual sal_uInt16 GetNodeType();
/// returns file name
- rtl::OUString GetName() { return sFileName; }
- void SetName( const rtl::OUString &rFilename ) { sFileName = rFilename; }
- const std::vector<rtl::OString> getOrder(){ return order; }
+ OUString GetName() { return sFileName; }
+ void SetName( const OUString &rFilename ) { sFileName = rFilename; }
+ const std::vector<OString> getOrder(){ return order; }
protected:
// writes a string as UTF8 with dos line ends to a given stream
- void WriteString( ofstream &rStream, const rtl::OUString &sString );
+ void WriteString( ofstream &rStream, const OUString &sString );
void InsertL10NElement( XMLElement* pElement);
// DATA
- rtl::OUString sFileName;
+ OUString sFileName;
- const rtl::OString ID, OLDREF, XML_LANG;
+ const OString ID, OLDREF, XML_LANG;
TagMap nodes_localize;
XMLHashMap* XMLStrings;
- std::vector <rtl::OString> order;
+ std::vector <OString> order;
};
/// An Utility class for XML
@@ -245,9 +245,9 @@ public:
class XMLElement : public XMLParentNode
{
private:
- rtl::OUString sElementName;
+ OUString sElementName;
XMLAttributeList *pAttributes;
- rtl::OString project,
+ OString project,
filename,
id,
sOldRef,
@@ -261,7 +261,7 @@ public:
/// create a element node
XMLElement(){}
XMLElement(
- const rtl::OUString &rName, // the element name
+ const OUString &rName, // the element name
XMLParentNode *Parent // parent node of this element
): XMLParentNode( Parent ),
sElementName( rName ),
@@ -283,34 +283,34 @@ public:
virtual sal_uInt16 GetNodeType();
/// returns element name
- rtl::OUString GetName() { return sElementName; }
+ OUString GetName() { return sElementName; }
/// returns list of attributes of this element
XMLAttributeList *GetAttributeList() { return pAttributes; }
/// adds a new attribute to this element, typically used by parser
- void AddAttribute( const rtl::OUString &rAttribute, const rtl::OUString &rValue );
+ void AddAttribute( const OUString &rAttribute, const OUString &rValue );
- void ChangeLanguageTag( const rtl::OUString &rValue );
+ void ChangeLanguageTag( const OUString &rValue );
// Return a Unicode String representation of this object
OUString ToOUString();
- void SetProject ( rtl::OString const & prj ){ project = prj; }
- void SetFileName ( rtl::OString const & fn ){ filename = fn; }
- void SetId ( rtl::OString const & theId ){ id = theId; }
- void SetResourceType ( rtl::OString const & rt ){ resourceType = rt; }
- void SetLanguageId ( rtl::OString const & lid ){ languageId = lid; }
+ void SetProject ( OString const & prj ){ project = prj; }
+ void SetFileName ( OString const & fn ){ filename = fn; }
+ void SetId ( OString const & theId ){ id = theId; }
+ void SetResourceType ( OString const & rt ){ resourceType = rt; }
+ void SetLanguageId ( OString const & lid ){ languageId = lid; }
void SetPos ( int nPos_in ){ nPos = nPos_in; }
- void SetOldRef ( rtl::OString const & sOldRef_in ){ sOldRef = sOldRef_in; }
+ void SetOldRef ( OString const & sOldRef_in ){ sOldRef = sOldRef_in; }
virtual int GetPos() { return nPos; }
- rtl::OString GetProject() { return project; }
- rtl::OString GetFileName() { return filename; }
- rtl::OString GetId() { return id; }
- rtl::OString GetOldref() { return sOldRef; }
- rtl::OString GetResourceType(){ return resourceType; }
- rtl::OString GetLanguageId() { return languageId; }
+ OString GetProject() { return project; }
+ OString GetFileName() { return filename; }
+ OString GetId() { return id; }
+ OString GetOldref() { return sOldRef; }
+ OString GetResourceType(){ return resourceType; }
+ OString GetLanguageId() { return languageId; }
};
@@ -322,18 +322,18 @@ public:
class XMLData : public XMLChildNode
{
private:
- rtl::OUString sData;
+ OUString sData;
bool isNewCreated;
public:
/// create a data node
XMLData(
- const rtl::OUString &rData, // the initial data
+ const OUString &rData, // the initial data
XMLParentNode *Parent // the parent node of this data, typically a element node
)
: XMLChildNode( Parent ), sData( rData ) , isNewCreated ( false ){}
XMLData(
- const rtl::OUString &rData, // the initial data
+ const OUString &rData, // the initial data
XMLParentNode *Parent, // the parent node of this data, typically a element node
bool newCreated
)
@@ -345,12 +345,12 @@ public:
virtual sal_uInt16 GetNodeType();
/// returns the data
- rtl::OUString GetData() { return sData; }
+ OUString GetData() { return sData; }
bool isNew() { return isNewCreated; }
/// adds new character data to the existing one
void AddData(
- const rtl::OUString &rData // the new data
+ const OUString &rData // the new data
);
@@ -364,12 +364,12 @@ public:
class XMLComment : public XMLChildNode
{
private:
- rtl::OUString sComment;
+ OUString sComment;
public:
/// create a comment node
XMLComment(
- const rtl::OUString &rComment, // the comment
+ const OUString &rComment, // the comment
XMLParentNode *Parent // the parent node of this comemnt, typically a element node
)
: XMLChildNode( Parent ), sComment( rComment ) {}
@@ -381,7 +381,7 @@ public:
XMLComment& operator=(const XMLComment& obj);
/// returns the comment
- rtl::OUString GetComment() { return sComment; }
+ OUString GetComment() { return sComment; }
};
//-------------------------------------------------------------------------
@@ -391,12 +391,12 @@ public:
class XMLDefault : public XMLChildNode
{
private:
- rtl::OUString sDefault;
+ OUString sDefault;
public:
/// create a comment node
XMLDefault(
- const rtl::OUString &rDefault, // the comment
+ const OUString &rDefault, // the comment
XMLParentNode *Parent // the parent node of this comemnt, typically a element node
)
: XMLChildNode( Parent ), sDefault( rDefault ) {}
@@ -409,7 +409,7 @@ public:
virtual sal_uInt16 GetNodeType();
/// returns the comment
- rtl::OUString GetDefault() { return sDefault; }
+ OUString GetDefault() { return sDefault; }
};
//-------------------------------------------------------------------------
@@ -420,7 +420,7 @@ struct XMLError {
XML_Error eCode; // the error code
std::size_t nLine; // error line number
std::size_t nColumn; // error column number
- rtl::OUString sMessage; // readable error message
+ OUString sMessage; // readable error message
};
//-------------------------------------------------------------------------
@@ -460,7 +460,7 @@ public:
/// parse a file, returns NULL on criticall errors
XMLFile *Execute(
- const rtl::OUString &rFileName, // the file name
+ const OUString &rFileName, // the file name
XMLFile *pXMLFileIn // the XMLFile
);
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 8659fe1f4f19..ca6a820c4dc4 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -28,39 +28,39 @@
class XRMResParser
{
private:
- rtl::OString sGID;
- rtl::OString sLID;
+ OString sGID;
+ OString sLID;
sal_Bool bError;
sal_Bool bText;
- rtl::OString sCurrentOpenTag;
- rtl::OString sCurrentCloseTag;
- rtl::OString sCurrentText;
+ OString sCurrentOpenTag;
+ OString sCurrentCloseTag;
+ OString sCurrentText;
protected:
- std::vector<rtl::OString> aLanguages;
- rtl::OString GetAttribute( const rtl::OString &rToken, const rtl::OString &rAttribute );
- void Error( const rtl::OString &rError );
+ std::vector<OString> aLanguages;
+ OString GetAttribute( const OString &rToken, const OString &rAttribute );
+ void Error( const OString &rError );
- virtual void Output( const rtl::OString& rOutput )=0;
+ virtual void Output( const OString& rOutput )=0;
virtual void WorkOnDesc(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
)=0;
virtual void WorkOnText(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
)=0;
virtual void EndOfText(
- const rtl::OString &rOpenTag,
- const rtl::OString &rCloseTag
+ const OString &rOpenTag,
+ const OString &rCloseTag
)=0;
- rtl::OString GetGID() { return sGID; }
- rtl::OString GetLID() { return sLID; }
+ OString GetGID() { return sGID; }
+ OString GetLID() { return sLID; }
- void ConvertStringToDBFormat( rtl::OString &rString );
- void ConvertStringToXMLFormat( rtl::OString &rString );
+ void ConvertStringToDBFormat( OString &rString );
+ void ConvertStringToXMLFormat( OString &rString );
public:
XRMResParser();
@@ -80,22 +80,22 @@ class XRMResExport : public XRMResParser
{
private:
ResData *pResData;
- rtl::OString sPath;
+ OString sPath;
PoOfstream pOutputStream;
protected:
void WorkOnDesc(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
);
void WorkOnText(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
);
void EndOfText(
- const rtl::OString &rOpenTag,
- const rtl::OString &rCloseTag
+ const OString &rOpenTag,
+ const OString &rCloseTag
);
- void Output( const rtl::OString& rOutput );
+ void Output( const OString& rOutput );
public:
XRMResExport(
@@ -113,29 +113,29 @@ class XRMResMerge : public XRMResParser
{
private:
MergeDataFile *pMergeDataFile;
- rtl::OString sFilename;
+ OString sFilename;
ResData *pResData;
std::ofstream pOutputStream;
protected:
void WorkOnDesc(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
);
void WorkOnText(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
);
void EndOfText(
- const rtl::OString &rOpenTag,
- const rtl::OString &rCloseTag
+ const OString &rOpenTag,
+ const OString &rCloseTag
);
- void Output( const rtl::OString& rOutput );
+ void Output( const OString& rOutput );
public:
XRMResMerge(
- const rtl::OString &rMergeSource,
- const rtl::OString &rOutputFile,
- const rtl::OString &rFilename
+ const OString &rMergeSource,
+ const OString &rOutputFile,
+ const OString &rFilename
);
virtual ~XRMResMerge();
};
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 0aa53f875c25..311af52ae33a 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -88,7 +88,7 @@ void workOnTokenSet(int nTyp, char * pTokenText) {
// class CfgStackData
//
-CfgStackData* CfgStack::Push(const rtl::OString &rTag, const rtl::OString &rId)
+CfgStackData* CfgStack::Push(const OString &rTag, const OString &rId)
{
CfgStackData *pD = new CfgStackData( rTag, rId );
maList.push_back( pD );
@@ -108,9 +108,9 @@ CfgStack::~CfgStack()
maList.clear();
}
-rtl::OString CfgStack::GetAccessPath( size_t nPos )
+OString CfgStack::GetAccessPath( size_t nPos )
{
- rtl::OStringBuffer sReturn;
+ OStringBuffer sReturn;
for (size_t i = 0; i <= nPos; ++i)
{
if (i)
@@ -147,22 +147,22 @@ CfgParser::~CfgParser()
{
}
-sal_Bool CfgParser::IsTokenClosed(const rtl::OString &rToken)
+sal_Bool CfgParser::IsTokenClosed(const OString &rToken)
{
return rToken[rToken.getLength() - 2] == '/';
}
/*****************************************************************************/
void CfgParser::AddText(
- rtl::OString &rText,
- const rtl::OString &rIsoLang,
- const rtl::OString &rResTyp
+ OString &rText,
+ const OString &rIsoLang,
+ const OString &rResTyp
)
/*****************************************************************************/
{
- rText = rText.replaceAll(rtl::OString('\n'), rtl::OString()).
- replaceAll(rtl::OString('\r'), rtl::OString()).
- replaceAll(rtl::OString('\t'), rtl::OString());
+ rText = rText.replaceAll(OString('\n'), OString()).
+ replaceAll(OString('\r'), OString()).
+ replaceAll(OString('\t'), OString());
pStackData->sResTyp = rResTyp;
WorkOnText( rText, rIsoLang );
pStackData->sText[ rIsoLang ] = rText;
@@ -172,13 +172,13 @@ void CfgParser::AddText(
int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
/*****************************************************************************/
{
- rtl::OString sToken( pToken );
+ OString sToken( pToken );
if ( sToken == " " || sToken == "\t" )
sLastWhitespace += sToken;
- rtl::OString sTokenName;
- rtl::OString sTokenId;
+ OString sTokenName;
+ OString sTokenId;
sal_Bool bOutput = sal_True;
@@ -197,7 +197,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
getToken(0, ' ');
if ( !IsTokenClosed( sToken )) {
- rtl::OString sSearch;
+ OString sSearch;
switch ( nToken ) {
case CFG_TOKEN_PACKAGE:
sSearch = "package-id=";
@@ -221,15 +221,15 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
case CFG_TEXT_START: {
if ( sCurrentResTyp != sTokenName ) {
WorkOnResourceEnd();
- rtl::OString sCur;
+ OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ];
- pStackData->sText[ sCur ] = rtl::OString();
+ pStackData->sText[ sCur ] = OString();
}
}
sCurrentResTyp = sTokenName;
- rtl::OString sTemp = sToken.copy( sToken.indexOf( "xml:lang=" ));
+ OString sTemp = sToken.copy( sToken.indexOf( "xml:lang=" ));
sCurrentIsoLang = sTemp.getToken(1, '"');
if ( sCurrentIsoLang == NO_TRANSLATE_ISO )
@@ -243,13 +243,13 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
}
if ( !sSearch.isEmpty())
{
- rtl::OString sTemp = sToken.copy( sToken.indexOf( sSearch ));
+ OString sTemp = sToken.copy( sToken.indexOf( sSearch ));
sTokenId = sTemp.getToken(1, '"');
}
pStackData = aStack.Push( sTokenName, sTokenId );
if ( sSearch == "cfg:name=" ) {
- rtl::OString sTemp( sToken.toAsciiUpperCase() );
+ OString sTemp( sToken.toAsciiUpperCase() );
bLocalize = (( sTemp.indexOf( "CFG:TYPE=\"STRING\"" ) != -1 ) &&
( sTemp.indexOf( "CFG:LOCALIZED=\"sal_True\"" ) != -1 ));
}
@@ -257,10 +257,10 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
else if ( sTokenName == "label" ) {
if ( sCurrentResTyp != sTokenName ) {
WorkOnResourceEnd();
- rtl::OString sCur;
+ OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ];
- pStackData->sText[ sCur ] = rtl::OString();
+ pStackData->sText[ sCur ] = OString();
}
}
sCurrentResTyp = sTokenName;
@@ -280,8 +280,8 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
}
else
{
- rtl::OString sError( "Misplaced close tag: " );
- rtl::OString sInFile(" in file ");
+ OString sError( "Misplaced close tag: " );
+ OString sInFile(" in file ");
sError += sToken;
sError += sInFile;
sError += global::inputPathname;
@@ -305,7 +305,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
{
AddText( sCurrentText, sCurrentIsoLang, sCurrentResTyp );
Output( sCurrentText );
- sCurrentText = rtl::OString();
+ sCurrentText = OString();
pStackData->sEndTextTag = sToken;
}
@@ -318,7 +318,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
return 1;
}
-void CfgExport::Output(const rtl::OString&)
+void CfgExport::Output(const OString&)
{
}
@@ -326,7 +326,7 @@ void CfgExport::Output(const rtl::OString&)
int CfgParser::Execute( int nToken, char * pToken )
/*****************************************************************************/
{
- rtl::OString sToken( pToken );
+ OString sToken( pToken );
switch ( nToken ) {
case CFG_TAG:
@@ -347,7 +347,7 @@ int CfgParser::Execute( int nToken, char * pToken )
return ExecuteAnalyzedToken( nToken, pToken );
}
-void CfgParser::Error(const rtl::OString& rError)
+void CfgParser::Error(const OString& rError)
{
yyerror(rError.getStr());
}
@@ -386,12 +386,12 @@ void CfgExport::WorkOnResourceEnd()
/*****************************************************************************/
{
if ( bLocalize ) {
- if ( pStackData->sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))].getLength() )
+ if ( pStackData->sText[OString(RTL_CONSTASCII_STRINGPARAM("en-US"))].getLength() )
{
- rtl::OString sFallback = pStackData->sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))];
- rtl::OString sXComment = pStackData->sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))];
- rtl::OString sLocalId = pStackData->sIdentifier;
- rtl::OString sGroupId;
+ OString sFallback = pStackData->sText[OString(RTL_CONSTASCII_STRINGPARAM("en-US"))];
+ OString sXComment = pStackData->sText[OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))];
+ OString sLocalId = pStackData->sIdentifier;
+ OString sGroupId;
if ( aStack.size() == 1 ) {
sGroupId = sLocalId;
sLocalId = "";
@@ -402,9 +402,9 @@ void CfgExport::WorkOnResourceEnd()
for (size_t n = 0; n < aLanguages.size(); n++)
{
- rtl::OString sCur = aLanguages[ n ];
+ OString sCur = aLanguages[ n ];
- rtl::OString sText = pStackData->sText[ sCur ];
+ OString sText = pStackData->sText[ sCur ];
if ( sText.isEmpty())
sText = sFallback;
@@ -419,8 +419,8 @@ void CfgExport::WorkOnResourceEnd()
}
void CfgExport::WorkOnText(
- rtl::OString &rText,
- const rtl::OString &rIsoLang
+ OString &rText,
+ const OString &rIsoLang
)
{
if( rIsoLang.getLength() ) rText = helper::UnQuotHTML( rText );
@@ -470,22 +470,22 @@ CfgMerge::~CfgMerge()
delete pResData;
}
-void CfgMerge::WorkOnText(rtl::OString &rText, const rtl::OString& rLangIndex)
+void CfgMerge::WorkOnText(OString &rText, const OString& rLangIndex)
{
if ( pMergeDataFile && bLocalize ) {
if ( !pResData ) {
- rtl::OString sLocalId = pStackData->sIdentifier;
- rtl::OString sGroupId;
+ OString sLocalId = pStackData->sIdentifier;
+ OString sGroupId;
if ( aStack.size() == 1 ) {
sGroupId = sLocalId;
- sLocalId = rtl::OString();
+ sLocalId = OString();
}
else {
sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
}
- rtl::OString sPlatform;
+ OString sPlatform;
pResData = new ResData( sPlatform, sGroupId , sFilename );
pResData->sId = sLocalId;
@@ -497,7 +497,7 @@ void CfgMerge::WorkOnText(rtl::OString &rText, const rtl::OString& rLangIndex)
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrysCaseSensitive( pResData );
if ( pEntrys ) {
- rtl::OString sContent;
+ OString sContent;
pEntrys->GetText( sContent, STRING_TYP_TEXT, rLangIndex );
if ( !rLangIndex.equalsIgnoreAsciiCase("en-US") &&
@@ -509,7 +509,7 @@ void CfgMerge::WorkOnText(rtl::OString &rText, const rtl::OString& rLangIndex)
}
}
-void CfgMerge::Output(const rtl::OString& rOutput)
+void CfgMerge::Output(const OString& rOutput)
{
pOutputStream << rOutput.getStr();
}
@@ -522,12 +522,12 @@ void CfgMerge::WorkOnResourceEnd()
if ( pMergeDataFile && pResData && bLocalize && bEnglish ) {
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrysCaseSensitive( pResData );
if ( pEntrys ) {
- rtl::OString sCur;
+ OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ];
- rtl::OString sContent;
+ OString sContent;
pEntrys->GetText( sContent, STRING_TYP_TEXT, sCur , sal_True );
if (
( !sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) ) &&
@@ -535,20 +535,20 @@ void CfgMerge::WorkOnResourceEnd()
( sContent != "-" ) && !sContent.isEmpty())
{
- rtl::OString sText = helper::QuotHTML( sContent);
+ OString sText = helper::QuotHTML( sContent);
- rtl::OString sAdditionalLine( "\t" );
+ OString sAdditionalLine( "\t" );
- rtl::OString sTextTag = pStackData->sTextTag;
- rtl::OString sTemp = sTextTag.copy( sTextTag.indexOf( "xml:lang=" ));
+ OString sTextTag = pStackData->sTextTag;
+ OString sTemp = sTextTag.copy( sTextTag.indexOf( "xml:lang=" ));
sal_Int32 n = 0;
- rtl::OString sSearch = sTemp.getToken(0, '"', n);
+ OString sSearch = sTemp.getToken(0, '"', n);
sSearch += "\"";
sSearch += sTemp.getToken(0, '"', n);
sSearch += "\"";
- rtl::OString sReplace = sTemp.getToken(0, '"');
+ OString sReplace = sTemp.getToken(0, '"');
sReplace += "\"";
sReplace += sCur;
sReplace += "\"";
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index adce9e85e983..d5ee143954e8 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -92,7 +92,7 @@ void Close(){
int WorkOnTokenSet( int nTyp, char *pTokenText )
{
- global::exporter->pParseQueue->Push( QueueEntry( nTyp , rtl::OString(pTokenText) ) );
+ global::exporter->pParseQueue->Push( QueueEntry( nTyp , OString(pTokenText) ) );
return 1;
}
@@ -126,7 +126,7 @@ int GetError()
//
/*****************************************************************************/
-sal_Bool ResData::SetId( const rtl::OString& rId, sal_uInt16 nLevel )
+sal_Bool ResData::SetId( const OString& rId, sal_uInt16 nLevel )
/*****************************************************************************/
{
if ( nLevel > nIdLevel )
@@ -136,7 +136,7 @@ sal_Bool ResData::SetId( const rtl::OString& rId, sal_uInt16 nLevel )
if ( bChild && bChildWithText )
{
- rtl::OString sError(RTL_CONSTASCII_STRINGPARAM("ResId after child definition"));
+ OString sError(RTL_CONSTASCII_STRINGPARAM("ResId after child definition"));
yyerror(sError.getStr());
SetError();
}
@@ -243,7 +243,7 @@ void Export::Init()
bNextMustBeDefineEOL = sal_False;
nLevel = 0;
nList = LIST_NON;
- m_sListLang = rtl::OString();
+ m_sListLang = OString();
nListIndex = 0;
for ( size_t i = 0, n = aResStack.size(); i < n; ++i )
delete aResStack[ i ];
@@ -283,15 +283,15 @@ int Export::Execute( int nToken, const char * pToken )
/*****************************************************************************/
{
- rtl::OString sToken( pToken );
- rtl::OString sOrig( sToken );
+ OString sToken( pToken );
+ OString sOrig( sToken );
sal_Bool bWriteToMerged = bMergeMode;
if ( nToken == CONDITION )
{
- rtl::OString sTestToken(pToken);
- sTestToken = sTestToken.replaceAll("\t", rtl::OString()).
- replaceAll(" ", rtl::OString());
+ OString sTestToken(pToken);
+ sTestToken = sTestToken.replaceAll("\t", OString()).
+ replaceAll(" ", OString());
if (( !bReadOver ) && ( sTestToken.indexOf("#ifndef__RSC_PARSER") == 0 ))
bReadOver = sal_True;
else if (( bReadOver ) && ( sTestToken.indexOf("#endif") == 0 ))
@@ -417,14 +417,14 @@ int Export::Execute( int nToken, const char * pToken )
pResData = new ResData( sActPForm, FullId() , sFilename );
aResStack.push_back( pResData );
- sToken = sToken.replaceAll("\n", rtl::OString()).
- replaceAll("\r", rtl::OString()).
- replaceAll("{", rtl::OString()).replace('\t', ' ');
+ sToken = sToken.replaceAll("\n", OString()).
+ replaceAll("\r", OString()).
+ replaceAll("{", OString()).replace('\t', ' ');
sToken = sToken.trim();
- rtl::OString sTLower = sToken.getToken(0, ' ').toAsciiLowerCase();
+ OString sTLower = sToken.getToken(0, ' ').toAsciiLowerCase();
pResData->sResTyp = sTLower;
- rtl::OString sId( sToken.copy( pResData->sResTyp.getLength() + 1 ));
- rtl::OString sCondition;
+ OString sId( sToken.copy( pResData->sResTyp.getLength() + 1 ));
+ OString sCondition;
if ( sId.indexOf( '#' ) != -1 )
{
// between ResTyp, Id and paranthes is a precomp. condition
@@ -435,7 +435,7 @@ int Export::Execute( int nToken, const char * pToken )
}
sId = sId.getToken(0, '/');
CleanValue( sId );
- sId = sId.replaceAll("\t", rtl::OString());
+ sId = sId.replaceAll("\t", OString());
pResData->SetId( sId, ID_LEVEL_IDENTIFIER );
if (!sCondition.isEmpty())
{
@@ -456,12 +456,12 @@ int Export::Execute( int nToken, const char * pToken )
pResData = new ResData( sActPForm, FullId() , sFilename );
aResStack.push_back( pResData );
- sToken = sToken.replaceAll("\n", rtl::OString()).
- replaceAll("\r", rtl::OString()).
- replaceAll("{", rtl::OString()).
- replaceAll("\t", rtl::OString()).
- replaceAll(" ", rtl::OString()).
- replaceAll("\\", rtl::OString()).toAsciiLowerCase();
+ sToken = sToken.replaceAll("\n", OString()).
+ replaceAll("\r", OString()).
+ replaceAll("{", OString()).
+ replaceAll("\t", OString()).
+ replaceAll(" ", OString()).
+ replaceAll("\\", OString()).toAsciiLowerCase();
pResData->sResTyp = sToken;
}
break;
@@ -473,7 +473,7 @@ int Export::Execute( int nToken, const char * pToken )
break;
bDontWriteOutput = sal_False;
- rtl::OString sLowerTyp;
+ OString sLowerTyp;
if ( pResData )
sLowerTyp = "unknown";
nLevel++;
@@ -521,17 +521,17 @@ int Export::Execute( int nToken, const char * pToken )
bDontWriteOutput = sal_False;
// interpret different types of assignement
sal_Int32 n = 0;
- rtl::OString sKey = sToken.getToken(0, '=', n).
- replaceAll(" ", rtl::OString()).
- replaceAll("\t", rtl::OString());
- rtl::OString sValue = sToken.getToken(0, '=', n);
+ OString sKey = sToken.getToken(0, '=', n).
+ replaceAll(" ", OString()).
+ replaceAll("\t", OString());
+ OString sValue = sToken.getToken(0, '=', n);
CleanValue( sValue );
sKey = sKey.toAsciiUpperCase();
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("IDENTIFIER")))
{
- rtl::OString sId(
- sValue.replaceAll("\t", rtl::OString()).
- replaceAll(" ", rtl::OString()));
+ OString sId(
+ sValue.replaceAll("\t", OString()).
+ replaceAll(" ", OString()));
pResData->SetId(sId, ID_LEVEL_IDENTIFIER);
}
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HELPID")))
@@ -574,14 +574,14 @@ int Export::Execute( int nToken, const char * pToken )
case LISTASSIGNMENT:
{
bDontWriteOutput = sal_False;
- rtl::OString sTmpToken(
- sToken.replaceAll(" ", rtl::OString()).toAsciiLowerCase());
+ OString sTmpToken(
+ sToken.replaceAll(" ", OString()).toAsciiLowerCase());
sal_Int32 nPos = sTmpToken.indexOf("[en-us]=");
if (nPos != -1) {
- rtl::OString sKey(
- sTmpToken.copy(0 , nPos).replaceAll(" ", rtl::OString()).
- replaceAll("\t", rtl::OString()));
- rtl::OString sValue = sToken.getToken(1, '=');
+ OString sKey(
+ sTmpToken.copy(0 , nPos).replaceAll(" ", OString()).
+ replaceAll("\t", OString()));
+ OString sValue = sToken.getToken(1, '=');
CleanValue( sValue );
sKey = sKey.toAsciiUpperCase();
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
@@ -630,9 +630,9 @@ int Export::Execute( int nToken, const char * pToken )
{
// new res. is a String- or FilterList
sal_Int32 n = 0;
- rtl::OString sKey(
- sToken.getToken(0, '[', n).replaceAll(" ", rtl::OString()).
- replaceAll("\t", rtl::OString()).toAsciiUpperCase());
+ OString sKey(
+ sToken.getToken(0, '[', n).replaceAll(" ", OString()).
+ replaceAll("\t", OString()).toAsciiUpperCase());
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
nList = LIST_STRING;
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
@@ -644,7 +644,7 @@ int Export::Execute( int nToken, const char * pToken )
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
nList = LIST_UIENTRIES;
if ( nList ) {
- rtl::OString sLang = sToken.getToken(0, ']', n);
+ OString sLang = sToken.getToken(0, ']', n);
CleanValue( sLang );
m_sListLang = sLang;
nListIndex = 0;
@@ -660,7 +660,7 @@ int Export::Execute( int nToken, const char * pToken )
if ( nList ) {
SetChildWithText();
sal_Int32 n = 0;
- rtl::OString sEntry(sToken.getToken(1, '"', n));
+ OString sEntry(sToken.getToken(1, '"', n));
if ( lcl_countOccurrences(sToken, '"') > 2 )
sEntry += "\"";
if ( sEntry == "\\\"" )
@@ -681,20 +681,20 @@ int Export::Execute( int nToken, const char * pToken )
CutComment( sToken );
// this is a text line!!!
- rtl::OString t(sToken.getToken(0, '='));
- rtl::OString sKey(
- t.getToken(0, '[').replaceAll(" ", rtl::OString()).
- replaceAll("\t", rtl::OString()));
- rtl::OString sText( GetText( sToken, nToken ));
- rtl::OString sLang;
+ OString t(sToken.getToken(0, '='));
+ OString sKey(
+ t.getToken(0, '[').replaceAll(" ", OString()).
+ replaceAll("\t", OString()));
+ OString sText( GetText( sToken, nToken ));
+ OString sLang;
if ( sToken.getToken(0, '=').indexOf('[') != -1 )
{
sLang = sToken.getToken(0, '=').getToken(1, '[').
getToken(0, ']');
CleanValue( sLang );
}
- rtl::OString sLangIndex = sLang;
- rtl::OString sOrigKey = sKey;
+ OString sLangIndex = sLang;
+ OString sOrigKey = sKey;
if ( !sText.isEmpty() && !sLang.isEmpty() )
{
sKey = sKey.toAsciiUpperCase();
@@ -717,7 +717,7 @@ int Export::Execute( int nToken, const char * pToken )
{
if (!pResData->sText[ sLangIndex ].isEmpty())
{
- rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
+ OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
sError.append(sLangIndex);
sError.append(RTL_CONSTASCII_STRINGPARAM("defined twice"));
yyerror(sError.getStr());
@@ -734,7 +734,7 @@ int Export::Execute( int nToken, const char * pToken )
{
if (!pResData->sHelpText[ sLangIndex ].isEmpty())
{
- rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
+ OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
sError.append(sLangIndex);
sError.append(" defined twice");
YYWarning(sError.getStr());
@@ -751,7 +751,7 @@ int Export::Execute( int nToken, const char * pToken )
{
if (!pResData->sQuickHelpText[ sLangIndex ].isEmpty())
{
- rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
+ OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
sError.append(sLangIndex);
sError.append(RTL_CONSTASCII_STRINGPARAM(" defined twice"));
YYWarning(sError.getStr());
@@ -768,7 +768,7 @@ int Export::Execute( int nToken, const char * pToken )
{
if ( !pResData->sTitle[ sLangIndex ].isEmpty())
{
- rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
+ OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
sError.append(sLangIndex);
sError.append(RTL_CONSTASCII_STRINGPARAM(" defined twice"));
YYWarning(sError.getStr());
@@ -795,14 +795,14 @@ int Export::Execute( int nToken, const char * pToken )
// this is a AppfontMapping, so look if its a definition
// of field size
sal_Int32 n = 0;
- rtl::OString sKey(
- sToken.getToken(0, '=', n).replaceAll(" ", rtl::OString()).
- replaceAll("\t", rtl::OString()));
- rtl::OString sMapping = sToken.getToken(0, '=', n);
+ OString sKey(
+ sToken.getToken(0, '=', n).replaceAll(" ", OString()).
+ replaceAll("\t", OString()));
+ OString sMapping = sToken.getToken(0, '=', n);
sMapping = sMapping.getToken(1, '(');
sMapping = sMapping.getToken(0, ')').
- replaceAll(rtl::OString(' '), rtl::OString()).
- replaceAll(rtl::OString('\t'), rtl::OString()).
+ replaceAll(OString(' '), OString()).
+ replaceAll(OString('\t'), OString()).
toAsciiUpperCase();
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SIZE"))) {
pResData->nWidth = sMapping.getToken(0, ',').toInt32();
@@ -825,7 +825,7 @@ int Export::Execute( int nToken, const char * pToken )
}
}
sal_Int32 n = 0;
- rtl::OString sCondition(sToken.getToken(0, ' ', n));
+ OString sCondition(sToken.getToken(0, ' ', n));
if ( sCondition == "#ifndef" ) {
sActPForm = "!defined ";
sActPForm += sToken.getToken(0, ' ', n);
@@ -894,11 +894,11 @@ int Export::Execute( int nToken, const char * pToken )
}
/*****************************************************************************/
-void Export::CutComment( rtl::OString &rText )
+void Export::CutComment( OString &rText )
/*****************************************************************************/
{
if (rText.indexOf("//") != -1) {
- rtl::OString sWork(rText.replaceAll("\\\"", "XX"));
+ OString sWork(rText.replaceAll("\\\"", "XX"));
bool bInner = false;
for (sal_Int32 i = 0; i < sWork.getLength() - 1; ++i) {
if (sWork[i] == '"') {
@@ -931,17 +931,17 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
( !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty()))
{
- rtl::OString sGID = pResData->sGId;
- rtl::OString sLID;
+ OString sGID = pResData->sGId;
+ OString sLID;
if (sGID.isEmpty())
sGID = pResData->sId;
else
sLID = pResData->sId;
- rtl::OString sXText;
- rtl::OString sXHText;
- rtl::OString sXQHText;
- rtl::OString sXTitle;
+ OString sXText;
+ OString sXHText;
+ OString sXQHText;
+ OString sXTitle;
sXText = pResData->sText[ SOURCE_LANGUAGE ];
if (!pResData->sText[ X_COMMENT ].isEmpty())
@@ -975,31 +975,31 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
}
}
if ( pResData->pStringList ) {
- rtl::OString sList( "stringlist" );
+ OString sList( "stringlist" );
WriteExportList( pResData, pResData->pStringList, sList, bCreateNew );
if ( bCreateNew )
pResData->pStringList = 0;
}
if ( pResData->pFilterList ) {
- rtl::OString sList( "filterlist" );
+ OString sList( "filterlist" );
WriteExportList( pResData, pResData->pFilterList, sList, bCreateNew );
if ( bCreateNew )
pResData->pFilterList = 0;
}
if ( pResData->pItemList ) {
- rtl::OString sList( "itemlist" );
+ OString sList( "itemlist" );
WriteExportList( pResData, pResData->pItemList, sList, bCreateNew );
if ( bCreateNew )
pResData->pItemList = 0;
}
if ( pResData->pPairedList ) {
- rtl::OString sList( "pairedlist" );
+ OString sList( "pairedlist" );
WriteExportList( pResData, pResData->pPairedList, sList, bCreateNew );
if ( bCreateNew )
pResData->pPairedList = 0;
}
if ( pResData->pUIEntries ) {
- rtl::OString sList( "uientries" );
+ OString sList( "uientries" );
WriteExportList( pResData, pResData->pUIEntries, sList, bCreateNew );
if ( bCreateNew )
pResData->pUIEntries = 0;
@@ -1007,32 +1007,32 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
return sal_True;
}
-rtl::OString Export::GetPairedListID(const rtl::OString& rText)
+OString Export::GetPairedListID(const OString& rText)
{
// < "STRING" ; IDENTIFIER ; > ;
return rText.getToken(1, ';').toAsciiUpperCase().replace('\t', ' ').trim();
}
-rtl::OString Export::GetPairedListString(const rtl::OString& rText)
+OString Export::GetPairedListString(const OString& rText)
{
// < "STRING" ; IDENTIFIER ; > ;
- rtl::OString sString(rText.getToken(0, ';').replace('\t', ' '));
+ OString sString(rText.getToken(0, ';').replace('\t', ' '));
sString = sString.trim();
- rtl::OString s1(sString.copy(sString.indexOf('"') + 1));
+ OString s1(sString.copy(sString.indexOf('"') + 1));
sString = s1.copy(0, s1.lastIndexOf('"'));
return sString.trim();
}
-rtl::OString Export::StripList(const rtl::OString & rText)
+OString Export::StripList(const OString & rText)
{
- rtl::OString s1 = rText.copy( rText.indexOf('\"') + 1);
+ OString s1 = rText.copy( rText.indexOf('\"') + 1);
return s1.copy( 0 , s1.lastIndexOf('\"'));
}
sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
- const rtl::OString &rTyp, sal_Bool bCreateNew)
+ const OString &rTyp, sal_Bool bCreateNew)
{
- rtl::OString sGID(pResData->sGId);
+ OString sGID(pResData->sGId);
if (sGID.isEmpty())
sGID = pResData->sId;
else {
@@ -1043,18 +1043,18 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
}
}
- rtl::OString sCur;
+ OString sCur;
for ( size_t i = 0; pExportList != NULL && i < pExportList->size(); i++ )
{
ExportListEntry *pEntry = (*pExportList)[ i ];
- rtl::OString sLID(rtl::OString::valueOf(static_cast<sal_Int64>(i + 1)));
+ OString sLID(OString::valueOf(static_cast<sal_Int64>(i + 1)));
for (unsigned int n = 0; n < aLanguages.size(); ++n)
{
sCur = aLanguages[ n ];
if (!(*pEntry)[ SOURCE_LANGUAGE ].isEmpty())
{
- rtl::OString sText((*pEntry)[ SOURCE_LANGUAGE ] );
+ OString sText((*pEntry)[ SOURCE_LANGUAGE ] );
// Strip PairList Line String
if (rTyp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pairedlist")))
@@ -1084,22 +1084,22 @@ sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
return sal_True;
}
-rtl::OString Export::FullId()
+OString Export::FullId()
{
- rtl::OStringBuffer sFull;
+ OStringBuffer sFull;
if ( nLevel > 1 )
{
sFull.append(aResStack[ 0 ]->sId);
for ( size_t i = 1; i < nLevel - 1; ++i )
{
- rtl::OString sToAdd = aResStack[ i ]->sId;
+ OString sToAdd = aResStack[ i ]->sId;
if (!sToAdd.isEmpty())
sFull.append('.').append(sToAdd);
}
}
if (sFull.getLength() > 255)
{
- rtl::OString sError(RTL_CONSTASCII_STRINGPARAM("GroupId > 255 chars"));
+ OString sError(RTL_CONSTASCII_STRINGPARAM("GroupId > 255 chars"));
printf("GroupID = %s\n", sFull.getStr());
yyerror(sError.getStr());
}
@@ -1107,7 +1107,7 @@ rtl::OString Export::FullId()
return sFull.makeStringAndClear();
}
-void Export::InsertListEntry(const rtl::OString &rText, const rtl::OString &rLine)
+void Export::InsertListEntry(const OString &rText, const OString &rLine)
{
ResData *pResData = ( nLevel-1 < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
@@ -1179,7 +1179,7 @@ void Export::InsertListEntry(const rtl::OString &rText, const rtl::OString &rLin
}
/*****************************************************************************/
-void Export::CleanValue( rtl::OString &rValue )
+void Export::CleanValue( OString &rValue )
/*****************************************************************************/
{
while ( !rValue.isEmpty()) {
@@ -1205,18 +1205,18 @@ void Export::CleanValue( rtl::OString &rValue )
#define TXT_STATE_TEXT 0x001
#define TXT_STATE_MACRO 0x002
-rtl::OString Export::GetText(const rtl::OString &rSource, int nToken)
+OString Export::GetText(const OString &rSource, int nToken)
{
- rtl::OString sReturn;
+ OString sReturn;
switch ( nToken )
{
case TEXTLINE:
case LONGTEXTLINE:
{
- rtl::OString sTmp(rSource.copy(rSource.indexOf('=')));
+ OString sTmp(rSource.copy(rSource.indexOf('=')));
CleanValue( sTmp );
- sTmp = sTmp.replaceAll("\n", rtl::OString()).
- replaceAll("\r", rtl::OString()).
+ sTmp = sTmp.replaceAll("\n", OString()).
+ replaceAll("\r", OString()).
replaceAll("\\\\\"", "-=<[BSlashBSlashHKom]>=-\"").
replaceAll("\\\"", "-=<[Hochkomma]>=-").
replaceAll("\\", "-=<[0x7F]>=-").
@@ -1225,7 +1225,7 @@ rtl::OString Export::GetText(const rtl::OString &rSource, int nToken)
sal_uInt16 nState = TXT_STATE_TEXT;
for (sal_Int32 i = 1; i <= lcl_countOccurrences(sTmp, '"'); ++i)
{
- rtl::OString sToken(sTmp.getToken(i, '"'));
+ OString sToken(sTmp.getToken(i, '"'));
if (!sToken.isEmpty()) {
if ( nState == TXT_STATE_TEXT ) {
sReturn += sToken;
@@ -1262,9 +1262,9 @@ rtl::OString Export::GetText(const rtl::OString &rSource, int nToken)
return sReturn;
}
-void Export::WriteToMerged(const rtl::OString &rText , bool bSDFContent)
+void Export::WriteToMerged(const OString &rText , bool bSDFContent)
{
- rtl::OString sText(rText);
+ OString sText(rText);
for (;;) {
sal_Int32 n = 0;
sText = sText.replaceFirst(" \n", "\n", &n);
@@ -1312,15 +1312,15 @@ void Export::WriteToMerged(const rtl::OString &rText , bool bSDFContent)
}
/*****************************************************************************/
-void Export::ConvertMergeContent( rtl::OString &rText )
+void Export::ConvertMergeContent( OString &rText )
/*****************************************************************************/
{
sal_Bool bNoOpen = ( rText.indexOf( "\\\"" ) != 0 );
sal_Bool bNoClose = !rText.endsWithL(RTL_CONSTASCII_STRINGPARAM("\\\""));
- rtl::OStringBuffer sNew;
+ OStringBuffer sNew;
for ( sal_Int32 i = 0; i < rText.getLength(); i++ )
{
- rtl::OString sChar( rText[i]);
+ OString sChar( rText[i]);
if (sChar.equalsL(RTL_CONSTASCII_STRINGPARAM("\\")))
{
if (( i + 1 ) < rText.getLength())
@@ -1328,41 +1328,41 @@ void Export::ConvertMergeContent( rtl::OString &rText )
sal_Char cNext = rText[i + 1];
if ( cNext == '\"' )
{
- sChar = rtl::OString('\"');
+ sChar = OString('\"');
i++;
}
else if ( cNext == 'n' )
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\n"));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\n"));
i++;
}
else if ( cNext == 't' )
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\t"));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\t"));
i++;
}
else if ( cNext == '\'' )
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\'"));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\\'"));
i++;
}
else
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\\"));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\\\"));
}
}
else
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\\"));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\\\"));
}
}
else if (sChar.equalsL(RTL_CONSTASCII_STRINGPARAM("\"")))
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\""));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\\""));
}
else if (sChar.equalsL(RTL_CONSTASCII_STRINGPARAM("")))
{
- sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\0x7F"));
+ sChar = OString(RTL_CONSTASCII_STRINGPARAM("\\0x7F"));
}
sNew.append(sChar);
}
@@ -1370,7 +1370,7 @@ void Export::ConvertMergeContent( rtl::OString &rText )
rText = sNew.makeStringAndClear();
if ( bNoOpen ) {
- rtl::OString sTmp( rText );
+ OString sTmp( rText );
rText = "\"";
rText += sTmp;
}
@@ -1378,17 +1378,17 @@ void Export::ConvertMergeContent( rtl::OString &rText )
rText += "\"";
}
-sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
- rtl::OString &rLangIndex, ResData *pResData)
+sal_Bool Export::PrepareTextToMerge(OString &rText, sal_uInt16 nTyp,
+ OString &rLangIndex, ResData *pResData)
{
// position to merge in:
sal_Int32 nStart = 0;
sal_Int32 nEnd = 0;
- rtl::OString sOldId = pResData->sId;
- rtl::OString sOldGId = pResData->sGId;
- rtl::OString sOldTyp = pResData->sResTyp;
+ OString sOldId = pResData->sId;
+ OString sOldGId = pResData->sGId;
+ OString sOldTyp = pResData->sResTyp;
- rtl::OString sOrigText( rText );
+ OString sOrigText( rText );
switch ( nTyp ) {
case LIST_STRING :
@@ -1454,7 +1454,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
if (( sLastListLine.indexOf( '>' ) != -1 ) &&
( sLastListLine.indexOf( '<' ) == -1 ))
{
- rtl::OString sTmp = sLastListLine;
+ OString sTmp = sLastListLine;
sLastListLine = "<";
sLastListLine += sTmp;
}
@@ -1465,7 +1465,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
else pResData->sId = OString::number(nListIndex);
if (!pResData->sGId.isEmpty())
- pResData->sGId = pResData->sGId + rtl::OString('.');
+ pResData->sGId = pResData->sGId + OString('.');
pResData->sGId = pResData->sGId + sOldId;
nTyp = STRING_TYP_TEXT;
}
@@ -1538,7 +1538,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
return sal_False; // no data found
}
- rtl::OString sContent;
+ OString sContent;
pEntrys->GetTransex3Text(sContent, nTyp, rLangIndex);
if (sContent.isEmpty() && !rLangIndex.equalsIgnoreAsciiCase("en-US"))
{
@@ -1549,7 +1549,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
if (rLangIndex.equalsIgnoreAsciiCase("en-US"))
return sal_False;
- rtl::OString sPostFix( rText.copy( ++nEnd ));
+ OString sPostFix( rText.copy( ++nEnd ));
rText = rText.copy(0, nStart);
ConvertMergeContent( sContent );
@@ -1563,19 +1563,19 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
return sal_True;
}
-void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const rtl::OString& rTextType )
+void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString& rTextType )
{
sal_Bool bAddSemicolon = sal_False;
sal_Bool bFirst = sal_True;
- rtl::OString sCur;
+ OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
sCur = aLanguages[ n ];
- rtl::OString sText;
+ OString sText;
sal_Bool bText = pEntry->GetTransex3Text( sText, nType, sCur , sal_True );
if ( bText && !sText.isEmpty() && sText != "-" ) {
- rtl::OString sOutput;
+ OString sOutput;
if ( bNextMustBeDefineEOL) {
if ( bFirst )
sOutput += "\t\\\n";
@@ -1610,7 +1610,7 @@ void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const rtl::O
if ( bAddSemicolon ) {
- rtl::OString sOutput( ";" );
+ OString sOutput( ";" );
WriteToMerged( sOutput , false );
}
}
@@ -1640,23 +1640,23 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
ResData2Output( pEntry, STRING_TYP_TEXT, pResData->sTextTyp );
if ( pResData->bQuickHelpText )
- ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT, rtl::OString("QuickHelpText") );
+ ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT, OString("QuickHelpText") );
if ( pResData->bTitle )
- ResData2Output( pEntry, STRING_TYP_TITLE, rtl::OString("Title") );
+ ResData2Output( pEntry, STRING_TYP_TITLE, OString("Title") );
}
// Merge Lists
if ( pResData->bList ) {
bool bPairedList = false;
- rtl::OString sOldId = pResData->sId;
- rtl::OString sOldGId = pResData->sGId;
- rtl::OString sOldTyp = pResData->sResTyp;
+ OString sOldId = pResData->sId;
+ OString sOldGId = pResData->sGId;
+ OString sOldTyp = pResData->sResTyp;
if (!pResData->sGId.isEmpty())
- pResData->sGId = pResData->sGId + rtl::OString('.');
+ pResData->sGId = pResData->sGId + OString('.');
pResData->sGId = pResData->sGId + sOldId;
- rtl::OString sSpace;
+ OString sSpace;
for ( sal_uInt16 i = 1; i < nLevel-1; i++ )
sSpace += "\t";
for ( sal_uInt16 nT = LIST_STRING; nT <= LIST_UIENTRIES; nT++ ) {
@@ -1668,7 +1668,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
case LIST_ITEM : pResData->sResTyp = "itemlist"; pList = pResData->pItemList; bPairedList = false; break;
case LIST_PAIRED : pResData->sResTyp = "pairedlist"; pList = pResData->pPairedList; bPairedList = true; break;
}
- rtl::OString sCur;
+ OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ )
{
sCur = aLanguages[ n ];
@@ -1711,7 +1711,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
while(( nLIndex < nMaxIndex )) {
if ( nIdx == 1 )
{
- rtl::OStringBuffer sHead;
+ OStringBuffer sHead;
if ( bNextMustBeDefineEOL )
sHead.append(RTL_CONSTASCII_STRINGPARAM("\\\n\t"));
sHead.append(sSpace);
@@ -1750,7 +1750,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
WriteToMerged(sHead.makeStringAndClear() , true);
}
- rtl::OString sLine;
+ OString sLine;
if ( pList && (*pList)[ nLIndex ] )
sLine = ( *(*pList)[ nLIndex ])[ SOURCE_LANGUAGE ];
if ( sLine.isEmpty())
@@ -1778,7 +1778,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
sal_Int32 nStart, nEnd;
nStart = sLine.indexOf( '"' );
- rtl::OString sPostFix;
+ OString sPostFix;
if( !bPairedList ){
nEnd = sLine.lastIndexOf( '"' );
sPostFix = sLine.copy( ++nEnd );
@@ -1799,7 +1799,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
}
- rtl::OString sText1( "\t" );
+ OString sText1( "\t" );
sText1 += sLine;
if ( bDefine || bNextMustBeDefineEOL )
sText1 += " ;\\\n";
@@ -1828,7 +1828,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
nLIndex++;
}
if ( nIdx > 1 ) {
- rtl::OString sFooter;
+ OString sFooter;
if (!sSpace.isEmpty()) {
sFooter = sSpace.copy(1);
}
@@ -1865,7 +1865,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
std::size_t nMaxIndex = 0;
if ( pList )
nMaxIndex = pList->GetSourceLanguageListEntryCount();
- rtl::OString sLine;
+ OString sLine;
if ( pList && (*pList)[ nListIndex ] )
sLine = ( *(*pList)[ nListIndex ])[ SOURCE_LANGUAGE ];
if ( sLine.isEmpty())
@@ -1883,7 +1883,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
while( PrepareTextToMerge( sLine, nList, m_sListLang, pResData ) && ( nListIndex <= nMaxIndex )) {
- rtl::OString sText( "\t" );
+ OString sText( "\t" );
sText += sLine;
sText += " ;";
sText += "\n";
@@ -1903,10 +1903,10 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
pParseQueue->bMflag = false;
}
-rtl::OString Export::MergePairedList( rtl::OString const & sLine , rtl::OString const & sText ){
+OString Export::MergePairedList( OString const & sLine , OString const & sText ){
// < "xy" ; IDENTIFIER ; >
- rtl::OString sPre = sLine.copy( 0 , sLine.indexOf('"') );
- rtl::OString sPost = sLine.copy( sLine.lastIndexOf('"') + 1 );
+ OString sPre = sLine.copy( 0 , sLine.indexOf('"') );
+ OString sPost = sLine.copy( sLine.lastIndexOf('"') + 1 );
sPre += sText;
sPre += sPost;
return sPre;
@@ -1927,13 +1927,13 @@ void Export::InitLanguages( bool bMerge ){
if( !isInitialized )
{
- rtl::OString sTmp;
+ OString sTmp;
OStringBoolHashMap aEnvLangs;
sal_Int32 nIndex = 0;
do
{
- rtl::OString aToken = sLanguages.getToken(0, ',', nIndex);
+ OString aToken = sLanguages.getToken(0, ',', nIndex);
sTmp = aToken.getToken(0, '=').trim();
if( bMerge && sTmp.equalsIgnoreAsciiCase("en-US") ){}
else if( !( (sTmp[0]=='x' || sTmp[0]=='X') && sTmp[1]=='-' ) ){
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 98e81651569f..904aae7d058f 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -54,9 +54,9 @@ void HelpParser::Dump(XMLHashMap* rElem_in)
}
}
-void HelpParser::Dump(LangHashMap* rElem_in,const rtl::OString & sKey_in)
+void HelpParser::Dump(LangHashMap* rElem_in,const OString & sKey_in)
{
- rtl::OString x;
+ OString x;
OString y;
fprintf(stdout,"+------------%s-----------+\n",sKey_in.getStr() );
for(LangHashMap::iterator posn=rElem_in->begin();posn!=rElem_in->end();++posn)
@@ -69,7 +69,7 @@ void HelpParser::Dump(LangHashMap* rElem_in,const rtl::OString & sKey_in)
}
#endif
-HelpParser::HelpParser( const rtl::OString &rHelpFile )
+HelpParser::HelpParser( const OString &rHelpFile )
: sHelpFile( rHelpFile )
{};
@@ -79,8 +79,8 @@ bool HelpParser::CreatePO(
const OString &rPOFile_in, const OString &sHelpFile, const OString &rLanguage,
XMLFile *pXmlFile, const OString &rGsi1){
SimpleXMLParser aParser;
- rtl::OUString sXmlFile(
- rtl::OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US));
+ OUString sXmlFile(
+ OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US));
//TODO: explicit BOM handling?
std::auto_ptr <XMLFile> file ( aParser.Execute( sXmlFile, pXmlFile ) );
@@ -90,7 +90,7 @@ bool HelpParser::CreatePO(
printf(
"%s: %s\n",
sHelpFile.getStr(),
- (rtl::OUStringToOString(
+ (OUStringToOString(
aParser.GetError().sMessage, RTL_TEXTENCODING_ASCII_US).
getStr()));
exit(-1);
@@ -111,18 +111,18 @@ bool HelpParser::CreatePO(
LangHashMap* pElem;
XMLElement* pXMLElement = NULL;
- std::vector<rtl::OString> aLanguages;
+ std::vector<OString> aLanguages;
aLanguages.push_back( rLanguage );
- std::vector<rtl::OString> order = file->getOrder();
- std::vector<rtl::OString>::iterator pos;
+ std::vector<OString> order = file->getOrder();
+ std::vector<OString>::iterator pos;
XMLHashMap::iterator posm;
for( pos = order.begin(); pos != order.end() ; ++pos )
{
posm = aXMLStrHM->find( *pos );
pElem = posm->second;
- rtl::OString sCur;
+ OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ )
{
@@ -153,26 +153,26 @@ bool HelpParser::CreatePO(
return sal_True;
}
-bool HelpParser::Merge( const rtl::OString &rPOFile, const rtl::OString &rDestinationFile,
- const rtl::OString& rLanguage , MergeDataFile& aMergeDataFile )
+bool HelpParser::Merge( const OString &rPOFile, const OString &rDestinationFile,
+ const OString& rLanguage , MergeDataFile& aMergeDataFile )
{
(void) rPOFile;
SimpleXMLParser aParser;
- rtl::OUString sXmlFile(
- rtl::OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US));
+ OUString sXmlFile(
+ OStringToOUString(sHelpFile, RTL_TEXTENCODING_ASCII_US));
//TODO: explicit BOM handling?
- XMLFile* xmlfile = ( aParser.Execute( sXmlFile, new XMLFile( rtl::OUString('0') ) ) );
+ XMLFile* xmlfile = ( aParser.Execute( sXmlFile, new XMLFile( OUString('0') ) ) );
bool hasNoError = MergeSingleFile( xmlfile , aMergeDataFile , rLanguage , rDestinationFile );
delete xmlfile;
return hasNoError;
}
-bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage ,
- rtl::OString const & sPath )
+bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const OString& sLanguage ,
+ OString const & sPath )
{
file->Extract();
@@ -202,12 +202,12 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
}
/* ProcessHelp Methode: search for en-US entry and replace it with the current language*/
-void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){
+void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){
XMLElement* pXMLElement = NULL;
PFormEntrys *pEntrys = NULL;
- rtl::OString sLId;
+ OString sLId;
pEntrys = NULL;
@@ -225,15 +225,15 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur ,
pEntrys = aMergeDataFile.GetPFormEntrys( pResData );
if( pEntrys != NULL)
{
- rtl::OString sNewText;
- rtl::OUString sSourceText(
+ OString sNewText;
+ OUString sSourceText(
pXMLElement->ToOUString().
replaceAll(
- rtl::OUString("\n"),
- rtl::OUString()).
+ OUString("\n"),
+ OUString()).
replaceAll(
- rtl::OUString("\t"),
- rtl::OUString()));
+ OUString("\t"),
+ OUString()));
// re-add spaces to the beginning of translated string,
// important for indentation of Basic code examples
sal_Int32 nPreSpaces = 0;
@@ -269,7 +269,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur ,
pResData->sResTyp.getStr());
}
pXMLElement->ChangeLanguageTag(
- rtl::OStringToOUString(sCur, RTL_TEXTENCODING_ASCII_US));
+ OStringToOUString(sCur, RTL_TEXTENCODING_ASCII_US));
}
}
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 364087d4e9e3..4d8cb0d668b7 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -29,7 +29,7 @@
namespace {
-rtl::OString getBracketedContent(rtl::OString text) {
+OString getBracketedContent(OString text) {
return text.getToken(1, '[').getToken(0, ']');
}
@@ -47,7 +47,7 @@ static void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
//
// class LngParser
//
-LngParser::LngParser(const rtl::OString &rLngFile,
+LngParser::LngParser(const OString &rLngFile,
sal_Bool bULFFormat)
: nError( LNG_OK )
, pLines( NULL )
@@ -63,7 +63,7 @@ LngParser::LngParser(const rtl::OString &rLngFile,
std::getline(aStream, s);
while (!aStream.eof())
{
- rtl::OString sLine(s.data(), s.length());
+ OString sLine(s.data(), s.length());
if( bFirstLine )
{
@@ -72,10 +72,10 @@ LngParser::LngParser(const rtl::OString &rLngFile,
bFirstLine = false;
}
- pLines->push_back( new rtl::OString(sLine) );
+ pLines->push_back( new OString(sLine) );
std::getline(aStream, s);
}
- pLines->push_back( new rtl::OString() );
+ pLines->push_back( new OString() );
}
else
nError = LNG_COULD_NOT_OPEN;
@@ -101,9 +101,9 @@ sal_Bool LngParser::CreatePO(
size_t nPos = 0;
sal_Bool bStart = true;
- rtl::OString sGroup, sLine;
+ OString sGroup, sLine;
OStringHashMap Text;
- rtl::OString sID;
+ OString sID;
while( nPos < pLines->size() ) {
sLine = *(*pLines)[ nPos++ ];
@@ -125,18 +125,18 @@ sal_Bool LngParser::CreatePO(
}
void LngParser::WritePO(PoOfstream &aPOStream,
- OStringHashMap &rText_inout, const rtl::OString &rActFileName,
- const rtl::OString &rID)
+ OStringHashMap &rText_inout, const OString &rActFileName,
+ const OString &rID)
{
sal_Bool bExport = true;
if ( bExport ) {
- rtl::OString sCur;
+ OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
sCur = aLanguages[ n ];
- rtl::OString sAct = rText_inout[ sCur ];
+ OString sAct = rText_inout[ sCur ];
if ( sAct.isEmpty() && !sCur.isEmpty() )
- sAct = rText_inout[ rtl::OString("en-US") ];
+ sAct = rText_inout[ OString("en-US") ];
common::writePoEntry(
"Ulfex", aPOStream, rActFileName, "LngText",
@@ -145,7 +145,7 @@ void LngParser::WritePO(PoOfstream &aPOStream,
}
}
-bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in)
+bool LngParser::isNextGroup(OString &sGroup_out, const OString &sLine_in)
{
const OString sLineTrim = sLine_in.trim();
if ((sLineTrim[0] == '[') && (sLineTrim[sLineTrim.getLength() - 1] == ']'))
@@ -156,14 +156,14 @@ bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_
return false;
}
-void LngParser::ReadLine(const rtl::OString &rLine_in,
+void LngParser::ReadLine(const OString &rLine_in,
OStringHashMap &rText_inout)
{
if (!rLine_in.match(" *") && !rLine_in.match("/*"))
{
- rtl::OString sLang(rLine_in.getToken(0, '=').trim());
+ OString sLang(rLine_in.getToken(0, '=').trim());
if (!sLang.isEmpty()) {
- rtl::OString sText(rLine_in.getToken(1, '"'));
+ OString sText(rLine_in.getToken(1, '"'));
rText_inout[sLang] = sText;
}
}
@@ -187,12 +187,12 @@ sal_Bool LngParser::Merge(
size_t nPos = 0;
sal_Bool bGroup = sal_False;
- rtl::OString sGroup;
+ OString sGroup;
// seek to next group
while ( nPos < pLines->size() && !bGroup )
{
- rtl::OString sLine( *(*pLines)[ nPos ] );
+ OString sLine( *(*pLines)[ nPos ] );
sLine = sLine.trim();
if (!sLine.isEmpty() &&
( sLine[0] == '[' ) &&
@@ -206,7 +206,7 @@ sal_Bool LngParser::Merge(
while ( nPos < pLines->size()) {
OStringHashMap Text;
- rtl::OString sID( sGroup );
+ OString sID( sGroup );
std::size_t nLastLangPos = 0;
ResData *pResData = new ResData( "", sID , sSource );
@@ -215,11 +215,11 @@ sal_Bool LngParser::Merge(
// read languages
bGroup = sal_False;
- rtl::OString sLanguagesDone;
+ OString sLanguagesDone;
while ( nPos < pLines->size() && !bGroup )
{
- rtl::OString sLine( *(*pLines)[ nPos ] );
+ OString sLine( *(*pLines)[ nPos ] );
sLine = sLine.trim();
if (!sLine.isEmpty() &&
( sLine[0] == '[' ) &&
@@ -233,7 +233,7 @@ sal_Bool LngParser::Merge(
else
{
sal_Int32 n = 0;
- rtl::OString sLang(sLine.getToken(0, '=', n));
+ OString sLang(sLine.getToken(0, '=', n));
if (n == -1 || static_cast<bool>(sLine.match("/*")))
{
++nPos;
@@ -242,7 +242,7 @@ sal_Bool LngParser::Merge(
{
sLang = sLang.trim();
- rtl::OString sSearch( ";" );
+ OString sSearch( ";" );
sSearch += sLang;
sSearch += ";";
@@ -255,15 +255,15 @@ sal_Bool LngParser::Merge(
{
if( !sLang.isEmpty() )
{
- rtl::OString sNewText;
+ OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True );
if( sLang == "qtz" )
sNewText = sNewText.copy(sNewText.indexOf("|") + 2);
if ( !sNewText.isEmpty()) {
- rtl::OString *pLine = (*pLines)[ nPos ];
+ OString *pLine = (*pLines)[ nPos ];
- rtl::OString sText1( sLang );
+ OString sText1( sLang );
sText1 += " = \"";
// escape quotes, unescape double escaped quotes fdo#56648
sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"");
@@ -284,7 +284,7 @@ sal_Bool LngParser::Merge(
}
}
}
- rtl::OString sCur;
+ OString sCur;
if ( nLastLangPos )
{
for(size_t n = 0; n < aLanguages.size(); ++n)
@@ -293,14 +293,14 @@ sal_Bool LngParser::Merge(
if( !sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) && Text[sCur].isEmpty() && pEntrys )
{
- rtl::OString sNewText;
+ OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True );
if( sCur == "qtz" )
sNewText = sNewText.copy(sNewText.indexOf("|") + 2);
if (( !sNewText.isEmpty()) &&
!(( sCur.equalsL(RTL_CONSTASCII_STRINGPARAM("x-comment"))) && ( sNewText == "-" )))
{
- rtl::OString sLine;
+ OString sLine;
sLine += sCur;
sLine += " = \"";
// escape quotes, unescape double escaped quotes fdo#56648
@@ -313,9 +313,9 @@ sal_Bool LngParser::Merge(
if ( nLastLangPos < pLines->size() ) {
LngLineList::iterator it = pLines->begin();
std::advance( it, nLastLangPos );
- pLines->insert( it, new rtl::OString(sLine) );
+ pLines->insert( it, new OString(sLine) );
} else {
- pLines->push_back( new rtl::OString(sLine) );
+ pLines->push_back( new OString(sLine) );
}
}
}
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 46c7828d969c..d3bd71b04196 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -29,7 +29,7 @@
namespace
{
- static ::rtl::OString lcl_NormalizeFilename(const ::rtl::OString& rFilename)
+ static OString lcl_NormalizeFilename(const OString& rFilename)
{
return rFilename.copy(
std::max(
@@ -63,7 +63,7 @@ namespace
// class ResData
//
-ResData::ResData(const rtl::OString &rPF, const rtl::OString &rGId)
+ResData::ResData(const OString &rPF, const OString &rGId)
:
nWidth( 0 ),
nChildIndex( 0 ),
@@ -89,11 +89,11 @@ ResData::ResData(const rtl::OString &rPF, const rtl::OString &rGId)
pPairedList( NULL ),
sPForm( rPF )
{
- sGId = sGId.replaceAll("\r", rtl::OString());
- sPForm = sPForm.replaceAll("\r", rtl::OString());
+ sGId = sGId.replaceAll("\r", OString());
+ sPForm = sPForm.replaceAll("\r", OString());
}
-ResData::ResData(const rtl::OString &rPF, const rtl::OString &rGId , const rtl::OString &rFilename)
+ResData::ResData(const OString &rPF, const OString &rGId , const OString &rFilename)
:
nWidth( 0 ),
nChildIndex( 0 ),
@@ -120,8 +120,8 @@ ResData::ResData(const rtl::OString &rPF, const rtl::OString &rGId , const rtl::
pPairedList( NULL ),
sPForm( rPF )
{
- sGId = sGId.replaceAll("\r", rtl::OString());
- sPForm = sPForm.replaceAll("\r", rtl::OString());
+ sGId = sGId.replaceAll("\r", OString());
+ sPForm = sPForm.replaceAll("\r", OString());
}
@@ -165,22 +165,22 @@ ResData::~ResData()
// class PFormEntrys
//
-sal_Bool PFormEntrys::GetTransex3Text( rtl::OString &rReturn,
- sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel )
+sal_Bool PFormEntrys::GetTransex3Text( OString &rReturn,
+ sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel )
{
sal_Bool rc = GetText( rReturn , nTyp , nLangIndex , bDel );
for( sal_Int32 idx = 0; idx < rReturn.getLength(); idx++ )
{
if( rReturn[idx] == '\"' && ( idx >= 1 ) && rReturn[idx-1] == '\\' )
{
- rReturn = rReturn.replaceAt( idx-1, 1, rtl::OString() );
+ rReturn = rReturn.replaceAt( idx-1, 1, OString() );
}
}
return rc;
}
/*****************************************************************************/
-sal_Bool PFormEntrys::GetText( rtl::OString &rReturn,
- sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel )
+sal_Bool PFormEntrys::GetText( OString &rReturn,
+ sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel )
{
sal_Bool bReturn=sal_True;
@@ -224,19 +224,19 @@ MergeData::~MergeData()
PFormEntrys* MergeData::GetPFormEntries()
{
- if( aMap.find( rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
- return aMap[rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK"))];
+ if( aMap.find( OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
+ return aMap[OString(RTL_CONSTASCII_STRINGPARAM("HACK"))];
return NULL;
}
void MergeData::Insert(PFormEntrys* pfEntrys )
{
- aMap.insert( PFormEntrysHashMap::value_type( rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) , pfEntrys ) );
+ aMap.insert( PFormEntrysHashMap::value_type( OString(RTL_CONSTASCII_STRINGPARAM("HACK")) , pfEntrys ) );
}
-PFormEntrys* MergeData::GetPFObject( const rtl::OString& rPFO )
+PFormEntrys* MergeData::GetPFObject( const OString& rPFO )
{
- if( aMap.find( rtl::OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
+ if( aMap.find( OString(RTL_CONSTASCII_STRINGPARAM("HACK")) ) != aMap.end() )
return aMap[ rPFO ];
return NULL;
}
@@ -252,7 +252,7 @@ sal_Bool MergeData::operator==( ResData *pData )
//
MergeDataFile::MergeDataFile(
- const rtl::OString &rFileName, const rtl::OString &rFile,
+ const OString &rFileName, const OString &rFile,
bool bCaseSensitive, bool bWithQtz )
{
std::ifstream aInputStream( rFileName.getStr() );
@@ -373,17 +373,17 @@ MergeDataFile::~MergeDataFile()
delete aI->second;
}
-std::vector<rtl::OString> MergeDataFile::GetLanguages() const
+std::vector<OString> MergeDataFile::GetLanguages() const
{
- return std::vector<rtl::OString>(aLanguageSet.begin(),aLanguageSet.end());
+ return std::vector<OString>(aLanguageSet.begin(),aLanguageSet.end());
}
MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive )
{
- rtl::OString sOldG = pResData->sGId;
- rtl::OString sOldL = pResData->sId;
- rtl::OString sGID = pResData->sGId;
- rtl::OString sLID;
+ OString sOldG = pResData->sGId;
+ OString sOldL = pResData->sId;
+ OString sGID = pResData->sGId;
+ OString sLID;
if (sGID.isEmpty())
sGID = pResData->sId;
else
@@ -391,7 +391,7 @@ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive
pResData->sGId = sGID;
pResData->sId = sLID;
- rtl::OString sKey = CreateKey( pResData->sResTyp , pResData->sGId , pResData->sId , pResData->sFilename , bCaseSensitive );
+ OString sKey = CreateKey( pResData->sResTyp , pResData->sGId , pResData->sId , pResData->sFilename , bCaseSensitive );
if(aMap.find( sKey ) != aMap.end())
{
@@ -424,17 +424,17 @@ PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData )
}
void MergeDataFile::InsertEntry(
- const rtl::OString &rTYP, const rtl::OString &rGID,
- const rtl::OString &rLID, const rtl::OString &rPFO,
- const rtl::OString &nLANG, const rtl::OString &rTEXT,
- const rtl::OString &rQHTEXT, const rtl::OString &rTITLE ,
- const rtl::OString &rInFilename , bool bCaseSensitive
+ const OString &rTYP, const OString &rGID,
+ const OString &rLID, const OString &rPFO,
+ const OString &nLANG, const OString &rTEXT,
+ const OString &rQHTEXT, const OString &rTITLE ,
+ const OString &rInFilename , bool bCaseSensitive
)
{
MergeData *pData;
// search for MergeData
- rtl::OString sKey = CreateKey(rTYP , rGID , rLID , rInFilename , bCaseSensitive);
+ OString sKey = CreateKey(rTYP , rGID , rLID , rInFilename , bCaseSensitive);
MergeDataHashMap::const_iterator mit;
mit = aMap.find( sKey );
if( mit != aMap.end() )
@@ -462,11 +462,11 @@ void MergeDataFile::InsertEntry(
pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
}
-rtl::OString MergeDataFile::CreateKey(const rtl::OString& rTYP, const rtl::OString& rGID,
- const rtl::OString& rLID, const rtl::OString& rFilename, bool bCaseSensitive)
+OString MergeDataFile::CreateKey(const OString& rTYP, const OString& rGID,
+ const OString& rLID, const OString& rFilename, bool bCaseSensitive)
{
- static const ::rtl::OString sStroke('-');
- ::rtl::OString sKey( rTYP );
+ static const OString sStroke('-');
+ OString sKey( rTYP );
sKey += sStroke;
sKey += rGID;
sKey += sStroke;
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index 7bebc61293cc..ce4d757aaebe 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -29,8 +29,8 @@
#include <fstream>
#include <vector>
-rtl::OString sInputFileName;
-rtl::OString sOutputFile;
+OString sInputFileName;
+OString sOutputFile;
int extractTranslations()
{
@@ -43,7 +43,7 @@ int extractTranslations()
exsltRegisterAll();
- rtl::OString sStyleSheet = rtl::OString(getenv("SRC_ROOT")) + rtl::OString("/solenv/bin/uilangfilter.xslt");
+ OString sStyleSheet = OString(getenv("SRC_ROOT")) + OString("/solenv/bin/uilangfilter.xslt");
xsltStylesheetPtr stylesheet = xsltParseStylesheetFile ((const xmlChar *)sStyleSheet.getStr());
@@ -89,8 +89,8 @@ namespace
{
bool lcl_MergeLang(
const MergeDataHashMap &rMap,
- const rtl::OString &rLanguage,
- const rtl::OString &rDestinationFile)
+ const OString &rLanguage,
+ const OString &rDestinationFile)
{
std::ofstream aDestination(
rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc);
@@ -107,7 +107,7 @@ namespace
continue;
PFormEntrys* pFoo = aI->second->GetPFormEntries();
- rtl::OString sOut;
+ OString sOut;
pFoo->GetText( sOut, STRING_TYP_TEXT, rLanguage );
if (sOut.isEmpty())
@@ -136,8 +136,8 @@ bool Merge(
{
bool bDestinationIsDir(false);
- const rtl::OUString aDestDir(rtl::OStringToOUString(rDestinationDir, RTL_TEXTENCODING_UTF8));
- rtl::OUString aDestDirUrl;
+ const OUString aDestDir(OStringToOUString(rDestinationDir, RTL_TEXTENCODING_UTF8));
+ OUString aDestDirUrl;
if (osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(aDestDir, aDestDirUrl))
{
osl::DirectoryItem aTmp;
@@ -157,22 +157,22 @@ bool Merge(
}
MergeDataFile aMergeDataFile( rPOFile, rSourceFile, sal_False );
- std::vector<rtl::OString> aLanguages;
+ std::vector<OString> aLanguages;
if( rLanguage.equalsIgnoreAsciiCase("ALL") )
aLanguages = aMergeDataFile.GetLanguages();
else
aLanguages.push_back(rLanguage);
const MergeDataHashMap& rMap = aMergeDataFile.getMap();
- const rtl::OString aDestinationDir(rDestinationDir + "/");
+ const OString aDestinationDir(rDestinationDir + "/");
bool bResult = true;
for(size_t n = 0; n < aLanguages.size(); ++n)
{
- rtl::OString sCur = aLanguages[ n ];
+ OString sCur = aLanguages[ n ];
if (sCur.isEmpty() || sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")))
continue;
- const rtl::OString aDestinationFile(aDestinationDir + sCur + ".ui");
+ const OString aDestinationFile(aDestinationDir + sCur + ".ui");
if (!lcl_MergeLang(rMap, sCur, aDestinationFile))
bResult = false;
}
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 954aed0bc40c..55bf4bc7688f 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -158,7 +158,7 @@ sal_uInt16 XMLFile::GetNodeType()
return XML_NODE_TYPE_FILE;
}
-void XMLFile::Write( rtl::OString const &aFilename )
+void XMLFile::Write( OString const &aFilename )
{
std::ofstream s(
aFilename.getStr(), std::ios_base::out | std::ios_base::trunc);
@@ -172,9 +172,9 @@ void XMLFile::Write( rtl::OString const &aFilename )
s.close();
}
-void XMLFile::WriteString( ofstream &rStream, const rtl::OUString &sString )
+void XMLFile::WriteString( ofstream &rStream, const OUString &sString )
{
- rtl::OString sText(rtl::OUStringToOString(sString, RTL_TEXTENCODING_UTF8));
+ OString sText(OUStringToOString(sString, RTL_TEXTENCODING_UTF8));
rStream << sText.getStr();
}
@@ -197,7 +197,7 @@ sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
if ( pElement->GetAttributeList())
for ( size_t j = 0; j < pElement->GetAttributeList()->size(); j++ ) {
rStream << " ";
- rtl::OUString sData( (*pElement->GetAttributeList())[ j ]->GetName() );
+ OUString sData( (*pElement->GetAttributeList())[ j ]->GetName() );
WriteString( rStream , XMLUtil::QuotHTML( sData ) );
rStream << "=\"";
sData = (*pElement->GetAttributeList())[ j ]->GetValue();
@@ -218,7 +218,7 @@ sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
break;
case XML_NODE_TYPE_DATA: {
XMLData *pData = ( XMLData * ) pCur;
- rtl::OUString sData( pData->GetData());
+ OUString sData( pData->GetData());
WriteString( rStream, XMLUtil::QuotHTML( sData ) );
}
break;
@@ -256,18 +256,18 @@ void XMLFile::Print( XMLNode *pCur, sal_uInt16 nLevel )
case XML_NODE_TYPE_ELEMENT: {
XMLElement *pElement = ( XMLElement * ) pCur;
- fprintf( stdout, "<%s", rtl::OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_UTF8).getStr());
+ fprintf( stdout, "<%s", OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_UTF8).getStr());
if ( pElement->GetAttributeList())
{
for (size_t j = 0; j < pElement->GetAttributeList()->size(); ++j)
{
- rtl::OString aAttrName(rtl::OUStringToOString((*pElement->GetAttributeList())[j]->GetName(),
+ OString aAttrName(OUStringToOString((*pElement->GetAttributeList())[j]->GetName(),
RTL_TEXTENCODING_UTF8));
if (!aAttrName.equalsIgnoreAsciiCase(XML_LANG))
{
fprintf( stdout, " %s=\"%s\"",
aAttrName.getStr(),
- rtl::OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),
+ OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),
RTL_TEXTENCODING_UTF8).getStr());
}
}
@@ -278,24 +278,24 @@ void XMLFile::Print( XMLNode *pCur, sal_uInt16 nLevel )
fprintf( stdout, ">" );
for ( size_t k = 0; k < pElement->GetChildList()->size(); k++ )
Print( (*pElement->GetChildList())[ k ], nLevel + 1 );
- fprintf( stdout, "</%s>", rtl::OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_UTF8).getStr());
+ fprintf( stdout, "</%s>", OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_UTF8).getStr());
}
}
break;
case XML_NODE_TYPE_DATA: {
XMLData *pData = ( XMLData * ) pCur;
- rtl::OUString sData = pData->GetData();
- fprintf( stdout, "%s", rtl::OUStringToOString(sData, RTL_TEXTENCODING_UTF8).getStr());
+ OUString sData = pData->GetData();
+ fprintf( stdout, "%s", OUStringToOString(sData, RTL_TEXTENCODING_UTF8).getStr());
}
break;
case XML_NODE_TYPE_COMMENT: {
XMLComment *pComment = ( XMLComment * ) pCur;
- fprintf( stdout, "<!--%s-->", rtl::OUStringToOString(pComment->GetComment(), RTL_TEXTENCODING_UTF8).getStr());
+ fprintf( stdout, "<!--%s-->", OUStringToOString(pComment->GetComment(), RTL_TEXTENCODING_UTF8).getStr());
}
break;
case XML_NODE_TYPE_DEFAULT: {
XMLDefault *pDefault = ( XMLDefault * ) pCur;
- fprintf( stdout, "%s", rtl::OUStringToOString(pDefault->GetDefault(), RTL_TEXTENCODING_UTF8).getStr());
+ fprintf( stdout, "%s", OUStringToOString(pDefault->GetDefault(), RTL_TEXTENCODING_UTF8).getStr());
}
break;
}
@@ -313,7 +313,7 @@ XMLFile::~XMLFile()
}
}
/*****************************************************************************/
-XMLFile::XMLFile( const rtl::OUString &rFileName ) // the file name, empty if created from memory stream
+XMLFile::XMLFile( const OUString &rFileName ) // the file name, empty if created from memory stream
/*****************************************************************************/
: XMLParentNode( NULL ),
sFileName ( rFileName ),
@@ -323,13 +323,13 @@ XMLFile::XMLFile( const rtl::OUString &rFileName ) // the file name, empty if cr
XMLStrings ( NULL )
{
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("bookmark")) , sal_True) );
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("variable")) , sal_True) );
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("paragraph")) , sal_True) );
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("alt")) , sal_True) );
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("caption")) , sal_True) );
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("title")) , sal_True) );
- nodes_localize.insert( TagMap::value_type(rtl::OString(RTL_CONSTASCII_STRINGPARAM("link")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("bookmark")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("variable")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("paragraph")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("alt")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("caption")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("title")) , sal_True) );
+ nodes_localize.insert( TagMap::value_type(OString(RTL_CONSTASCII_STRINGPARAM("link")) , sal_True) );
}
/*****************************************************************************/
void XMLFile::Extract( XMLFile *pCur )
@@ -350,18 +350,18 @@ void XMLFile::Extract( XMLFile *pCur )
/*****************************************************************************/
void XMLFile::InsertL10NElement( XMLElement* pElement ){
/*****************************************************************************/
- rtl::OString tmpStr,id,language("");
+ OString tmpStr,id,language("");
LangHashMap* elem;
if( pElement->GetAttributeList() != NULL ){
for ( size_t j = 0; j < pElement->GetAttributeList()->size(); j++ )
{
- tmpStr=rtl::OUStringToOString((*pElement->GetAttributeList())[ j ]->GetName(), RTL_TEXTENCODING_UTF8);
+ tmpStr=OUStringToOString((*pElement->GetAttributeList())[ j ]->GetName(), RTL_TEXTENCODING_UTF8);
if (tmpStr == ID) { // Get the "id" Attribute
- id = rtl::OUStringToOString((*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8);
+ id = OUStringToOString((*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8);
}
if (tmpStr == XML_LANG) { // Get the "xml-lang" Attribute
- language = rtl::OUStringToOString((*pElement->GetAttributeList())[j]->GetValue(),RTL_TEXTENCODING_UTF8);
+ language = OUStringToOString((*pElement->GetAttributeList())[j]->GetValue(),RTL_TEXTENCODING_UTF8);
}
}
@@ -382,7 +382,7 @@ void XMLFile::InsertL10NElement( XMLElement* pElement ){
elem=pos->second;
if ( (*elem)[ language ] )
{
- fprintf(stdout,"Error: Duplicated entry. ID = %s LANG = %s in File %s\n", id.getStr(), language.getStr(), rtl::OUStringToOString(sFileName, RTL_TEXTENCODING_ASCII_US).getStr() );
+ fprintf(stdout,"Error: Duplicated entry. ID = %s LANG = %s in File %s\n", id.getStr(), language.getStr(), OUStringToOString(sFileName, RTL_TEXTENCODING_ASCII_US).getStr() );
exit( -1 );
}
(*elem)[ language ]=pElement;
@@ -439,8 +439,8 @@ XMLFile& XMLFile::operator=(const XMLFile& obj){
void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
/*****************************************************************************/
{
- static const rtl::OString LOCALIZE("localize");
- static const rtl::OString THEID("id");
+ static const OString LOCALIZE("localize");
+ static const OString THEID("id");
bool bInsert = true;
if ( !pCur )
SearchL10NElements( this );
@@ -458,24 +458,24 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
break;
case XML_NODE_TYPE_ELEMENT: {
XMLElement *pElement = ( XMLElement * ) pCur;
- rtl::OString sName(rtl::OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase());
- rtl::OString language,tmpStrVal,oldref;
+ OString sName(OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase());
+ OString language,tmpStrVal,oldref;
if ( pElement->GetAttributeList())
{
for ( size_t j = 0 , cnt = pElement->GetAttributeList()->size(); j < cnt && bInsert; ++j )
{
- const rtl::OString tmpStr = rtl::OUStringToOString((*pElement->GetAttributeList())[j]->GetName(), RTL_TEXTENCODING_UTF8);
+ const OString tmpStr = OUStringToOString((*pElement->GetAttributeList())[j]->GetName(), RTL_TEXTENCODING_UTF8);
if (tmpStr == THEID) { // Get the "id" Attribute
- tmpStrVal=rtl::OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8 );
+ tmpStrVal=OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8 );
}
if (tmpStr == LOCALIZE) { // Get the "localize" Attribute
bInsert=false;
}
if (tmpStr == XML_LANG) { // Get the "xml-lang" Attribute
- language=rtl::OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8 );
+ language=OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8 );
}
if (tmpStr == OLDREF) { // Get the "oldref" Attribute
- oldref=rtl::OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8 );
+ oldref=OUStringToOString( (*pElement->GetAttributeList())[ j ]->GetValue(),RTL_TEXTENCODING_UTF8 );
}
}
pElement->SetLanguageId ( language );
@@ -510,10 +510,10 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
/*****************************************************************************/
{
static bool bStatusExport = true;
- const rtl::OString STATUS(RTL_CONSTASCII_STRINGPARAM("status"));
- const rtl::OString PUBLISH(RTL_CONSTASCII_STRINGPARAM("PUBLISH"));
- const rtl::OString DEPRECATED(RTL_CONSTASCII_STRINGPARAM("DEPRECATED"));
- const rtl::OString TOPIC(RTL_CONSTASCII_STRINGPARAM("topic"));
+ const OString STATUS(RTL_CONSTASCII_STRINGPARAM("status"));
+ const OString PUBLISH(RTL_CONSTASCII_STRINGPARAM("PUBLISH"));
+ const OString DEPRECATED(RTL_CONSTASCII_STRINGPARAM("DEPRECATED"));
+ const OString TOPIC(RTL_CONSTASCII_STRINGPARAM("topic"));
bool bInsert = true;
if ( !pCur )
@@ -532,18 +532,18 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
break;
case XML_NODE_TYPE_ELEMENT: {
XMLElement *pElement = ( XMLElement * ) pCur;
- rtl::OString sName(rtl::OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_ASCII_US));
+ OString sName(OUStringToOString(pElement->GetName(), RTL_TEXTENCODING_ASCII_US));
if (sName.equalsIgnoreAsciiCase(TOPIC))
{
if ( pElement->GetAttributeList())
{
for (size_t j = 0 , cnt = pElement->GetAttributeList()->size(); j < cnt && bInsert; ++j)
{
- const rtl::OString tmpStr(rtl::OUStringToOString((*pElement->GetAttributeList())[j]->GetName(),
+ const OString tmpStr(OUStringToOString((*pElement->GetAttributeList())[j]->GetName(),
RTL_TEXTENCODING_UTF8));
if (tmpStr.equalsIgnoreAsciiCase(STATUS))
{
- rtl::OString tmpStrVal(rtl::OUStringToOString( (*pElement->GetAttributeList())[j]->GetValue(),
+ OString tmpStrVal(OUStringToOString( (*pElement->GetAttributeList())[j]->GetValue(),
RTL_TEXTENCODING_UTF8));
if (!tmpStrVal.equalsIgnoreAsciiCase(PUBLISH) &&
!tmpStrVal.equalsIgnoreAsciiCase(DEPRECATED))
@@ -626,7 +626,7 @@ XMLElement& XMLElement::operator=(const XMLElement& obj){
}
/*****************************************************************************/
-void XMLElement::AddAttribute( const rtl::OUString &rAttribute, const rtl::OUString &rValue )
+void XMLElement::AddAttribute( const OUString &rAttribute, const OUString &rValue )
/*****************************************************************************/
{
if ( !pAttributes )
@@ -635,9 +635,9 @@ void XMLElement::AddAttribute( const rtl::OUString &rAttribute, const rtl::OUStr
}
/*****************************************************************************/
-void XMLElement::ChangeLanguageTag( const rtl::OUString &rValue )
+void XMLElement::ChangeLanguageTag( const OUString &rValue )
{
- SetLanguageId(rtl::OUStringToOString(rValue, RTL_TEXTENCODING_UTF8));
+ SetLanguageId(OUStringToOString(rValue, RTL_TEXTENCODING_UTF8));
if ( pAttributes )
{
for (size_t i = 0; i < pAttributes->size(); ++i)
@@ -659,7 +659,7 @@ void XMLElement::ChangeLanguageTag( const rtl::OUString &rValue )
{
pElem = static_cast< XMLElement* >(pNode);
pElem->ChangeLanguageTag( rValue );
- pElem->SetLanguageId(rtl::OUStringToOString(rValue, RTL_TEXTENCODING_UTF8));
+ pElem->SetLanguageId(OUStringToOString(rValue, RTL_TEXTENCODING_UTF8));
pElem = NULL;
pNode = NULL;
}
@@ -687,7 +687,7 @@ OUString XMLElement::ToOUString(){
OUStringBuffer* buffer = new OUStringBuffer();
Print(this,*buffer,true);
OUString result=buffer->makeStringAndClear();
- rtl::OUString xy(result.getStr());
+ OUString xy(result.getStr());
result=OUString(xy);
delete buffer;
return result;
@@ -751,7 +751,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
break;
case XML_NODE_TYPE_DATA: {
XMLData *pData = ( XMLData * ) pCur;
- rtl::OUString sData = pData->GetData();
+ OUString sData = pData->GetData();
buffer.append( sData );
}
break;
@@ -797,7 +797,7 @@ XMLData& XMLData::operator=(const XMLData& obj){
return *this;
}
/*****************************************************************************/
-void XMLData::AddData( const rtl::OUString &rData) {
+void XMLData::AddData( const OUString &rData) {
/*****************************************************************************/
sData += rData;
}
@@ -962,7 +962,7 @@ void SimpleXMLParser::StartElement(
const XML_Char *name, const XML_Char **atts )
/*****************************************************************************/
{
- rtl::OUString sElementName = rtl::OUString( XML_CHAR_TO_OUSTRING( name ));
+ OUString sElementName = OUString( XML_CHAR_TO_OUSTRING( name ));
XMLElement *pElement = new XMLElement( sElementName, ( XMLParentNode * ) pCurNode );
pCurNode = pElement;
pCurData = NULL;
@@ -970,8 +970,8 @@ void SimpleXMLParser::StartElement(
int i = 0;
while( atts[i] ) {
pElement->AddAttribute(
- rtl::OUString( XML_CHAR_TO_OUSTRING( atts[ i ] )),
- rtl::OUString( XML_CHAR_TO_OUSTRING( atts[ i + 1 ] )));
+ OUString( XML_CHAR_TO_OUSTRING( atts[ i ] )),
+ OUString( XML_CHAR_TO_OUSTRING( atts[ i + 1 ] )));
i += 2;
}
}
@@ -995,11 +995,11 @@ void SimpleXMLParser::CharacterData(
/*****************************************************************************/
{
if ( !pCurData ){
- rtl::OUString x = XML_CHAR_N_TO_OUSTRING( s, len );
+ OUString x = XML_CHAR_N_TO_OUSTRING( s, len );
XMLUtil::UnQuotHTML(x);
pCurData = new XMLData( x , pCurNode );
}else{
- rtl::OUString x = XML_CHAR_N_TO_OUSTRING( s, len );
+ OUString x = XML_CHAR_N_TO_OUSTRING( s, len );
XMLUtil::UnQuotHTML(x);
pCurData->AddData( x );
@@ -1012,7 +1012,7 @@ void SimpleXMLParser::Comment(
/*****************************************************************************/
{
pCurData = NULL;
- new XMLComment( rtl::OUString( XML_CHAR_TO_OUSTRING( data )), pCurNode );
+ new XMLComment( OUString( XML_CHAR_TO_OUSTRING( data )), pCurNode );
}
/*****************************************************************************/
@@ -1022,20 +1022,20 @@ void SimpleXMLParser::Default(
{
pCurData = NULL;
new XMLDefault(
- rtl::OUString( XML_CHAR_N_TO_OUSTRING( s, len )), pCurNode );
+ OUString( XML_CHAR_N_TO_OUSTRING( s, len )), pCurNode );
}
/*****************************************************************************/
-XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXMLFileIn )
+XMLFile *SimpleXMLParser::Execute( const OUString &rFileName, XMLFile* pXMLFileIn )
/*****************************************************************************/
{
aErrorInformation.eCode = XML_ERROR_NONE;
aErrorInformation.nLine = 0;
aErrorInformation.nColumn = 0;
- aErrorInformation.sMessage = rtl::OUString( "ERROR: Unable to open file ");
+ aErrorInformation.sMessage = OUString( "ERROR: Unable to open file ");
aErrorInformation.sMessage += rFileName;
- rtl::OUString aFileURL(lcl_pathnameToAbsoluteUrl(rFileName));
+ OUString aFileURL(lcl_pathnameToAbsoluteUrl(rFileName));
oslFileHandle h;
if (osl_openFile(aFileURL.pData, &h, osl_File_OpenFlag_Read)
@@ -1065,12 +1065,12 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXML
aErrorInformation.nLine = 0;
aErrorInformation.nColumn = 0;
if ( !pXMLFile->GetName().isEmpty()) {
- aErrorInformation.sMessage = rtl::OUString( "File ");
+ aErrorInformation.sMessage = OUString( "File ");
aErrorInformation.sMessage += pXMLFile->GetName();
- aErrorInformation.sMessage += rtl::OUString( " parsed successfully");
+ aErrorInformation.sMessage += OUString( " parsed successfully");
}
else
- aErrorInformation.sMessage = rtl::OUString( "XML-File parsed successfully");
+ aErrorInformation.sMessage = OUString( "XML-File parsed successfully");
if (!XML_Parse(aParser, reinterpret_cast< char * >(p), s, true))
{
@@ -1078,84 +1078,84 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFileName, XMLFile* pXML
aErrorInformation.nLine = XML_GetErrorLineNumber( aParser );
aErrorInformation.nColumn = XML_GetErrorColumnNumber( aParser );
- aErrorInformation.sMessage = rtl::OUString( "ERROR: ");
+ aErrorInformation.sMessage = OUString( "ERROR: ");
if ( !pXMLFile->GetName().isEmpty())
aErrorInformation.sMessage += pXMLFile->GetName();
else
- aErrorInformation.sMessage += rtl::OUString( "XML-File (");
- aErrorInformation.sMessage += rtl::OUString::valueOf(
+ aErrorInformation.sMessage += OUString( "XML-File (");
+ aErrorInformation.sMessage += OUString::valueOf(
sal::static_int_cast< sal_Int64 >(aErrorInformation.nLine));
- aErrorInformation.sMessage += rtl::OUString( ",");
- aErrorInformation.sMessage += rtl::OUString::valueOf(
+ aErrorInformation.sMessage += OUString( ",");
+ aErrorInformation.sMessage += OUString::valueOf(
sal::static_int_cast< sal_Int64 >(aErrorInformation.nColumn));
- aErrorInformation.sMessage += rtl::OUString( "): ");
+ aErrorInformation.sMessage += OUString( "): ");
switch (aErrorInformation.eCode) {
case XML_ERROR_NO_MEMORY:
- aErrorInformation.sMessage += rtl::OUString( "No memory");
+ aErrorInformation.sMessage += OUString( "No memory");
break;
case XML_ERROR_SYNTAX:
- aErrorInformation.sMessage += rtl::OUString( "Syntax");
+ aErrorInformation.sMessage += OUString( "Syntax");
break;
case XML_ERROR_NO_ELEMENTS:
- aErrorInformation.sMessage += rtl::OUString( "No elements");
+ aErrorInformation.sMessage += OUString( "No elements");
break;
case XML_ERROR_INVALID_TOKEN:
- aErrorInformation.sMessage += rtl::OUString( "Invalid token");
+ aErrorInformation.sMessage += OUString( "Invalid token");
break;
case XML_ERROR_UNCLOSED_TOKEN:
- aErrorInformation.sMessage += rtl::OUString( "Unclosed token");
+ aErrorInformation.sMessage += OUString( "Unclosed token");
break;
case XML_ERROR_PARTIAL_CHAR:
- aErrorInformation.sMessage += rtl::OUString( "Partial char");
+ aErrorInformation.sMessage += OUString( "Partial char");
break;
case XML_ERROR_TAG_MISMATCH:
- aErrorInformation.sMessage += rtl::OUString( "Tag mismatch");
+ aErrorInformation.sMessage += OUString( "Tag mismatch");
break;
case XML_ERROR_DUPLICATE_ATTRIBUTE:
- aErrorInformation.sMessage += rtl::OUString( "Dublicat attribute");
+ aErrorInformation.sMessage += OUString( "Dublicat attribute");
break;
case XML_ERROR_JUNK_AFTER_DOC_ELEMENT:
- aErrorInformation.sMessage += rtl::OUString( "Junk after doc element");
+ aErrorInformation.sMessage += OUString( "Junk after doc element");
break;
case XML_ERROR_PARAM_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString( "Param entity ref");
+ aErrorInformation.sMessage += OUString( "Param entity ref");
break;
case XML_ERROR_UNDEFINED_ENTITY:
- aErrorInformation.sMessage += rtl::OUString( "Undefined entity");
+ aErrorInformation.sMessage += OUString( "Undefined entity");
break;
case XML_ERROR_RECURSIVE_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString( "Recursive entity ref");
+ aErrorInformation.sMessage += OUString( "Recursive entity ref");
break;
case XML_ERROR_ASYNC_ENTITY:
- aErrorInformation.sMessage += rtl::OUString( "Async_entity");
+ aErrorInformation.sMessage += OUString( "Async_entity");
break;
case XML_ERROR_BAD_CHAR_REF:
- aErrorInformation.sMessage += rtl::OUString( "Bad char ref");
+ aErrorInformation.sMessage += OUString( "Bad char ref");
break;
case XML_ERROR_BINARY_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString( "Binary entity");
+ aErrorInformation.sMessage += OUString( "Binary entity");
break;
case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF:
- aErrorInformation.sMessage += rtl::OUString( "Attribute external entity ref");
+ aErrorInformation.sMessage += OUString( "Attribute external entity ref");
break;
case XML_ERROR_MISPLACED_XML_PI:
- aErrorInformation.sMessage += rtl::OUString( "Misplaced xml pi");
+ aErrorInformation.sMessage += OUString( "Misplaced xml pi");
break;
case XML_ERROR_UNKNOWN_ENCODING:
- aErrorInformation.sMessage += rtl::OUString( "Unknown encoding");
+ aErrorInformation.sMessage += OUString( "Unknown encoding");
break;
case XML_ERROR_INCORRECT_ENCODING:
- aErrorInformation.sMessage += rtl::OUString( "Incorrect encoding");
+ aErrorInformation.sMessage += OUString( "Incorrect encoding");
break;
case XML_ERROR_UNCLOSED_CDATA_SECTION:
- aErrorInformation.sMessage += rtl::OUString( "Unclosed cdata section");
+ aErrorInformation.sMessage += OUString( "Unclosed cdata section");
break;
case XML_ERROR_EXTERNAL_ENTITY_HANDLING:
- aErrorInformation.sMessage += rtl::OUString( "External entity handling");
+ aErrorInformation.sMessage += OUString( "External entity handling");
break;
case XML_ERROR_NOT_STANDALONE:
- aErrorInformation.sMessage += rtl::OUString( "Not standalone");
+ aErrorInformation.sMessage += OUString( "Not standalone");
break;
case XML_ERROR_NONE:
break;
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index d531db496ca1..04fccfbf9484 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -86,7 +86,7 @@ int InitXrmExport( char*, char* pFilename)
/*****************************************************************************/
{
// instanciate Export
- rtl::OString sFilename( pFilename );
+ OString sFilename( pFilename );
if ( bMergeMode )
pParser = new XRMResMerge( sMergeSrc, sOutputFile, sFilename );
@@ -179,11 +179,11 @@ XRMResParser::~XRMResParser()
int XRMResParser::Execute( int nToken, char * pToken )
/*****************************************************************************/
{
- rtl::OString rToken( pToken );
+ OString rToken( pToken );
switch ( nToken ) {
case XRM_TEXT_START:{
- rtl::OString sNewGID = GetAttribute( rToken, "id" );
+ OString sNewGID = GetAttribute( rToken, "id" );
if ( sNewGID != sGID ) {
sGID = sNewGID;
}
@@ -196,14 +196,14 @@ int XRMResParser::Execute( int nToken, char * pToken )
case XRM_TEXT_END: {
sCurrentCloseTag = rToken;
- sResourceType = rtl::OString ( "readmeitem" );
- sLangAttribute = rtl::OString ( "xml:lang" );
+ sResourceType = OString ( "readmeitem" );
+ sLangAttribute = OString ( "xml:lang" );
WorkOnText( sCurrentOpenTag, sCurrentText );
Output( sCurrentText );
EndOfText( sCurrentOpenTag, sCurrentCloseTag );
bText = sal_False;
- rToken = rtl::OString("");
- sCurrentText = rtl::OString("");
+ rToken = OString("");
+ sCurrentText = OString("");
}
break;
@@ -219,7 +219,7 @@ int XRMResParser::Execute( int nToken, char * pToken )
case DESC_TEXT_START:{
if (bDisplayName) {
- sGID = rtl::OString("dispname");
+ sGID = OString("dispname");
bText = sal_True;
sCurrentText = "";
sCurrentOpenTag = rToken;
@@ -231,14 +231,14 @@ int XRMResParser::Execute( int nToken, char * pToken )
case DESC_TEXT_END: {
if (bDisplayName) {
sCurrentCloseTag = rToken;
- sResourceType = rtl::OString ( "description" );
- sLangAttribute = rtl::OString ( "lang" );
+ sResourceType = OString ( "description" );
+ sLangAttribute = OString ( "lang" );
WorkOnText( sCurrentOpenTag, sCurrentText );
Output( sCurrentText );
EndOfText( sCurrentOpenTag, sCurrentCloseTag );
bText = sal_False;
- rToken = rtl::OString("");
- sCurrentText = rtl::OString("");
+ rToken = OString("");
+ sCurrentText = OString("");
}
}
break;
@@ -255,17 +255,17 @@ int XRMResParser::Execute( int nToken, char * pToken )
case DESC_EXTENSION_DESCRIPTION_SRC: {
if (bExtensionDescription) {
- sGID = rtl::OString("extdesc");
- sResourceType = rtl::OString ( "description" );
- sLangAttribute = rtl::OString ( "lang" );
+ sGID = OString("extdesc");
+ sResourceType = OString ( "description" );
+ sLangAttribute = OString ( "lang" );
sCurrentOpenTag = rToken;
- sCurrentText = rtl::OString("");
+ sCurrentText = OString("");
Output( rToken );
WorkOnDesc( sCurrentOpenTag, sCurrentText );
sCurrentCloseTag = rToken;
Output( sCurrentText );
- rToken = rtl::OString("");
- sCurrentText = rtl::OString("");
+ rToken = OString("");
+ sCurrentText = OString("");
}
}
break;
@@ -285,13 +285,13 @@ int XRMResParser::Execute( int nToken, char * pToken )
}
/*****************************************************************************/
-rtl::OString XRMResParser::GetAttribute( const rtl::OString &rToken, const rtl::OString &rAttribute )
+OString XRMResParser::GetAttribute( const OString &rToken, const OString &rAttribute )
/*****************************************************************************/
{
- rtl::OString sTmp( rToken );
+ OString sTmp( rToken );
sTmp = sTmp.replace('\t', ' ');
- rtl::OString sSearch( " " );
+ OString sSearch( " " );
sSearch += rAttribute;
sSearch += "=";
sal_Int32 nPos = sTmp.indexOf( sSearch );
@@ -299,29 +299,29 @@ rtl::OString XRMResParser::GetAttribute( const rtl::OString &rToken, const rtl::
if ( nPos != -1 )
{
sTmp = sTmp.copy( nPos );
- rtl::OString sId = sTmp.getToken(1, '"');
+ OString sId = sTmp.getToken(1, '"');
return sId;
}
- return rtl::OString();
+ return OString();
}
/*****************************************************************************/
-void XRMResParser::Error( const rtl::OString &rError )
+void XRMResParser::Error( const OString &rError )
/*****************************************************************************/
{
yyerror(( char * ) rError.getStr());
}
/*****************************************************************************/
-void XRMResParser::ConvertStringToDBFormat( rtl::OString &rString )
+void XRMResParser::ConvertStringToDBFormat( OString &rString )
/*****************************************************************************/
{
rString = rString.trim().replaceAll("\t", "\\t");
}
/*****************************************************************************/
-void XRMResParser::ConvertStringToXMLFormat( rtl::OString &rString )
+void XRMResParser::ConvertStringToXMLFormat( OString &rString )
/*****************************************************************************/
{
rString = rString.replaceAll("\\t", "\t");
@@ -343,7 +343,7 @@ XRMResExport::XRMResExport(
pOutputStream.open( rOutputFile, PoOfstream::APP );
if (!pOutputStream.isOpen())
{
- rtl::OString sError( "Unable to open output file: " );
+ OString sError( "Unable to open output file: " );
sError += rOutputFile;
Error( sError );
}
@@ -357,17 +357,17 @@ XRMResExport::~XRMResExport()
delete pResData;
}
-void XRMResExport::Output( const rtl::OString& ) {}
+void XRMResExport::Output( const OString& ) {}
/*****************************************************************************/
void XRMResExport::WorkOnDesc(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
)
/*****************************************************************************/
{
- rtl::OString sDescFileName(
- sInputFileName.replaceAll("description.xml", rtl::OString()));
+ OString sDescFileName(
+ sInputFileName.replaceAll("description.xml", OString()));
sDescFileName += GetAttribute( rOpenTag, "xlink:href" );
ifstream file (sDescFileName.getStr(), ios::in|ios::binary|ios::ate);
if (file.is_open()) {
@@ -377,7 +377,7 @@ void XRMResExport::WorkOnDesc(
file.read (memblock, size);
file.close();
memblock[size] = '\0';
- rText = rtl::OString(memblock).replaceAll("\n", "\\n");
+ rText = OString(memblock).replaceAll("\n", "\\n");
delete[] memblock;
}
WorkOnText( rOpenTag, rText );
@@ -386,40 +386,40 @@ void XRMResExport::WorkOnDesc(
//*****************************************************************************/
void XRMResExport::WorkOnText(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
)
/*****************************************************************************/
{
- rtl::OString sLang( GetAttribute( rOpenTag, sLangAttribute ));
+ OString sLang( GetAttribute( rOpenTag, sLangAttribute ));
if ( !pResData )
{
- rtl::OString sPlatform( "" );
+ OString sPlatform( "" );
pResData = new ResData( sPlatform, GetGID() );
}
- rtl::OString sText(rText);
+ OString sText(rText);
ConvertStringToDBFormat(sText);
pResData->sText[sLang] = sText;
}
/*****************************************************************************/
void XRMResExport::EndOfText(
- const rtl::OString &,
- const rtl::OString &
+ const OString &,
+ const OString &
)
/*****************************************************************************/
{
if ( pResData )
{
- rtl::OString sCur;
+ OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ )
{
sCur = aLanguages[ n ];
- rtl::OString sAct(
- pResData->sText[sCur].replaceAll("\x0A", rtl::OString()));
+ OString sAct(
+ pResData->sText[sCur].replaceAll("\x0A", OString()));
if( !sAct.isEmpty() )
common::writePoEntry(
@@ -457,7 +457,7 @@ XRMResMerge::XRMResMerge(
pOutputStream.open(
rOutputFile.getStr(), std::ios_base::out | std::ios_base::trunc);
if (!pOutputStream.is_open()) {
- rtl::OString sError( "Unable to open output file: " );
+ OString sError( "Unable to open output file: " );
sError += rOutputFile;
Error( sError );
}
@@ -474,8 +474,8 @@ XRMResMerge::~XRMResMerge()
/*****************************************************************************/
void XRMResMerge::WorkOnDesc(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
)
/*****************************************************************************/
{
@@ -483,32 +483,32 @@ void XRMResMerge::WorkOnDesc(
if ( pMergeDataFile && pResData ) {
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
if ( pEntrys ) {
- rtl::OString sCur;
- rtl::OString sDescFilename = GetAttribute ( rOpenTag, "xlink:href" );
+ OString sCur;
+ OString sDescFilename = GetAttribute ( rOpenTag, "xlink:href" );
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
sCur = aLanguages[ n ];
- rtl::OString sContent;
+ OString sContent;
if ( !sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) &&
( pEntrys->GetText(
sContent, STRING_TYP_TEXT, sCur, sal_True )) &&
( sContent != "-" ) && !sContent.isEmpty())
{
- rtl::OString sText( sContent );
- rtl::OString sAdditionalLine( "\n " );
+ OString sText( sContent );
+ OString sAdditionalLine( "\n " );
sAdditionalLine += rOpenTag;
- rtl::OString sSearch = sLangAttribute;
+ OString sSearch = sLangAttribute;
sSearch += "=\"";
- rtl::OString sReplace( sSearch );
+ OString sReplace( sSearch );
sSearch += GetAttribute( rOpenTag, sLangAttribute );
sReplace += sCur;
sAdditionalLine = sAdditionalLine.replaceFirst(
sSearch, sReplace);
- sSearch = rtl::OString("xlink:href=\"");
+ sSearch = OString("xlink:href=\"");
sReplace = sSearch;
- rtl::OString sLocDescFilename = sDescFilename;
+ OString sLocDescFilename = sDescFilename;
sLocDescFilename = sLocDescFilename.replaceFirst(
"en-US", sCur);
@@ -526,7 +526,7 @@ void XRMResMerge::WorkOnDesc(
<< " does not contain any /\n";
throw false; //TODO
}
- rtl::OString sOutputDescFile(
+ OString sOutputDescFile(
sOutputFile.copy(0, i + 1) + sLocDescFilename);
sText = sText.replaceAll("\\n", "\n");
ofstream file(sOutputDescFile.getStr());
@@ -549,23 +549,23 @@ void XRMResMerge::WorkOnDesc(
/*****************************************************************************/
void XRMResMerge::WorkOnText(
- const rtl::OString &rOpenTag,
- rtl::OString &rText
+ const OString &rOpenTag,
+ OString &rText
)
/*****************************************************************************/
{
- rtl::OString sLang( GetAttribute( rOpenTag, sLangAttribute ));
+ OString sLang( GetAttribute( rOpenTag, sLangAttribute ));
if ( pMergeDataFile ) {
if ( !pResData ) {
- rtl::OString sPlatform( "" );
+ OString sPlatform( "" );
pResData = new ResData( sPlatform, GetGID() , sFilename );
pResData->sResTyp = sResourceType;
}
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
if ( pEntrys ) {
- rtl::OString sContent;
+ OString sContent;
if ( !sLang.equalsIgnoreAsciiCase("en-US") &&
( pEntrys->GetText(
sContent, STRING_TYP_TEXT, sLang )) &&
@@ -580,7 +580,7 @@ void XRMResMerge::WorkOnText(
}
/*****************************************************************************/
-void XRMResMerge::Output( const rtl::OString& rOutput )
+void XRMResMerge::Output( const OString& rOutput )
/*****************************************************************************/
{
if (!rOutput.isEmpty())
@@ -589,8 +589,8 @@ void XRMResMerge::Output( const rtl::OString& rOutput )
/*****************************************************************************/
void XRMResMerge::EndOfText(
- const rtl::OString &rOpenTag,
- const rtl::OString &rCloseTag
+ const OString &rOpenTag,
+ const OString &rCloseTag
)
/*****************************************************************************/
{
@@ -599,22 +599,22 @@ void XRMResMerge::EndOfText(
if ( pMergeDataFile && pResData ) {
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
if ( pEntrys ) {
- rtl::OString sCur;
+ OString sCur;
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
sCur = aLanguages[ n ];
- rtl::OString sContent;
+ OString sContent;
if (!sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")) &&
( pEntrys->GetText(
sContent, STRING_TYP_TEXT, sCur, sal_True )) &&
( sContent != "-" ) && !sContent.isEmpty() &&
helper::isWellFormedXML( sContent ))
{
- rtl::OString sText( sContent );
- rtl::OString sAdditionalLine( "\n " );
+ OString sText( sContent );
+ OString sAdditionalLine( "\n " );
sAdditionalLine += rOpenTag;
- rtl::OString sSearch = sLangAttribute;
+ OString sSearch = sLangAttribute;
sSearch += "=\"";
- rtl::OString sReplace( sSearch );
+ OString sReplace( sSearch );
sSearch += GetAttribute( rOpenTag, sLangAttribute );
sReplace += sCur;
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 449d0e19268b..f4caedd0ae69 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -56,7 +56,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
// min, max
#define Max(a,b) (a > b ? a : b)
@@ -122,7 +121,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
// (or better speaking: the list of dictionaries using the
// new configuration entries).
std::list< SvtLinguConfigDictionaryEntry > aDics;
- uno::Sequence< rtl::OUString > aFormatList;
+ uno::Sequence< OUString > aFormatList;
aLinguCfg.GetSupportedDictionaryFormatsFor( "Hyphenators",
"org.openoffice.lingu.LibHnjHyphenator", aFormatList );
sal_Int32 nLen = aFormatList.getLength();
@@ -149,11 +148,11 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
{
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
- std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
+ std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
- uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+ uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
sal_Int32 nLen2 = aLocaleNames.getLength();
for (k = 0; k < nLen2; ++k)
{
@@ -162,7 +161,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
}
// ... and add them to the resulting sequence
aSuppLocales.realloc( aLocaleNamesSet.size() );
- std::set< rtl::OUString, lt_rtl_OUString >::const_iterator aItB;
+ std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB)
{
@@ -188,7 +187,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
if (aDictIt->aLocaleNames.getLength() > 0 &&
aDictIt->aLocations.getLength() > 0)
{
- uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+ uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
sal_Int32 nLocales = aLocaleNames.getLength();
// currently only one language per dictionary is supported in the actual implementation...
@@ -204,7 +203,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
// also both files have to be in the same directory and the
// file names must only differ in the extension (.aff/.dic).
// Thus we use the first location only and strip the extension part.
- rtl::OUString aLocation = aDictIt->aLocations[0];
+ OUString aLocation = aDictIt->aLocations[0];
sal_Int32 nPos = aLocation.lastIndexOf( '.' );
aLocation = aLocation.copy( 0, nPos );
aDicts[k].aName = aLocation;
@@ -252,7 +251,7 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale)
}
-Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUString& aWord,
+Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale,
sal_Int16 nMaxLeading,
const ::com::sun::star::beans::PropertyValues& aProperties )
@@ -508,7 +507,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri
Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
- const ::rtl::OUString& /*aWord*/,
+ const OUString& /*aWord*/,
const ::com::sun::star::lang::Locale& /*aLocale*/,
sal_Int16 /*nIndex*/,
const ::com::sun::star::beans::PropertyValues& /*aProperties*/ )
@@ -520,7 +519,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
return NULL;
}
-Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const ::rtl::OUString& aWord,
+Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale,
const ::com::sun::star::beans::PropertyValues& aProperties )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
index 373d79a6248b..3de41f0b79c2 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -102,9 +102,9 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException);
// XHyphenator
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XLinguServiceEventBroadcaster
virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index c675b1c8bcf5..d8777c6464aa 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -103,7 +103,7 @@ public:
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
// XLanguageGuessing implementation
- virtual ::com::sun::star::lang::Locale SAL_CALL guessPrimaryLanguage( const ::rtl::OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL disableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL enableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (::com::sun::star::uno::RuntimeException);
@@ -111,7 +111,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (::com::sun::star::uno::RuntimeException);
// implementation specific
- void SetFingerPrintsDB( const rtl::OUString &fileName ) throw (RuntimeException);
+ void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException);
static const OUString & SAL_CALL getImplementationName_Static() throw();
@@ -136,13 +136,13 @@ void LangGuess_Impl::EnsureInitialized()
m_bInitialized = true;
// set default fingerprint path to where those get installed
- rtl::OUString aPhysPath;
- rtl::OUString aURL( SvtPathOptions().GetFingerprintPath() );
+ OUString aPhysPath;
+ OUString aURL( SvtPathOptions().GetFingerprintPath() );
utl::LocalFileHelper::ConvertURLToPhysicalName( aURL, aPhysPath );
#ifdef WNT
- aPhysPath = aPhysPath + rtl::OUString(static_cast<sal_Unicode>('\\'));
+ aPhysPath = aPhysPath + OUString(static_cast<sal_Unicode>('\\'));
#else
- aPhysPath = aPhysPath + rtl::OUString(static_cast<sal_Unicode>('/'));
+ aPhysPath = aPhysPath + OUString(static_cast<sal_Unicode>('/'));
#endif
SetFingerPrintsDB( aPhysPath );
@@ -184,7 +184,7 @@ void LangGuess_Impl::EnsureInitialized()
//*************************************************************************
Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
- const ::rtl::OUString& rText,
+ const OUString& rText,
::sal_Int32 nStartPos,
::sal_Int32 nLen )
throw (lang::IllegalArgumentException, uno::RuntimeException)
@@ -211,7 +211,7 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
#define DEFAULT_CONF_FILE_NAME "fpdb.conf"
void LangGuess_Impl::SetFingerPrintsDB(
- const rtl::OUString &filePath )
+ const OUString &filePath )
throw (RuntimeException)
{
//! text encoding for file name / path needs to be in the same encoding the OS uses
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index 52421ce095dc..bd107fae82a5 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -48,9 +48,9 @@ using ::com::sun::star::lang::Locale;
using namespace ::com::sun::star;
#if defined(WNT)
-rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
+OString Win_GetShortPathName( const OUString &rLongPathName )
{
- rtl::OString aRes;
+ OString aRes;
sal_Unicode aShortBuffer[1024] = {0};
sal_Int32 nShortBufSize = SAL_N_ELEMENTS( aShortBuffer );
@@ -62,7 +62,7 @@ rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
nShortBufSize );
if (nShortLen < nShortBufSize) // conversion successful?
- aRes = rtl::OString( OU2ENC( rtl::OUString( aShortBuffer, nShortLen ), osl_getThreadTextEncoding()) );
+ aRes = OString( OU2ENC( OUString( aShortBuffer, nShortLen ), osl_getThreadTextEncoding()) );
else
OSL_FAIL( "Win_GetShortPathName: buffer to short" );
@@ -82,12 +82,12 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy
if (!pDicType)
return aRes;
- rtl::OUString aFormatName;
+ OUString aFormatName;
String aDicExtension;
#ifdef SYSTEM_DICTS
- rtl::OUString aSystemDir;
- rtl::OUString aSystemPrefix;
- rtl::OUString aSystemSuffix;
+ OUString aSystemDir;
+ OUString aSystemPrefix;
+ OUString aSystemSuffix;
#endif
if (strcmp( pDicType, "DICT" ) == 0)
{
@@ -194,7 +194,7 @@ void MergeNewStyleDicsAndOldStyleDics(
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aIt;
for (aIt = rNewStyleDics.begin() ; aIt != rNewStyleDics.end(); ++aIt)
{
- const uno::Sequence< rtl::OUString > aLocaleNames( aIt->aLocaleNames );
+ const uno::Sequence< OUString > aLocaleNames( aIt->aLocaleNames );
sal_Int32 nLocaleNames = aLocaleNames.getLength();
for (sal_Int32 k = 0; k < nLocaleNames; ++k)
{
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 1e6a3de79f7b..f4e7d08d2959 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -31,7 +31,7 @@
#define OU2ENC(rtlOUString, rtlEncoding) \
- ::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
+ OString((rtlOUString).getStr(), (rtlOUString).getLength(), \
rtlEncoding, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK).getStr()
@@ -41,7 +41,7 @@ struct SvtLinguConfigDictionaryEntry;
struct lt_rtl_OUString
{
- bool operator() (const rtl::OUString &r1, const rtl::OUString &r2) const
+ bool operator() (const OUString &r1, const OUString &r2) const
{
return r1 < r2;
}
@@ -61,7 +61,7 @@ inline sal_Bool operator == ( const ::com::sun::star::lang::Locale &rL1, const :
// a restriction of only about 110-130 characters length to a path name in order
// for it to work with 'fopen'. And that length is usually easily exceeded
// when using extensions...
-rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName );
+OString Win_GetShortPathName( const OUString &rLongPathName );
#endif
///////////////////////////////////////////////////////////////////////////
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 135b1b278ac6..92502ad043ae 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -50,9 +50,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2;
-using ::rtl::OUString;
-
-
///////////////////////////////////////////////////////////////////////////
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 54db8552b99c..8f85482cebd8 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -55,9 +55,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
// XML-header of SPELLML queries
#define SPELLML_HEADER "<?xml?>"
@@ -125,7 +122,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
// (or better speaking: the list of dictionaries using the
// new configuration entries).
std::list< SvtLinguConfigDictionaryEntry > aDics;
- uno::Sequence< rtl::OUString > aFormatList;
+ uno::Sequence< OUString > aFormatList;
aLinguCfg.GetSupportedDictionaryFormatsFor( "SpellCheckers",
"org.openoffice.lingu.MySpellSpellChecker", aFormatList );
sal_Int32 nLen = aFormatList.getLength();
@@ -151,11 +148,11 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
{
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
- std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
+ std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
- uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+ uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
sal_Int32 nLen2 = aLocaleNames.getLength();
for (k = 0; k < nLen2; ++k)
{
@@ -164,7 +161,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
}
// ... and add them to the resulting sequence
aSuppLocales.realloc( aLocaleNamesSet.size() );
- std::set< rtl::OUString, lt_rtl_OUString >::const_iterator aItB;
+ std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB)
{
@@ -192,7 +189,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
if (aDictIt->aLocaleNames.getLength() > 0 &&
aDictIt->aLocations.getLength() > 0)
{
- uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+ uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
sal_Int32 nLocales = aLocaleNames.getLength();
// currently only one language per dictionary is supported in the actual implementation...
@@ -206,7 +203,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
// also both files have to be in the same directory and the
// file names must only differ in the extension (.aff/.dic).
// Thus we use the first location only and strip the extension part.
- rtl::OUString aLocation = aDictIt->aLocations[0];
+ OUString aLocation = aDictIt->aLocations[0];
sal_Int32 nPos = aLocation.lastIndexOf( '.' );
aLocation = aLocation.copy( 0, nPos );
aDNames[k] = aLocation;
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 4468f2e12282..c928958d7071 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -31,7 +31,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
-using ::rtl::OUString;
namespace linguistic
{
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 7e5eb00b7002..6956be3eacb9 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -38,8 +38,8 @@ class Meaning :
::com::sun::star::linguistic2::XMeaning
>
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSyn; // list of synonyms, may be empty.
- ::rtl::OUString aTerm;
+ ::com::sun::star::uno::Sequence< OUString > aSyn; // list of synonyms, may be empty.
+ OUString aTerm;
sal_Int16 nLanguage;
#if 0
@@ -52,16 +52,16 @@ class Meaning :
Meaning & operator = (const Meaning &);
public:
- Meaning(const ::rtl::OUString &rTerm, sal_Int16 nLang);
+ Meaning(const OUString &rTerm, sal_Int16 nLang);
virtual ~Meaning();
// XMeaning
- virtual ::rtl::OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException);
// non-interface specific functions
- void SetSynonyms( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSyn );
- void SetMeaning( const ::rtl::OUString &rTerm );
+ void SetSynonyms( const ::com::sun::star::uno::Sequence< OUString > &rSyn );
+ void SetMeaning( const OUString &rTerm );
};
} // namespace linguistic
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 6a302d7e1397..12b4b89ed2d5 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -54,9 +54,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
///////////////////////////////////////////////////////////////////////////
@@ -146,7 +143,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
// get list of dictionaries-to-use
std::list< SvtLinguConfigDictionaryEntry > aDics;
- uno::Sequence< rtl::OUString > aFormatList;
+ uno::Sequence< OUString > aFormatList;
aLinguCfg.GetSupportedDictionaryFormatsFor( "Thesauri",
"org.openoffice.lingu.new.Thesaurus", aFormatList );
sal_Int32 nLen = aFormatList.getLength();
@@ -173,11 +170,11 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
{
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
- std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
+ std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
- uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+ uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
sal_Int32 nLen2 = aLocaleNames.getLength();
for (k = 0; k < nLen2; ++k)
{
@@ -186,7 +183,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
}
// ... and add them to the resulting sequence
aSuppLocales.realloc( aLocaleNamesSet.size() );
- std::set< rtl::OUString, lt_rtl_OUString >::const_iterator aItB;
+ std::set< OUString, lt_rtl_OUString >::const_iterator aItB;
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB != aLocaleNamesSet.end(); ++aItB)
{
@@ -216,7 +213,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
if (aDictIt->aLocaleNames.getLength() > 0 &&
aDictIt->aLocations.getLength() > 0)
{
- uno::Sequence< rtl::OUString > aLocaleNames( aDictIt->aLocaleNames );
+ uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames );
sal_Int32 nLocales = aLocaleNames.getLength();
// currently only one language per dictionary is supported in the actual implementation...
@@ -232,7 +229,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
// also both files have to be in the same directory and the
// file names must only differ in the extension (.aff/.dic).
// Thus we use the first location only and strip the extension part.
- rtl::OUString aLocation = aDictIt->aLocations[0];
+ OUString aLocation = aDictIt->aLocations[0];
sal_Int32 nPos = aLocation.lastIndexOf( '.' );
aLocation = aLocation.copy( 0, nPos );
aTNames[k] = aLocation;
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index ffc497a75a4a..c38264f29dbc 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -96,7 +96,7 @@ class SpellCache :
xFlushLstnr;
FlushListener *pFlushLstnr;
- typedef std::set< ::rtl::OUString > WordList_t;
+ typedef std::set< OUString > WordList_t;
typedef std::map< LanguageType, WordList_t > LangWordList_t;
LangWordList_t aWordLists;
@@ -111,8 +111,8 @@ public:
// Flushable
virtual void Flush();
- void AddWord( const ::rtl::OUString& rWord, LanguageType nLang );
- bool CheckWord( const ::rtl::OUString& rWord, LanguageType nLang );
+ void AddWord( const OUString& rWord, LanguageType nLang );
+ bool CheckWord( const OUString& rWord, LanguageType nLang );
};
diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index 81c52ce9255e..9dec2d6dc15e 100644
--- a/linguistic/inc/linguistic/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
@@ -36,8 +36,8 @@ class HyphenatedWord :
::com::sun::star::linguistic2::XHyphenatedWord
>
{
- ::rtl::OUString aWord;
- ::rtl::OUString aHyphenatedWord;
+ OUString aWord;
+ OUString aHyphenatedWord;
sal_Int16 nHyphPos;
sal_Int16 nHyphenationPos;
sal_Int16 nLanguage;
@@ -48,12 +48,12 @@ class HyphenatedWord :
HyphenatedWord & operator = (const HyphenatedWord &);
public:
- HyphenatedWord(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
- const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
+ HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
virtual ~HyphenatedWord();
// XHyphenatedWord
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getWord()
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL
@@ -62,7 +62,7 @@ public:
virtual sal_Int16 SAL_CALL
getHyphenationPos()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getHyphenatedWord()
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL
@@ -72,15 +72,15 @@ public:
isAlternativeSpelling()
throw(::com::sun::star::uno::RuntimeException);
- ::rtl::OUString GetWord() { return aWord; }
- ::rtl::OUString GetHyphenatedWord() { return aHyphenatedWord; }
+ OUString GetWord() { return aWord; }
+ OUString GetHyphenatedWord() { return aHyphenatedWord; }
sal_Int16 GetLanguage() { return nLanguage; }
- void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
- void SetHyphenatedWord( ::rtl::OUString &rTxt ) { aHyphenatedWord = rTxt; }
+ void SetWord( OUString &rTxt ) { aWord = rTxt; }
+ void SetHyphenatedWord( OUString &rTxt ) { aHyphenatedWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
- const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
+ const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
};
@@ -90,8 +90,8 @@ class PossibleHyphens :
::com::sun::star::linguistic2::XPossibleHyphens
>
{
- ::rtl::OUString aWord;
- ::rtl::OUString aWordWithHyphens;
+ OUString aWord;
+ OUString aWordWithHyphens;
::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos;
sal_Int16 nLanguage;
@@ -100,33 +100,33 @@ class PossibleHyphens :
PossibleHyphens & operator = (const PossibleHyphens &);
public:
- PossibleHyphens(const ::rtl::OUString &rWord, sal_Int16 nLang,
- const ::rtl::OUString &rHyphWord,
+ PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
+ const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
virtual ~PossibleHyphens();
// XPossibleHyphens
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getWord()
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getPossibleHyphens()
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
getHyphenationPositions()
throw(::com::sun::star::uno::RuntimeException);
- ::rtl::OUString GetWord() { return aWord; }
+ OUString GetWord() { return aWord; }
sal_Int16 GetLanguage() { return nLanguage; }
- void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
+ void SetWord( OUString &rTxt ) { aWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
- (const ::rtl::OUString &rWord, sal_Int16 nLang,
- const ::rtl::OUString &rHyphWord,
+ (const OUString &rWord, sal_Int16 nLang,
+ const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
};
} // namespace linguistic
diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 201310995ee8..3995d87cc1e4 100644
--- a/linguistic/inc/linguistic/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
@@ -59,7 +59,7 @@ typedef cppu::WeakImplHelper2
class PropertyChgHelper :
public PropertyChgHelperBase
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropNames;
+ ::com::sun::star::uno::Sequence< OUString > aPropNames;
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > xMyEvtObj;
::cppu::OInterfaceContainerHelper aLngSvcEvtListeners;
@@ -85,7 +85,7 @@ protected:
virtual void SetDefaultValues();
virtual void GetCurrentValues();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &
+ ::com::sun::star::uno::Sequence< OUString > &
GetPropNames() { return aPropNames; }
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &
@@ -135,7 +135,7 @@ public:
void LaunchEvent(
const ::com::sun::star::linguistic2::LinguServiceEvent& rEvt );
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &
+ const ::com::sun::star::uno::Sequence< OUString > &
GetPropNames() const { return aPropNames; }
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index 5b1e417eef1e..c15d2fc70dab 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -91,7 +91,7 @@ LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex();
LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
-sal_Int32 LevDistance( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 );
+sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 );
/** Convert Locale to LanguageType for legacy handling.
Linguistic specific handling of an empty locale denoting LANGUAGE_NONE.
@@ -123,18 +123,18 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 );
sal_Bool FileExists( const String &rURL );
-::rtl::OUString GetDictionaryWriteablePath();
-::com::sun::star::uno::Sequence< ::rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL );
+OUString GetDictionaryWriteablePath();
+::com::sun::star::uno::Sequence< OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL );
/// @returns an URL for a new and writable dictionary rDicName.
/// The URL will point to the path given by 'GetDictionaryWriteablePath'
LNG_DLLPUBLIC String GetWritableDictionaryURL( const String &rDicName );
-LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
+LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
- RebuildHyphensAndControlChars( const rtl::OUString &rOrigWord,
+ RebuildHyphensAndControlChars( const OUString &rOrigWord,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord );
@@ -145,7 +145,7 @@ inline sal_Bool IsUpper( const String &rText, sal_Int16 nLanguage ) {
LNG_DLLPUBLIC CapType SAL_CALL capitalType(const OUString&, CharClass *);
String ToLower( const String &rText, sal_Int16 nLanguage );
-LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString &rText );
+LNG_DLLPUBLIC sal_Bool HasDigits( const OUString &rText );
LNG_DLLPUBLIC sal_Bool IsNumeric( const String &rText );
@@ -167,13 +167,13 @@ sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rP
::com::sun::star::linguistic2::XDictionaryEntry >
SearchDicList(
const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList >& rDicList,
- const ::rtl::OUString& rWord, sal_Int16 nLanguage,
+ const OUString& rWord, sal_Int16 nLanguage,
sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry );
LNG_DLLPUBLIC sal_uInt8 AddEntryToDic(
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic,
- const ::rtl::OUString &rWord, sal_Bool bIsNeg,
- const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang,
+ const OUString &rWord, sal_Bool bIsNeg,
+ const OUString &rRplcTxt, sal_Int16 nRplcLang,
sal_Bool bStripDot = sal_True );
LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList );
diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index 220a406e9dd9..92f9cd680c77 100644
--- a/linguistic/inc/linguistic/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
@@ -43,28 +43,28 @@ namespace com { namespace sun { namespace star {
namespace linguistic
{
-::com::sun::star::uno::Sequence< ::rtl::OUString >
+::com::sun::star::uno::Sequence< OUString >
MergeProposalSeqs(
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt1,
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt2,
+ ::com::sun::star::uno::Sequence< OUString > &rAlt1,
+ ::com::sun::star::uno::Sequence< OUString > &rAlt2,
sal_Bool bAllowDuplicates );
void SeqRemoveNegEntries(
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
+ ::com::sun::star::uno::Sequence< OUString > &rSeq,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > &rxDicList,
sal_Int16 nLanguage );
sal_Bool SeqHasEntry(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
- const ::rtl::OUString &rTxt);
+ const ::com::sun::star::uno::Sequence< OUString > &rSeq,
+ const OUString &rTxt);
///////////////////////////////////////////////////////////////////////////
-void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage,
+void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList,
- std::vector< rtl::OUString > & rDicListProps );
+ std::vector< OUString > & rDicListProps );
///////////////////////////////////////////////////////////////////////////
@@ -77,34 +77,34 @@ class SpellAlternatives
>
, private ::boost::noncopyable
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aAlt; // list of alternatives, may be empty.
- ::rtl::OUString aWord;
+ ::com::sun::star::uno::Sequence< OUString > aAlt; // list of alternatives, may be empty.
+ OUString aWord;
sal_Int16 nType; // type of failure
sal_Int16 nLanguage;
public:
LNG_DLLPUBLIC SpellAlternatives();
- SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives );
+ SpellAlternatives(const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
+ const ::com::sun::star::uno::Sequence< OUString > &rAlternatives );
virtual ~SpellAlternatives();
// XSpellAlternatives
- virtual ::rtl::OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getFailureType( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException);
// XSetSpellAlternatives
- virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException);
// non-interface specific functions
- void LNG_DLLPUBLIC SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang);
+ void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);
void LNG_DLLPUBLIC SetFailureType(sal_Int16 nTypeP);
- void LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ void LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< OUString > &rAlt );
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt );
};
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 6f4dde2756a7..502a1b630ae3 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -65,7 +65,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
#define SN_CONV_DICTIONARY "com.sun.star.linguistic2.ConversionDictionary"
@@ -279,7 +278,7 @@ void ConvDic::Save()
}
-ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const rtl::OUString &rFirstText, const rtl::OUString &rSecondText )
+ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText )
{
pair< ConvMap::iterator, ConvMap::iterator > aRange =
rMap.equal_range( rFirstText );
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 5beb83f859b7..375acbbca2fa 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -44,7 +44,7 @@ sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nCon
struct StrLT
{
- bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const
+ bool operator()( const OUString &rTxt1, const OUString &rTxt2 ) const
{
return rTxt1 < rTxt2;
}
@@ -52,19 +52,19 @@ struct StrLT
struct StrEQ
{
- bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const
+ bool operator()( const OUString &rTxt1, const OUString &rTxt2 ) const
{
return rTxt1 == rTxt2;
}
};
-typedef boost::unordered_multimap< const rtl::OUString, rtl::OUString,
- const rtl::OUStringHash, StrEQ > ConvMap;
+typedef boost::unordered_multimap< const OUString, OUString,
+ const OUStringHash, StrEQ > ConvMap;
-typedef std::set< rtl::OUString, StrLT > ConvMapKeySet;
+typedef std::set< OUString, StrLT > ConvMapKeySet;
-typedef boost::unordered_multimap< const rtl::OUString, sal_Int16,
- rtl::OUStringHash, StrEQ > PropTypeMap;
+typedef boost::unordered_multimap< const OUString, sal_Int16,
+ OUStringHash, StrEQ > PropTypeMap;
class ConvDic :
@@ -88,7 +88,7 @@ protected:
std::auto_ptr< PropTypeMap > pConvPropType;
String aMainURL; // URL to file
- rtl::OUString aName;
+ OUString aName;
sal_Int16 nLanguage;
sal_Int16 nConversionType;
sal_Int16 nMaxLeftCharCount;
@@ -103,7 +103,7 @@ protected:
ConvDic(const ConvDic &);
ConvDic & operator = (const ConvDic &);
- ConvMap::iterator GetEntry( ConvMap &rMap, const rtl::OUString &rFirstText, const rtl::OUString &rSecondText );
+ ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText );
void Load();
void Save();
@@ -116,21 +116,21 @@ public:
virtual ~ConvDic();
// XConversionDictionary
- virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getConversionType( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getMaxCharCount( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
// XConversionPropertyType
- virtual void SAL_CALL setPropertyType( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Int16 SAL_CALL getPropertyType( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
// XFlushable
virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException);
@@ -138,22 +138,22 @@ public:
virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) 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);
- static inline ::rtl::OUString
+ static inline OUString
getImplementationName_Static() throw();
- static com::sun::star::uno::Sequence< ::rtl::OUString >
+ static com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw();
- sal_Bool HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
- void AddEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
- void RemoveEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
+ sal_Bool HasEntry( const OUString &rLeftText, const OUString &rRightText );
+ void AddEntry( const OUString &rLeftText, const OUString &rRightText );
+ void RemoveEntry( const OUString &rLeftText, const OUString &rRightText );
};
-inline ::rtl::OUString ConvDic::getImplementationName_Static() throw()
+inline OUString ConvDic::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.lingu2.ConvDic" );
}
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index a71ce6ede58c..7183d82cc493 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -51,7 +51,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
#define SN_CONV_DICTIONARY_LIST "com.sun.star.linguistic2.ConversionDictionaryList"
@@ -108,16 +107,16 @@ public:
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);
// 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);
// 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);
// looks for conversion dictionaries with the specified extension
@@ -433,7 +432,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
if (!pNameContainer)
{
pNameContainer = new ConvDicNameContainer( *this );
- pNameContainer->AddConvDics( GetDictionaryWriteablePath(), ::rtl::OUString(CONV_DIC_EXT) );
+ pNameContainer->AddConvDics( GetDictionaryWriteablePath(), OUString(CONV_DIC_EXT) );
xNameContainer = pNameContainer;
// access list of text conversion dictionaries to activate
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 437c0a153078..d33f10abf8ac 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -76,8 +76,8 @@ public:
// XConversionDictionaryList
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const ::rtl::OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL queryConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL queryMaxCharCount( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
// XComponent
@@ -86,21 +86,21 @@ 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);
- static inline ::rtl::OUString
+ static inline OUString
getImplementationName_Static() throw();
- static com::sun::star::uno::Sequence< ::rtl::OUString >
+ static com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw();
// non UNO-specific
void FlushDics();
};
-inline ::rtl::OUString ConvDicList::getImplementationName_Static() throw()
+inline OUString ConvDicList::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.lingu2.ConvDicList" );
}
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 37bdc8a333c1..efb73c810460 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -55,7 +55,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
#define XML_NAMESPACE_TCD_STRING "http://openoffice.org/2003/text-conversion-dictionary"
#define CONV_TYPE_HANGUL_HANJA "Hangul / Hanja"
@@ -385,7 +384,7 @@ void ConvDicXMLExport::_ExportContent()
}
}
-::rtl::OUString SAL_CALL ConvDicXMLExport::getImplementationName()
+OUString SAL_CALL ConvDicXMLExport::getImplementationName()
throw( uno::RuntimeException )
{
return OUString( "com.sun.star.lingu2.ConvDicXMLExport" );
@@ -409,7 +408,7 @@ void SAL_CALL ConvDicXMLImport::endDocument(void)
SvXMLImportContext * ConvDicXMLImport::CreateContext(
sal_uInt16 nPrefix,
- const rtl::OUString &rLocalName,
+ const OUString &rLocalName,
const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ )
{
SvXMLImportContext *pContext = 0;
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index b21c6cfb820e..512be697ea1f 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -45,7 +45,7 @@ class ConvDicXMLExport : public SvXMLExport
public:
ConvDicXMLExport( ConvDic &rConvDic,
- const rtl::OUString &rFileName,
+ const OUString &rFileName,
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler) :
SvXMLExport ( comphelper::getProcessComponentContext(), rFileName,
::com::sun::star::util::MeasureUnit::CM, rHandler ),
@@ -58,7 +58,7 @@ public:
}
// 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 );
// SvXMLExport
void _ExportAutoStyles() {}
@@ -86,7 +86,7 @@ class ConvDicXMLImport : public SvXMLImport
public:
//!! see comment for pDic member
- ConvDicXMLImport( ConvDic *pConvDic, const rtl::OUString /*&rFileName*/ ) :
+ ConvDicXMLImport( ConvDic *pConvDic, const OUString /*&rFileName*/ ) :
SvXMLImport ( comphelper::getProcessComponentContext(), IMPORT_ALL ),
pDic ( pConvDic )
{
@@ -100,13 +100,13 @@ public:
}
// 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 );
virtual void SAL_CALL startDocument(void) 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 SvXMLImportContext * CreateContext(
- 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 );
ConvDic * GetDic() { return pDic; }
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 47878f281154..ea2c4aff8b7c 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -35,7 +35,7 @@ typedef boost::shared_ptr< SvStream > SvStreamPtr;
struct LangSvcEntries
{
- css::uno::Sequence< ::rtl::OUString > aSvcImplNames;
+ css::uno::Sequence< OUString > aSvcImplNames;
sal_Int16 nLastTriedSvcIndex;
bool bAlreadyWarned;
@@ -43,13 +43,13 @@ struct LangSvcEntries
LangSvcEntries() : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) {}
- inline LangSvcEntries( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) :
+ inline LangSvcEntries( const css::uno::Sequence< OUString > &rSvcImplNames ) :
aSvcImplNames(rSvcImplNames),
nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false)
{
}
- inline LangSvcEntries( const ::rtl::OUString &rSvcImplName ) :
+ inline LangSvcEntries( const OUString &rSvcImplName ) :
nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false)
{
aSvcImplNames.realloc(1);
@@ -75,7 +75,7 @@ struct LangSvcEntries_Spell : public LangSvcEntries
css::uno::Sequence< css::uno::Reference< css::linguistic2::XSpellChecker > > aSvcRefs;
LangSvcEntries_Spell() : LangSvcEntries() {}
- LangSvcEntries_Spell( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {}
+ LangSvcEntries_Spell( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {}
};
struct LangSvcEntries_Grammar : public LangSvcEntries
@@ -83,7 +83,7 @@ struct LangSvcEntries_Grammar : public LangSvcEntries
css::uno::Sequence< css::uno::Reference< css::linguistic2::XProofreader > > aSvcRefs;
LangSvcEntries_Grammar() : LangSvcEntries() {}
- LangSvcEntries_Grammar( const ::rtl::OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {}
+ LangSvcEntries_Grammar( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {}
};
struct LangSvcEntries_Hyph : public LangSvcEntries
@@ -91,7 +91,7 @@ struct LangSvcEntries_Hyph : public LangSvcEntries
css::uno::Sequence< css::uno::Reference< css::linguistic2::XHyphenator > > aSvcRefs;
LangSvcEntries_Hyph() : LangSvcEntries() {}
- LangSvcEntries_Hyph( const ::rtl::OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {}
+ LangSvcEntries_Hyph( const OUString &rSvcImplName ) : LangSvcEntries( rSvcImplName ) {}
};
struct LangSvcEntries_Thes : public LangSvcEntries
@@ -99,7 +99,7 @@ struct LangSvcEntries_Thes : public LangSvcEntries
css::uno::Sequence< css::uno::Reference< css::linguistic2::XThesaurus > > aSvcRefs;
LangSvcEntries_Thes() : LangSvcEntries() {}
- LangSvcEntries_Thes( const css::uno::Sequence< ::rtl::OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {}
+ LangSvcEntries_Thes( const css::uno::Sequence< OUString > &rSvcImplNames ) : LangSvcEntries( rSvcImplNames ) {}
};
@@ -109,8 +109,8 @@ class LinguDispatcher
public:
enum DspType { DSP_SPELL, DSP_HYPH, DSP_THES, DSP_GRAMMAR };
- virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< rtl::OUString > &rSvcImplNames ) = 0;
- virtual css::uno::Sequence< rtl::OUString > GetServiceList( const css::lang::Locale &rLocale ) const = 0;
+ virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) = 0;
+ virtual css::uno::Sequence< OUString > GetServiceList( const css::lang::Locale &rLocale ) const = 0;
virtual DspType GetDspType() const = 0;
protected:
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 470500a0247b..96cb9e08348f 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -50,7 +50,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
#define BUFSIZE 4096
@@ -69,8 +68,8 @@ static const sal_Int16 DIC_VERSION_5 = 5;
static const sal_Int16 DIC_VERSION_6 = 6;
static const sal_Int16 DIC_VERSION_7 = 7;
-static bool getTag(const rtl::OString &rLine, const sal_Char *pTagName,
- rtl::OString &rTagValue)
+static bool getTag(const OString &rLine, const sal_Char *pTagName,
+ OString &rTagValue)
{
sal_Int32 nPos = rLine.indexOf(pTagName);
if (nPos == -1)
@@ -101,7 +100,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
!strcmp(pMagicHeader, pVerOOo7))
{
sal_Bool bSuccess;
- rtl::OString aLine;
+ OString aLine;
nDicVersion = DIC_VERSION_7;
@@ -111,7 +110,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
// 2nd line: language all | en-US | pt-BR ...
while (sal_True == (bSuccess = rpStream->ReadLine(aLine)))
{
- rtl::OString aTagValue;
+ OString aTagValue;
if (aLine[0] == '#') // skip comments
continue;
@@ -122,7 +121,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNe
if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM("<none>")))
nLng = LANGUAGE_NONE;
else
- nLng = LanguageTag(rtl::OStringToOUString(
+ nLng = LanguageTag(OStringToOUString(
aTagValue, RTL_TEXTENCODING_ASCII_US)).getLanguageType();
}
@@ -322,7 +321,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
// Paste in dictionary without converting
if(*aWordBuf)
{
- rtl::OUString aText(aWordBuf, rtl_str_getLength(aWordBuf), eEnc);
+ OUString aText(aWordBuf, rtl_str_getLength(aWordBuf), eEnc);
uno::Reference< XDictionaryEntry > xEntry =
new DicEntry( aText, bNegativ );
addEntry_Impl( xEntry , sal_True ); //! don't launch events here
@@ -348,14 +347,14 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
else if (DIC_VERSION_7 == nDicVersion)
{
sal_Bool bSuccess;
- rtl::OString aLine;
+ OString aLine;
// remaining lines - stock strings (a [==] b)
while (sal_True == (bSuccess = pStream->ReadLine(aLine)))
{
if (aLine[0] == '#') // skip comments
continue;
- rtl::OUString aText = rtl::OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
+ OUString aText = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
uno::Reference< XDictionaryEntry > xEntry =
new DicEntry( aText, eDicType == DictionaryType_NEGATIVE );
addEntry_Impl( xEntry , sal_True ); //! don't launch events here
@@ -372,15 +371,15 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
return pStream->GetError();
}
-static rtl::OString formatForSave(const uno::Reference< XDictionaryEntry > &xEntry,
+static OString formatForSave(const uno::Reference< XDictionaryEntry > &xEntry,
rtl_TextEncoding eEnc )
{
- rtl::OStringBuffer aStr(rtl::OUStringToOString(xEntry->getDictionaryWord(), eEnc));
+ OStringBuffer aStr(OUStringToOString(xEntry->getDictionaryWord(), eEnc));
if (xEntry->isNegative())
{
aStr.append(RTL_CONSTASCII_STRINGPARAM("=="));
- aStr.append(rtl::OUStringToOString(xEntry->getReplacementText(), eEnc));
+ aStr.append(OUStringToOString(xEntry->getReplacementText(), eEnc));
}
return aStr.makeStringAndClear();
}
@@ -459,35 +458,35 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL)
// Always write as the latest version, i.e. DIC_VERSION_7
//
rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8;
- pStream->WriteLine(rtl::OString(pVerOOo7));
+ pStream->WriteLine(OString(pVerOOo7));
if (0 != (nErr = pStream->GetError()))
return nErr;
/* XXX: the <none> case could be differentiated, is it absence or
* undetermined or multiple? Earlier versions did not know about 'und' and
* 'mul' and 'zxx' codes. Sync with ReadDicVersion() */
if (LinguIsUnspecified(nLanguage))
- pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("lang: <none>")));
+ pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("lang: <none>")));
else
{
- rtl::OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("lang: "));
- aLine.append(rtl::OUStringToOString(LanguageTag(nLanguage).getBcp47(), eEnc));
+ OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("lang: "));
+ aLine.append(OUStringToOString(LanguageTag(nLanguage).getBcp47(), eEnc));
pStream->WriteLine(aLine.makeStringAndClear());
}
if (0 != (nErr = pStream->GetError()))
return nErr;
if (eDicType == DictionaryType_POSITIVE)
- pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: positive")));
+ pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("type: positive")));
else
- pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: negative")));
+ pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("type: negative")));
if (0 != (nErr = pStream->GetError()))
return nErr;
- pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("---")));
+ pStream->WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("---")));
if (0 != (nErr = pStream->GetError()))
return nErr;
const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
for (sal_Int32 i = 0; i < nCount; i++)
{
- rtl::OString aOutStr = formatForSave(pEntry[i], eEnc);
+ OString aOutStr = formatForSave(pEntry[i], eEnc);
pStream->WriteLine (aOutStr);
if (0 != (nErr = pStream->GetError()))
break;
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 8ad6a69d0ff3..c8ea57877feb 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -50,8 +50,8 @@ class DictionaryNeo :
::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry > > aEntries;
- ::rtl::OUString aDicName;
- ::rtl::OUString aMainURL;
+ OUString aDicName;
+ OUString aMainURL;
::com::sun::star::linguistic2::DictionaryType eDicType;
sal_Int16 nCount;
sal_Int16 nLanguage;
@@ -69,12 +69,12 @@ class DictionaryNeo :
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry > xEntry);
- sal_uLong loadEntries(const ::rtl::OUString &rMainURL);
- sal_uLong saveEntries(const ::rtl::OUString &rMainURL);
- int cmpDicEntry(const ::rtl::OUString &rWord1,
- const ::rtl::OUString &rWord2,
+ sal_uLong loadEntries(const OUString &rMainURL);
+ sal_uLong saveEntries(const OUString &rMainURL);
+ int cmpDicEntry(const OUString &rWord1,
+ const OUString &rWord2,
sal_Bool bSimilarOnly = sal_False);
- sal_Bool seekEntry(const ::rtl::OUString &rWord, sal_Int32 *pPos,
+ sal_Bool seekEntry(const OUString &rWord, sal_Int32 *pPos,
sal_Bool bSimilarOnly = sal_False);
bool isSorted();
@@ -84,18 +84,18 @@ class DictionaryNeo :
public:
DictionaryNeo();
- DictionaryNeo(const ::rtl::OUString &rName, sal_Int16 nLang,
+ DictionaryNeo(const OUString &rName, sal_Int16 nLang,
::com::sun::star::linguistic2::DictionaryType eType,
- const ::rtl::OUString &rMainURL,
+ const OUString &rMainURL,
sal_Bool bWriteable );
virtual ~DictionaryNeo();
// 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);
// XDictionary
@@ -119,18 +119,18 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL
- getEntry( const ::rtl::OUString& aWord )
+ getEntry( const OUString& aWord )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
addEntry( const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry >& xDicEntry )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
- add( const ::rtl::OUString& aWord, sal_Bool bIsNegative,
- const ::rtl::OUString& aRplcText )
+ add( const OUString& aWord, sal_Bool bIsNegative,
+ const OUString& aRplcText )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
- remove( const ::rtl::OUString& aWord )
+ remove( const OUString& aWord )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
isFull()
@@ -156,7 +156,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
@@ -167,13 +167,13 @@ public:
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- storeAsURL( const ::rtl::OUString& aURL,
+ storeAsURL( const OUString& aURL,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aArgs )
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- storeToURL( const ::rtl::OUString& aURL,
+ storeToURL( const OUString& aURL,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aArgs )
throw(::com::sun::star::io::IOException,
@@ -188,7 +188,7 @@ class DicEntry :
::com::sun::star::linguistic2::XDictionaryEntry
>
{
- ::rtl::OUString aDicWord, // including hyphen positions represented by "="
+ OUString aDicWord, // including hyphen positions represented by "="
aReplacement; // including hyphen positions represented by "="
sal_Bool bIsNegativ;
@@ -196,22 +196,22 @@ class DicEntry :
DicEntry(const DicEntry &);
DicEntry & operator = (const DicEntry &);
- void splitDicFileWord(const ::rtl::OUString &rDicFileWord,
- ::rtl::OUString &rDicWord,
- ::rtl::OUString &rReplacement);
+ void splitDicFileWord(const OUString &rDicFileWord,
+ OUString &rDicWord,
+ OUString &rReplacement);
public:
- DicEntry(const ::rtl::OUString &rDicFileWord, sal_Bool bIsNegativ);
- DicEntry(const ::rtl::OUString &rDicWord, sal_Bool bIsNegativ,
- const ::rtl::OUString &rRplcText);
+ DicEntry(const OUString &rDicFileWord, sal_Bool bIsNegativ);
+ DicEntry(const OUString &rDicWord, sal_Bool bIsNegativ,
+ const OUString &rRplcText);
virtual ~DicEntry();
// XDictionaryEntry
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getDictionaryWord() throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
isNegative() throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getReplacementText() throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index dbff7b795022..90cd01837608 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -49,13 +49,12 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg );
static void AddInternal( const uno::Reference< XDictionary > &rDic,
- const rtl::OUString& rNew );
+ const OUString& rNew );
static void AddUserData( const uno::Reference< XDictionary > &rDic );
@@ -308,13 +307,13 @@ void DicList::SearchForDictionaries(
{
osl::MutexGuard aGuard( GetLinguMutex() );
- const uno::Sequence< rtl::OUString > aDirCnt( utl::LocalFileHelper::
+ const uno::Sequence< OUString > aDirCnt( utl::LocalFileHelper::
GetFolderContents( rDicDirURL, sal_False ) );
- const rtl::OUString *pDirCnt = aDirCnt.getConstArray();
+ const OUString *pDirCnt = aDirCnt.getConstArray();
sal_Int32 nEntries = aDirCnt.getLength();
- rtl::OUString aDCN("dcn");
- rtl::OUString aDCP("dcp");
+ OUString aDCN("dcn");
+ OUString aDCP("dcp");
for (sal_Int32 i = 0; i < nEntries; ++i)
{
String aURL( pDirCnt[i] );
@@ -421,7 +420,7 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
}
uno::Reference< XDictionary > SAL_CALL
- DicList::getDictionaryByName( const rtl::OUString& aDictionaryName )
+ DicList::getDictionaryByName( const OUString& aDictionaryName )
throw(RuntimeException)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -553,8 +552,8 @@ sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException)
}
uno::Reference< XDictionary > SAL_CALL
- DicList::createDictionary( const rtl::OUString& rName, const Locale& rLocale,
- DictionaryType eDicType, const rtl::OUString& rURL )
+ DicList::createDictionary( const OUString& rName, const Locale& rLocale,
+ DictionaryType eDicType, const OUString& rURL )
throw(RuntimeException)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -566,7 +565,7 @@ uno::Reference< XDictionary > SAL_CALL
uno::Reference< XDictionaryEntry > SAL_CALL
- DicList::queryDictionaryEntry( const rtl::OUString& rWord, const Locale& rLocale,
+ DicList::queryDictionaryEntry( const OUString& rWord, const Locale& rLocale,
sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry )
throw(RuntimeException)
{
@@ -649,9 +648,9 @@ void DicList::_CreateDicList()
bInCreation = sal_True;
// look for dictionaries
- const rtl::OUString aWriteablePath( GetDictionaryWriteablePath() );
- uno::Sequence< rtl::OUString > aPaths( GetDictionaryPaths() );
- const rtl::OUString *pPaths = aPaths.getConstArray();
+ const OUString aWriteablePath( GetDictionaryWriteablePath() );
+ uno::Sequence< OUString > aPaths( GetDictionaryPaths() );
+ const OUString *pPaths = aPaths.getConstArray();
for (sal_Int32 i = 0; i < aPaths.getLength(); ++i)
{
const sal_Bool bIsWriteablePath = (pPaths[i] == aWriteablePath);
@@ -660,10 +659,10 @@ void DicList::_CreateDicList()
// create IgnoreAllList dictionary with empty URL (non persistent)
// and add it to list
- rtl::OUString aDicName( "IgnoreAllList" );
+ OUString aDicName( "IgnoreAllList" );
uno::Reference< XDictionary > xIgnAll(
createDictionary( aDicName, LinguLanguageToLocale( LANGUAGE_NONE ),
- DictionaryType_POSITIVE, rtl::OUString() ) );
+ DictionaryType_POSITIVE, OUString() ) );
if (xIgnAll.is())
{
AddUserData( xIgnAll );
@@ -677,8 +676,8 @@ void DicList::_CreateDicList()
//! configuration with incorrect arguments during the following
//! activation of the dictionaries
pDicEvtLstnrHelper->BeginCollectEvents();
- const uno::Sequence< rtl::OUString > aActiveDics( aOpt.GetActiveDics() );
- const rtl::OUString *pActiveDic = aActiveDics.getConstArray();
+ const uno::Sequence< OUString > aActiveDics( aOpt.GetActiveDics() );
+ const OUString *pActiveDic = aActiveDics.getConstArray();
sal_Int32 nLen = aActiveDics.getLength();
for (sal_Int32 i = 0; i < nLen; ++i)
{
@@ -731,20 +730,20 @@ void DicList::SaveDics()
// Service specific part
-rtl::OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException)
+OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException)
{
osl::MutexGuard aGuard( GetLinguMutex() );
return getImplementationName_Static();
}
-sal_Bool SAL_CALL DicList::supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName )
throw(RuntimeException)
{
osl::MutexGuard aGuard( GetLinguMutex() );
- 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 )
return sal_True;
@@ -752,7 +751,7 @@ sal_Bool SAL_CALL DicList::supportsService( const rtl::OUString& ServiceName )
}
-uno::Sequence< rtl::OUString > SAL_CALL DicList::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames( )
throw(RuntimeException)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -760,11 +759,11 @@ uno::Sequence< rtl::OUString > SAL_CALL DicList::getSupportedServiceNames( )
}
-uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw()
+uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw()
{
osl::MutexGuard aGuard( GetLinguMutex() );
- uno::Sequence< rtl::OUString > aSNS( 1 ); // more than 1 service possible
+ uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible
aSNS.getArray()[0] = "com.sun.star.linguistic2.DictionaryList";
return aSNS;
}
@@ -824,14 +823,14 @@ xub_StrLen lcl_GetToken( String &rToken,
static void AddInternal(
const uno::Reference<XDictionary> &rDic,
- const rtl::OUString& rNew )
+ const OUString& rNew )
{
if (rDic.is())
{
//! TL TODO: word iterator should be used to break up the text
static const char aDefWordDelim[] =
"!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n";
- rtl::OUString aDelim(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim));
+ OUString aDelim(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim));
OSL_ENSURE(aDelim.indexOf(static_cast<sal_Unicode>('.')) == -1,
"ensure no '.'");
@@ -842,7 +841,7 @@ static void AddInternal(
{
if( aToken.Len() && !IsNumeric( aToken ) )
{
- rDic->add( aToken, sal_False, rtl::OUString() );
+ rDic->add( aToken, sal_False, OUString() );
}
}
}
@@ -867,7 +866,7 @@ static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bo
{
if (rFileURL.Len() == 0)
return sal_False;
- rtl::OUString aDIC("dic");
+ OUString aDIC("dic");
String aExt;
xub_StrLen nPos = rFileURL.SearchBackward( '.' );
if (STRING_NOTFOUND != nPos)
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index f00c20337043..5a824f78c295 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -99,7 +99,7 @@ public:
// XDictionaryList
virtual ::sal_Int16 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const ::rtl::OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL addDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL removeDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL addDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener, ::sal_Bool bReceiveVerbose ) throw (::com::sun::star::uno::RuntimeException);
@@ -107,10 +107,10 @@ public:
virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const ::rtl::OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException);
// XSearchableDictionaryList
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException);
// XComponent
virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
@@ -118,19 +118,19 @@ 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);
- static inline ::rtl::OUString getImplementationName_Static() throw();
- static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
+ static inline OUString getImplementationName_Static() throw();
+ static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
// non UNO-specific
void SaveDics();
};
-inline ::rtl::OUString DicList::getImplementationName_Static() throw()
+inline OUString DicList::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.lingu2.DicList" );
}
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 1a3508c2a0b1..84c03347a188 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -66,12 +66,11 @@
#include "gciterator.hxx"
-using ::rtl::OUString;
using namespace linguistic;
using namespace ::com::sun::star;
// forward declarations
-static ::rtl::OUString GrammarCheckingIterator_getImplementationName() throw();
+static OUString GrammarCheckingIterator_getImplementationName() throw();
static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw();
@@ -975,7 +974,7 @@ uno::Reference< util::XChangesBatch > GrammarCheckingIterator::GetUpdateAccess()
// get configuration update access
beans::PropertyValue aValue;
aValue.Name = "nodepath";
- aValue.Value = uno::makeAny( ::rtl::OUString("org.openoffice.Office.Linguistic/ServiceManager") );
+ aValue.Value = uno::makeAny( OUString("org.openoffice.Office.Linguistic/ServiceManager") );
uno::Sequence< uno::Any > aProps(1);
aProps[0] <<= aValue;
m_xUpdateAccess = uno::Reference< util::XChangesBatch >(
@@ -1119,7 +1118,7 @@ LinguDispatcher::DspType GrammarCheckingIterator::GetDspType() const
static OUString GrammarCheckingIterator_getImplementationName() throw()
{
- return ::rtl::OUString( "com.sun.star.lingu2.ProofreadingIterator" );
+ return OUString( "com.sun.star.lingu2.ProofreadingIterator" );
}
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 669003511dcd..59680bbb62fa 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -53,7 +53,7 @@ struct FPEntry
::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraph > m_xPara;
// document ID to identify different documents
- ::rtl::OUString m_aDocId;
+ OUString m_aDocId;
// the starting position to be checked
sal_Int32 m_nStartIndex;
@@ -97,19 +97,19 @@ class GrammarCheckingIterator:
sal_Bool m_bEnd;
// Note that it must be the pointer and not the uno-reference to check if it is the same implementation object
- typedef std::map< XComponent *, ::rtl::OUString > DocMap_t;
+ typedef std::map< XComponent *, OUString > DocMap_t;
DocMap_t m_aDocIdMap;
// language -> implname mapping
- typedef std::map< LanguageType, ::rtl::OUString > GCImplNames_t;
+ typedef std::map< LanguageType, OUString > GCImplNames_t;
GCImplNames_t m_aGCImplNamesByLang;
// implname -> UNO reference mapping
- typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > > GCReferences_t;
+ typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > > GCReferences_t;
GCReferences_t m_aGCReferencesByService;
- ::rtl::OUString m_aCurCheckedDocId;
+ OUString m_aCurCheckedDocId;
sal_Bool m_bGCServicesChecked;
sal_Int32 m_nDocIdCounter;
sal_Int32 m_nLastEndOfSentencePos;
@@ -127,18 +127,18 @@ class GrammarCheckingIterator:
void TerminateThread();
sal_Int32 NextDocId();
- ::rtl::OUString GetOrCreateDocId( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xComp );
+ OUString GetOrCreateDocId( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xComp );
void AddEntry(
::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraphIterator > xFlatParaIterator,
::com::sun::star::uno::WeakReference< ::com::sun::star::text::XFlatParagraph > xFlatPara,
- const ::rtl::OUString &rDocId, sal_Int32 nStartIndex, sal_Bool bAutomatic );
+ const OUString &rDocId, sal_Int32 nStartIndex, sal_Bool bAutomatic );
void ProcessResult( const ::com::sun::star::linguistic2::ProofreadingResult &rRes,
const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > &rxFlatParagraphIterator,
bool bIsAutomaticChecking );
- sal_Int32 GetSuggestedEndOfSentence( const ::rtl::OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale );
+ sal_Int32 GetSuggestedEndOfSentence( const OUString &rText, sal_Int32 nSentenceStartPos, const ::com::sun::star::lang::Locale &rLocale );
void GetConfiguredGCSvcs_Impl();
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > GetGrammarChecker( const ::com::sun::star::lang::Locale & rLocale );
@@ -158,7 +158,7 @@ public:
// XProofreadingIterator
virtual void SAL_CALL startProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const ::rtl::OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL resetIgnoreRules( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument ) throw (::com::sun::star::uno::RuntimeException);
@@ -178,13 +178,13 @@ public:
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 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);
// LinguDispatcher
- virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< rtl::OUString > &rSvcImplNames );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
+ virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames );
+ virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
virtual DspType GetDspType() const;
};
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 468a8dc34e46..829930e59b77 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
#define SN_HH_CONV_DICTIONARY "com.sun.star.linguistic2.HangulHanjaConversionDictionary"
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index 0a1257b4e302..a63a4ea1147d 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -44,21 +44,21 @@ public:
virtual ~HHConvDic();
// XConversionDictionary
- virtual void SAL_CALL addEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::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);
- static inline ::rtl::OUString
+ static inline OUString
getImplementationName_Static() throw();
- static com::sun::star::uno::Sequence< ::rtl::OUString >
+ static com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw();
};
-inline ::rtl::OUString HHConvDic::getImplementationName_Static() throw()
+inline OUString HHConvDic::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.lingu2.HHConvDic" );
}
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index ba57aa6ab6b3..75cd9456955f 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -42,8 +42,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) :
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index a770f5fe9262..6bcc72b23b1d 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -76,7 +76,7 @@ class HyphenatorDispatcher :
com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord>
- buildHyphWord( const rtl::OUString rOrigWord,
+ buildHyphWord( const OUString rOrigWord,
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionaryEntry> &xEntry,
sal_Int16 nLang, sal_Int16 nMaxLeading );
@@ -103,7 +103,7 @@ public:
// XHyphenator
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
- hyphenate( const ::rtl::OUString& aWord,
+ hyphenate( const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale,
sal_Int16 nMaxLeading,
const ::com::sun::star::beans::PropertyValues& aProperties )
@@ -111,7 +111,7 @@ public:
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
- queryAlternativeSpelling( const ::rtl::OUString& aWord,
+ queryAlternativeSpelling( const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale,
sal_Int16 nIndex,
const ::com::sun::star::beans::PropertyValues& aProperties )
@@ -120,7 +120,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL
createPossibleHyphens(
- const ::rtl::OUString& aWord,
+ const OUString& aWord,
const ::com::sun::star::lang::Locale& aLocale,
const ::com::sun::star::beans::PropertyValues& aProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
@@ -130,8 +130,8 @@ public:
virtual void
SetServiceList( const ::com::sun::star::lang::Locale &rLocale,
const ::com::sun::star::uno::Sequence<
- rtl::OUString > &rSvcImplNames );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString >
+ OUString > &rSvcImplNames );
+ virtual ::com::sun::star::uno::Sequence< OUString >
GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
virtual DspType
GetDspType() const;
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index b43e6bc63ea6..76d91ef5a2b1 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -35,7 +35,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
-using ::rtl::OUString;
namespace linguistic
{
@@ -170,15 +169,15 @@ Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions()
}
com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> HyphenatedWord::CreateHyphenatedWord(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
- const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos )
+ const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const OUString &rHyphenatedWord, sal_Int16 nHyphenPos )
{
return new HyphenatedWord( rWord, nLang, nHyphenationPos, rHyphenatedWord, nHyphenPos );
}
com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > PossibleHyphens::CreatePossibleHyphens
- (const ::rtl::OUString &rWord, sal_Int16 nLang,
- const ::rtl::OUString &rHyphWord,
+ (const OUString &rWord, sal_Int16 nLang,
+ const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions)
{
return new PossibleHyphens( rWord, nLang, rHyphWord, rPositions );
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index 513c419f3b4c..327203473ff3 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -36,7 +36,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
-using ::rtl::OUString;
namespace linguistic
{
@@ -67,7 +66,7 @@ static void lcl_AddAsPropertyChangeListener(
for (int i = 0; i < NUM_FLUSH_PROPS; ++i)
{
rPropSet->addPropertyChangeListener(
- ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener );
+ OUString::createFromAscii(aFlushProperties[i].pPropName), xListener );
}
}
}
@@ -82,7 +81,7 @@ static void lcl_RemoveAsPropertyChangeListener(
for (int i = 0; i < NUM_FLUSH_PROPS; ++i)
{
rPropSet->removePropertyChangeListener(
- ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener );
+ OUString::createFromAscii(aFlushProperties[i].pPropName), xListener );
}
}
}
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 594f7b9335e7..fc69367d75be 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -48,7 +48,6 @@ using namespace linguistic;
using namespace com::sun::star::registry;
-using ::rtl::OUString;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 79df931269d5..bc46e0c59ac2 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -60,12 +60,12 @@ public:
LinguOptions(const LinguOptions &rOpt);
~LinguOptions();
- static ::rtl::OUString GetName( sal_Int32 nWID );
+ static OUString GetName( sal_Int32 nWID );
- const ::com::sun::star::uno::Sequence< rtl::OUString >
+ const ::com::sun::star::uno::Sequence< OUString >
GetActiveDics() const { return pData->aActiveDics; }
- const ::com::sun::star::uno::Sequence< rtl::OUString >
+ const ::com::sun::star::uno::Sequence< OUString >
GetActiveConvDics() const { return pData->aActiveConvDics; }
};
@@ -118,12 +118,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 >& rxListener ) 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 >& rxListener ) 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 >& rxListener ) 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 >& rxListener ) 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 >& rxListener ) 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 >& rxListener ) 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 >& rxListener ) 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 >& rxListener ) 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);
@@ -139,16 +139,16 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) 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);
- static inline ::rtl::OUString getImplementationName_Static() throw();
- static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
+ static inline OUString getImplementationName_Static() throw();
+ static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
};
-inline ::rtl::OUString LinguProps::getImplementationName_Static() throw()
+inline OUString LinguProps::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.lingu2.LinguProps" );
}
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index a53499821f76..c36f55abc4c9 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
namespace linguistic
{
@@ -69,7 +68,7 @@ PropertyChgHelper::PropertyChgHelper(
OUString *pName = aPropNames.getArray();
for (sal_Int32 i = 0; i < nCHCount; ++i)
{
- pName[i] = ::rtl::OUString::createFromAscii( aCH[i] );
+ pName[i] = OUString::createFromAscii( aCH[i] );
}
SetDefaultValues();
@@ -106,7 +105,7 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], sal_Int32 nCount
OUString *pName = GetPropNames().getArray();
for (sal_Int32 i = 0; i < nCount; ++i)
{
- pName[ nLen + i ] = ::rtl::OUString::createFromAscii( pNewNames[ i ] );
+ pName[ nLen + i ] = OUString::createFromAscii( pNewNames[ i ] );
}
}
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 2950ba0402d4..04ee168a2841 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -50,7 +50,6 @@
using namespace com::sun::star;
using namespace linguistic;
-using ::rtl::OUString;
// forward declarations
uno::Sequence< OUString > static GetLangSvcList( const uno::Any &rVal );
@@ -732,9 +731,9 @@ void LngSvcMgr::UpdateAll()
for (int k = 0; k < nNumServices; ++k)
{
- OUString aService( ::rtl::OUString::createFromAscii( apServices[k] ) );
- OUString aActiveList( ::rtl::OUString::createFromAscii( apCurLists[k] ) );
- OUString aLastFoundList( ::rtl::OUString::createFromAscii( apLastFoundLists[k] ) );
+ OUString aService( OUString::createFromAscii( apServices[k] ) );
+ OUString aActiveList( OUString::createFromAscii( apCurLists[k] ) );
+ OUString aLastFoundList( OUString::createFromAscii( apLastFoundLists[k] ) );
sal_Int32 i;
//
@@ -792,7 +791,7 @@ void LngSvcMgr::UpdateAll()
for (int i = 0; i < 2; ++i)
{
const sal_Char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k];
- OUString aSubNodeName( ::rtl::OUString::createFromAscii(pSubNodeName) );
+ OUString aSubNodeName( OUString::createFromAscii(pSubNodeName) );
list_entry_map_t &rCurMap = (i == 0) ? aCurSvcs[k] : aLastFoundSvcs[k];
list_entry_map_t::const_iterator aIt( rCurMap.begin() );
@@ -1307,7 +1306,7 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
{
RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Spell" );
- rtl::OUString aNode("ServiceManager/SpellCheckerList");
+ OUString aNode("ServiceManager/SpellCheckerList");
uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
OUString *pNames = aNames.getArray();
sal_Int32 nLen = aNames.getLength();
@@ -1345,7 +1344,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
{
RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Grammar" );
- rtl::OUString aNode("ServiceManager/GrammarCheckerList");
+ OUString aNode("ServiceManager/GrammarCheckerList");
uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
OUString *pNames = aNames.getArray();
sal_Int32 nLen = aNames.getLength();
@@ -1387,7 +1386,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
{
RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Hyph" );
- rtl::OUString aNode("ServiceManager/HyphenatorList");
+ OUString aNode("ServiceManager/HyphenatorList");
uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
OUString *pNames = aNames.getArray();
sal_Int32 nLen = aNames.getLength();
@@ -1429,7 +1428,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
{
RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SetCfgServiceLists - Thes" );
- rtl::OUString aNode("ServiceManager/ThesaurusList");
+ OUString aNode("ServiceManager/ThesaurusList");
uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
OUString *pNames = aNames.getArray();
sal_Int32 nLen = aNames.getLength();
@@ -1699,7 +1698,7 @@ void SAL_CALL
if (bChanged)
{
pSpellDsp->SetServiceList( rLocale, rServiceImplNames );
- SaveCfgSvcs( rtl::OUString(SN_SPELLCHECKER) );
+ SaveCfgSvcs( OUString(SN_SPELLCHECKER) );
if (pListenerHelper && bChanged)
pListenerHelper->AddLngSvcEvt(
@@ -1716,7 +1715,7 @@ void SAL_CALL
if (bChanged)
{
pGrammarDsp->SetServiceList( rLocale, rServiceImplNames );
- SaveCfgSvcs( rtl::OUString(SN_GRAMMARCHECKER) );
+ SaveCfgSvcs( OUString(SN_GRAMMARCHECKER) );
if (pListenerHelper && bChanged)
pListenerHelper->AddLngSvcEvt(
@@ -1732,7 +1731,7 @@ void SAL_CALL
if (bChanged)
{
pHyphDsp->SetServiceList( rLocale, rServiceImplNames );
- SaveCfgSvcs( rtl::OUString(SN_HYPHENATOR) );
+ SaveCfgSvcs( OUString(SN_HYPHENATOR) );
if (pListenerHelper && bChanged)
pListenerHelper->AddLngSvcEvt(
@@ -1748,7 +1747,7 @@ void SAL_CALL
if (bChanged)
{
pThesDsp->SetServiceList( rLocale, rServiceImplNames );
- SaveCfgSvcs( rtl::OUString(SN_THESAURUS) );
+ SaveCfgSvcs( OUString(SN_THESAURUS) );
}
}
}
@@ -1816,7 +1815,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
{
DBG_ASSERT( 0, "node name missing" );
}
- OUString aNodeName( ::rtl::OUString::createFromAscii(pNodeName) );
+ OUString aNodeName( OUString::createFromAscii(pNodeName) );
for (sal_Int32 i = 0; i < nLen; ++i)
{
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 192b98ef6ad8..0afdf5d5fbf3 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -134,7 +134,7 @@ class LngSvcMgr :
static void clearSvcInfoArray(SvcInfoArray *&rpInfo);
// utl::ConfigItem (to allow for listening of changes of relevant properties)
- 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 UpdateAll();
@@ -151,12 +151,12 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL addLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL removeLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServices( const ::rtl::OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setConfiguredServices( const ::rtl::OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConfiguredServices( const ::rtl::OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException);
// XAvailableLocales
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const ::rtl::OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException);
// XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException);
@@ -164,9 +164,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);
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException);
@@ -174,8 +174,8 @@ public:
// XModifyListener
virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& rEvent ) throw(::com::sun::star::uno::RuntimeException);
- static inline ::rtl::OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
+ static inline OUString getImplementationName_Static();
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
sal_Bool AddLngSvcEvtBroadcaster(
const ::com::sun::star::uno::Reference<
@@ -183,7 +183,7 @@ public:
};
-inline ::rtl::OUString LngSvcMgr::getImplementationName_Static()
+inline OUString LngSvcMgr::getImplementationName_Static()
{
return OUString( "com.sun.star.lingu2.LngSvcMgr" );
}
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index f71938ef82ad..10e343f756e6 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -56,7 +56,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::i18n;
using namespace com::sun::star::linguistic2;
-using ::rtl::OUString;
namespace linguistic
{
@@ -750,7 +749,7 @@ uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName )
comphelper::getProcessServiceFactory() );
try
{
- xRef = xMgr->createInstance( ::rtl::OUString::createFromAscii( pServiceName ) );
+ xRef = xMgr->createInstance( OUString::createFromAscii( pServiceName ) );
}
catch (const uno::Exception &)
{
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index 15b33ace29b9..de5ac2442b34 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -60,14 +60,14 @@ sal_Bool FileExists( const String &rMainURL )
return bExists;
}
-static uno::Sequence< rtl::OUString > GetMultiPaths_Impl(
- const rtl::OUString &rPathPrefix,
+static uno::Sequence< OUString > GetMultiPaths_Impl(
+ const OUString &rPathPrefix,
sal_Int16 nPathFlags )
{
- uno::Sequence< rtl::OUString > aRes;
- uno::Sequence< rtl::OUString > aInternalPaths;
- uno::Sequence< rtl::OUString > aUserPaths;
- rtl::OUString aWritablePath;
+ uno::Sequence< OUString > aRes;
+ uno::Sequence< OUString > aInternalPaths;
+ uno::Sequence< OUString > aUserPaths;
+ OUString aWritablePath;
bool bSuccess = true;
uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() );
@@ -103,14 +103,14 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl(
if (!aWritablePath.isEmpty())
++nMaxEntries;
aRes.realloc( nMaxEntries );
- rtl::OUString *pRes = aRes.getArray();
+ OUString *pRes = aRes.getArray();
sal_Int32 nCount = 0; // number of actually added entries
if ((nPathFlags & PATH_FLAG_WRITABLE) && !aWritablePath.isEmpty())
pRes[ nCount++ ] = aWritablePath;
for (int i = 0; i < 2; ++i)
{
- const uno::Sequence< rtl::OUString > &rPathSeq = i == 0 ? aUserPaths : aInternalPaths;
- const rtl::OUString *pPathSeq = rPathSeq.getConstArray();
+ const uno::Sequence< OUString > &rPathSeq = i == 0 ? aUserPaths : aInternalPaths;
+ const OUString *pPathSeq = rPathSeq.getConstArray();
for (sal_Int32 k = 0; k < rPathSeq.getLength(); ++k)
{
const bool bAddUser = &rPathSeq == &aUserPaths && (nPathFlags & PATH_FLAG_USER);
@@ -125,9 +125,9 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl(
return aRes;
}
-rtl::OUString GetDictionaryWriteablePath()
+OUString GetDictionaryWriteablePath()
{
- uno::Sequence< rtl::OUString > aPaths( GetMultiPaths_Impl( "Dictionary", PATH_FLAG_WRITABLE ) );
+ uno::Sequence< OUString > aPaths( GetMultiPaths_Impl( "Dictionary", PATH_FLAG_WRITABLE ) );
DBG_ASSERT( aPaths.getLength() == 1, "Dictionary_writable path corrupted?" );
String aRes;
if (aPaths.getLength() > 0)
@@ -135,7 +135,7 @@ rtl::OUString GetDictionaryWriteablePath()
return aRes;
}
-uno::Sequence< rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags )
+uno::Sequence< OUString > GetDictionaryPaths( sal_Int16 nPathFlags )
{
return GetMultiPaths_Impl( "Dictionary", nPathFlags );
}
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index d44cbdfeee20..eb41f25243d1 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -45,7 +45,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
// ProposalList: list of proposals for misspelled words
// The order of strings in the array should be left unchanged because the
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 4fef68d97351..401c6713aa70 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -83,14 +83,14 @@ class SpellCheckerDispatcher :
void ClearSvcList();
- sal_Bool isValid_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
+ sal_Bool isValid_Impl(const OUString& aWord, LanguageType nLanguage,
const ::com::sun::star::beans::PropertyValues& aProperties,
sal_Bool bCheckDics)
throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellAlternatives >
- spell_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
+ spell_Impl(const OUString& aWord, LanguageType nLanguage,
const ::com::sun::star::beans::PropertyValues& aProperties,
sal_Bool bCheckDics)
throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
@@ -104,20 +104,20 @@ public:
virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw(::com::sun::star::uno::RuntimeException);
// XSpellChecker
- virtual sal_Bool SAL_CALL isValid( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) 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& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) 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 OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XSupportedLanguages
virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (::com::sun::star::uno::RuntimeException);
// XSpellChecker1
- virtual ::sal_Bool SAL_CALL isValid( const ::rtl::OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) 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& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) 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 OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// LinguDispatcher
- virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< rtl::OUString > &rSvcImplNames );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
+ virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames );
+ virtual ::com::sun::star::uno::Sequence< OUString > GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
virtual DspType GetDspType() const;
void FlushSpellCache();
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 37089bff5d64..293bf774392f 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
-using ::rtl::OUString;
namespace linguistic
{
@@ -280,7 +279,7 @@ void SpellAlternatives::SetAlternatives( const Sequence< OUString > &rAlt )
com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > SpellAlternatives::CreateSpellAlternatives(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt )
+ const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt )
{
SpellAlternatives* pAlt = new SpellAlternatives;
pAlt->SetWordLanguage( rWord, nLang );
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index fd476177cb2d..a734d89271cd 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
static sal_Bool SvcListHasLanguage(
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 981dcbc50ad3..bdf088877840 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -87,7 +87,7 @@ public:
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XMeaning > > SAL_CALL
- queryMeanings( const ::rtl::OUString& aTerm,
+ queryMeanings( const OUString& aTerm,
const ::com::sun::star::lang::Locale& aLocale,
const ::com::sun::star::beans::PropertyValues& aProperties )
throw(::com::sun::star::lang::IllegalArgumentException,
@@ -97,8 +97,8 @@ public:
virtual void
SetServiceList( const ::com::sun::star::lang::Locale &rLocale,
const ::com::sun::star::uno::Sequence<
- rtl::OUString > &rSvcImplNames );
- virtual ::com::sun::star::uno::Sequence< rtl::OUString >
+ OUString > &rSvcImplNames );
+ virtual ::com::sun::star::uno::Sequence< OUString >
GetServiceList( const ::com::sun::star::lang::Locale &rLocale ) const;
virtual DspType
GetDspType() const;
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 636866fd2deb..642a92b92f10 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
@@ -54,7 +53,7 @@ PropertyChgHelper::PropertyChgHelper(
OUString *pName = aPropNames.getArray();
for (sal_Int32 i = 0; i < nPropCount; ++i)
{
- pName[i] = ::rtl::OUString::createFromAscii( pPropNames[i] );
+ pName[i] = OUString::createFromAscii( pPropNames[i] );
}
}
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 067f9b60f71d..4bbf3f3d0a6f 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-using ::rtl::OUString;
sal_Bool operator == ( const Locale &rL1, const Locale &rL2 )
@@ -220,7 +219,7 @@ Reference< XSpellAlternatives >
{
aTmp.SearchAndReplaceAllAscii( "liss", "liz" );
xRes = new SpellAlternatives( aTmp, nLang,
- SpellFailure::IS_NEGATIVE_WORD, ::com::sun::star::uno::Sequence< ::rtl::OUString >() );
+ SpellFailure::IS_NEGATIVE_WORD, ::com::sun::star::uno::Sequence< OUString >() );
}
else if (STRING_NOTFOUND != aTmp.Search( (sal_Unicode) 'x' ) ||
STRING_NOTFOUND != aTmp.Search( (sal_Unicode) 'X' ))
@@ -252,7 +251,7 @@ Reference< XSpellAlternatives >
(sal_Unicode) 'S': (sal_Unicode) 's';
aTmp.GetBufferAccess()[0] = cNewChar;
xRes = new SpellAlternatives( aTmp, nLang,
- SpellFailure::CAPTION_ERROR, ::com::sun::star::uno::Sequence< ::rtl::OUString >() );
+ SpellFailure::CAPTION_ERROR, ::com::sun::star::uno::Sequence< OUString >() );
}
}
}
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index b31c88c74385..488b5e0ad7ee 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -152,7 +152,7 @@ public:
inline OUString SpellChecker::getImplementationName_Static() throw()
{
- return ::rtl::OUString( "com.sun.star.lingu.examples.SpellChecker" );
+ return OUString( "com.sun.star.lingu.examples.SpellChecker" );
}
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 21bb650b65b1..3d7cde81c2f2 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -47,8 +47,8 @@ namespace
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();
@@ -69,8 +69,8 @@ namespace
uno::UNO_QUERY_THROW);
}
- bool LotusWordProTest::load(const rtl::OUString &,
- const rtl::OUString &rURL, const rtl::OUString &,
+ bool LotusWordProTest::load(const OUString &,
+ const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
uno::Sequence< beans::PropertyValue > aDescriptor(1);
@@ -81,9 +81,9 @@ namespace
void LotusWordProTest::test()
{
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/lotuswordpro/qa/cppunit/data/"),
- rtl::OUString());
+ OUString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(LotusWordProTest);
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 3eee0f07054c..f48f38bf8617 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -54,8 +54,6 @@
#include "lwpfilter.hxx"
using namespace com::sun::star;
-using rtl::OString;
-using rtl::OUStringBuffer;
using com::sun::star::uno::Sequence;
using com::sun::star::lang::XComponent;
using com::sun::star::uno::Any;
@@ -326,18 +324,18 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc
}
catch ( Exception& )
{
- return ::rtl::OUString();
+ return OUString();
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
}
Sequence< ::sal_Int8 > aData;
sal_Int32 nLen = SAL_N_ELEMENTS( header );
if ( !( ( nLen == xInputStream->readBytes( aData, nLen ) )
&& ( memcmp( ( void* )header, (void*) aData.getConstArray(), nLen ) == 0 ) ) )
- sTypeName = ::rtl::OUString();
+ sTypeName = OUString();
return sTypeName;
}
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index 8fa89b67e11d..aecbd1a0b1c3 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -64,7 +64,7 @@ protected:
// oo.org declares
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
FilterType meType;
@@ -88,7 +88,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -96,22 +96,22 @@ 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 LotusWordProImportFilter_getImplementationName()
+OUString LotusWordProImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL LotusWordProImportFilter_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index eda611afd372..43e8a3430253 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -209,7 +209,7 @@ void Lwp9Reader::ParseDocument()
pChangeMgr->ConvertAllChange(m_pStream);
doc->Parse(m_pStream);
- m_pStream->EndElement(::rtl::OUString("office:body"));
+ m_pStream->EndElement(OUString("office:body"));
WriteDocEnd();
}
@@ -245,7 +245,7 @@ void Lwp9Reader::WriteDocHeader()
pAttrList->AddAttribute( A2OUSTR("office:class"), A2OUSTR("text"));
pAttrList->AddAttribute( A2OUSTR("office:version"), A2OUSTR("1.0"));
- m_pStream->StartElement( ::rtl::OUString("office:document") );
+ m_pStream->StartElement( OUString("office:document") );
pAttrList->Clear();
}
@@ -254,7 +254,7 @@ void Lwp9Reader::WriteDocHeader()
*/
void Lwp9Reader::WriteDocEnd()
{
- m_pStream->EndElement(::rtl::OUString("office:document"));
+ m_pStream->EndElement(OUString("office:document"));
m_pStream->EndDocument();
}
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 25bdbea1dba9..597f7c0fc118 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -96,10 +96,10 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr()
* @param pBullOver pointer to the bulletoverride of current paragraph.
* @param pIndent pointer to the indentoverride of current paragraph.
*/
-rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
+OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
LwpIndentOverride* pIndent)
{
- rtl::OUString aEmpty;
+ OUString aEmpty;
if(!pPara || !pIndent || !pBullOver)
{
@@ -148,7 +148,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
}
m_vIDsPairList.push_back(std::make_pair(pBulletOver, aIndentID));
- rtl::OUString aStyleName;
+ OUString aStyleName;
LwpFribPtr* pBulletParaFribs = pBulletPara->GetFribs();
sal_Bool bIsNumbering = (sal_Bool)(pBulletParaFribs->HasFrib(FRIB_TAG_PARANUMBER) != 0);
@@ -194,17 +194,17 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
{
if (pParaNumber->GetStyleID() != NUMCHAR_other)
{
- rtl::OUString aPrefix;
+ OUString aPrefix;
XFNumFmt aFmt;
if (aParaNumbering.pPrefix)
{
aPrefix += aParaNumbering.pPrefix->GetText();
}
- rtl::OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber);
+ OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber);
if (pParaNumber->GetStyleID() == NUMCHAR_01 || pParaNumber->GetStyleID() == NUMCHAR_Chinese4)
{
- aPrefix += rtl::OUString("0");
+ aPrefix += OUString("0");
}
aFmt.SetPrefix(aPrefix);
@@ -221,7 +221,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
}
else
{
- rtl::OUString aPrefix, aSuffix;
+ OUString aPrefix, aSuffix;
if (aParaNumbering.pPrefix)
{
aPrefix = aParaNumbering.pPrefix->GetText();
@@ -232,7 +232,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
}
pListStyle->SetListBullet(nPos, LwpSilverBullet::GetNumCharByStyleID(pParaNumber).toChar(),
- rtl::OUString("Times New Roman"), aPrefix, aSuffix);
+ OUString("Times New Roman"), aPrefix, aSuffix);
}
pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
@@ -254,7 +254,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
//Return the inner XFItem created.
XFContentContainer* LwpBulletStyleMgr::AddBulletList(
XFContentContainer* pCont, sal_Bool bIsOrdered,
- const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped)
+ const OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped)
{
assert(nLevel>0);
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 5bb67a3e182b..09fe87e9c569 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -84,12 +84,12 @@ class LwpBulletStyleMgr
public:
LwpBulletStyleMgr();
virtual ~LwpBulletStyleMgr();
- rtl::OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
+ OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
LwpIndentOverride* pIndent);
inline void SetFoundry(LwpFoundry* pFoundry);
inline void SetContinueFlag(sal_Bool bFlag);
XFContentContainer* AddBulletList(XFContentContainer* pCont, sal_Bool bIsOrdered,
- const rtl::OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped);
+ const OUString& rStyleName, sal_Int16 nLevel, sal_Bool bIsBulletSkiped);
inline void SetCurrentPos(sal_uInt16 nNewPos);
inline void SetCurrentSilverBullet(const LwpObjectID& rNewID);
inline LwpObjectID GetCurrentSilverBullet();
@@ -99,9 +99,9 @@ public:
private:
typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair;
- std::vector <rtl::OUString> m_vStyleNameList;
+ std::vector <OUString> m_vStyleNameList;
std::vector <OverridePair> m_vIDsPairList;
- rtl::OUString m_aCurrentStyleName;
+ OUString m_aCurrentStyleName;
LwpFoundry* m_pFoundry;
XFList* m_pBulletList;
sal_Bool m_bContinue;
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index abd247074980..707c7deb27a6 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -83,10 +83,10 @@ public:
LwpObjectID* GetInitialLayoutID(){ return &m_InitialLayoutID;}
LwpObjectID* GetFillerPageTextID(){ return &m_FillerPageTextID;}
// add by ,03/14/2004
- rtl::OUString GetDivName() { return m_Name.str(); }
+ OUString GetDivName() { return m_Name.str(); }
// end add
- rtl::OUString GetClassName() { return m_ClassName.str(); }
+ OUString GetClassName() { return m_ClassName.str(); }
inline sal_Bool HasContents();
inline sal_Bool IsOleDivision();
inline sal_Bool IsScrollable();
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx
index 4d980ce8ec24..772b28b87669 100644
--- a/lotuswordpro/source/filter/lwpdocdata.cxx
+++ b/lotuswordpro/source/filter/lwpdocdata.cxx
@@ -291,9 +291,9 @@ void LwpDocData::Read()
pGlobal->SetEditorAttrMap(pEditorAttr->nID, pEditorAttr);
}
}
-rtl::OUString LwpDocData::DateTimeToOUString(LtTm& dt)
+OUString LwpDocData::DateTimeToOUString(LtTm& dt)
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append((sal_Int32)dt.tm_year);
buf.append( A2OUSTR("-") );
buf.append((sal_Int32)dt.tm_mon);
@@ -310,10 +310,10 @@ rtl::OUString LwpDocData::DateTimeToOUString(LtTm& dt)
return buf.makeStringAndClear();
}
-rtl::OUString LwpDocData::TimeToOUString(LtTm& dt)
+OUString LwpDocData::TimeToOUString(LtTm& dt)
{
//PT3H43M44S
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append( A2OUSTR("PT") );
buf.append((sal_Int32)dt.tm_hour);
buf.append( A2OUSTR("H") );
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx
index e5aa366a812a..acf33a51d5bd 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/source/filter/lwpdocdata.hxx
@@ -175,8 +175,8 @@ private:
LtTm m_nLastRevisionTime;
LtTm m_nTotalEditTime;
private:
- rtl::OUString DateTimeToOUString(LtTm& dt);
- rtl::OUString TimeToOUString(LtTm& dt);
+ OUString DateTimeToOUString(LtTm& dt);
+ OUString TimeToOUString(LtTm& dt);
public:
void Read();
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 9a5f29fe83dc..9d978b9b6c35 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -330,40 +330,40 @@ void LwpDrawObj::SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag
* @param nArrowStyle style of the arrowhead.
* @return nWhichSide style name of the arrowhead.
*/
-rtl::OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle)
+OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle)
{
// style name of arrowhead
- rtl::OUString aArrowName;
+ OUString aArrowName;
switch(nArrowStyle)
{
default:
case AH_ARROW_FULLARROW:
- aArrowName = rtl::OUString("Symmetric arrow");
+ aArrowName = OUString("Symmetric arrow");
break;
case AH_ARROW_HALFARROW:
- aArrowName = rtl::OUString("Arrow concave");
+ aArrowName = OUString("Arrow concave");
break;
case AH_ARROW_LINEARROW:
- aArrowName = rtl::OUString("arrow100");
+ aArrowName = OUString("arrow100");
break;
case AH_ARROW_INVFULLARROW:
- aArrowName = rtl::OUString("reverse arrow");
+ aArrowName = OUString("reverse arrow");
break;
case AH_ARROW_INVHALFARROW:
- aArrowName = rtl::OUString("reverse concave arrow");
+ aArrowName = OUString("reverse concave arrow");
break;
case AH_ARROW_INVLINEARROW:
- aArrowName = rtl::OUString("reverse line arrow");
+ aArrowName = OUString("reverse line arrow");
break;
case AH_ARROW_TEE:
- aArrowName = rtl::OUString("Dimension lines");
+ aArrowName = OUString("Dimension lines");
break;
case AH_ARROW_SQUARE:
- aArrowName = rtl::OUString("Square");
+ aArrowName = OUString("Square");
break;
case AH_ARROW_CIRCLE:
- aArrowName = rtl::OUString("Circle");
+ aArrowName = OUString("Circle");
break;
}
@@ -380,7 +380,7 @@ XFFrame* LwpDrawObj::CreateXFDrawObject()
this->Read();
// register style
- rtl::OUString aStyleName = this->RegisterStyle();
+ OUString aStyleName = this->RegisterStyle();
// create XF-Objects
XFFrame* pXFObj = NULL;
@@ -434,7 +434,7 @@ void LwpDrawLine::Read()
*m_pStream >> m_aLineRec.aPenColor.unused;
}
-rtl::OUString LwpDrawLine::RegisterStyle()
+OUString LwpDrawLine::RegisterStyle()
{
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -449,7 +449,7 @@ rtl::OUString LwpDrawLine::RegisterStyle()
}
-XFFrame* LwpDrawLine::CreateDrawObj(const rtl::OUString& rStyleName )
+XFFrame* LwpDrawLine::CreateDrawObj(const OUString& rStyleName )
{
XFDrawPath* pLine = new XFDrawPath();
pLine->MoveTo(XFPoint((double)(m_aLineRec.nStartX)/TWIPS_PER_CM * m_pTransData->fScaleX,
@@ -513,7 +513,7 @@ void LwpDrawPolyLine::Read()
}
}
-rtl::OUString LwpDrawPolyLine::RegisterStyle()
+OUString LwpDrawPolyLine::RegisterStyle()
{
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -528,7 +528,7 @@ rtl::OUString LwpDrawPolyLine::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawPolyLine::CreateDrawObj(const rtl::OUString& rStyleName )
+XFFrame* LwpDrawPolyLine::CreateDrawObj(const OUString& rStyleName )
{
XFDrawPath* pPolyline = new XFDrawPath();
pPolyline->MoveTo(XFPoint((double)m_pVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
@@ -593,7 +593,7 @@ void LwpDrawPolygon::Read()
}
}
-rtl::OUString LwpDrawPolygon::RegisterStyle()
+OUString LwpDrawPolygon::RegisterStyle()
{
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -608,7 +608,7 @@ rtl::OUString LwpDrawPolygon::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawPolygon::CreateDrawObj(const rtl::OUString& rStyleName)
+XFFrame* LwpDrawPolygon::CreateDrawObj(const OUString& rStyleName)
{
XFDrawPath* pPolygon = new XFDrawPath();
pPolygon->MoveTo(XFPoint((double)m_pVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
@@ -673,7 +673,7 @@ void LwpDrawRectangle::Read()
}
}
-rtl::OUString LwpDrawRectangle::RegisterStyle()
+OUString LwpDrawRectangle::RegisterStyle()
{
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -688,7 +688,7 @@ rtl::OUString LwpDrawRectangle::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawRectangle::CreateDrawObj(const rtl::OUString& rStyleName)
+XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName)
{
if (m_eType == OT_RNDRECT)
{
@@ -715,7 +715,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const rtl::OUString& rStyleName)
}
}
-XFFrame* LwpDrawRectangle::CreateRoundedRect(const rtl::OUString& rStyleName)
+XFFrame* LwpDrawRectangle::CreateRoundedRect(const OUString& rStyleName)
{
XFDrawPath* pRoundedRect = new XFDrawPath();
pRoundedRect->MoveTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
@@ -832,7 +832,7 @@ void LwpDrawEllipse::Read()
}
}
-rtl::OUString LwpDrawEllipse::RegisterStyle()
+OUString LwpDrawEllipse::RegisterStyle()
{
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -847,7 +847,7 @@ rtl::OUString LwpDrawEllipse::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawEllipse::CreateDrawObj(const rtl::OUString& rStyleName )
+XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName )
{
XFDrawPath* pEllipse = new XFDrawPath();
pEllipse->MoveTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
@@ -911,7 +911,7 @@ void LwpDrawArc::Read()
}
}
-rtl::OUString LwpDrawArc::RegisterStyle()
+OUString LwpDrawArc::RegisterStyle()
{
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -926,7 +926,7 @@ rtl::OUString LwpDrawArc::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawArc::CreateDrawObj(const rtl::OUString& rStyleName )
+XFFrame* LwpDrawArc::CreateDrawObj(const OUString& rStyleName )
{
XFDrawPath* pArc = new XFDrawPath();
pArc->MoveTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
@@ -1055,7 +1055,7 @@ void LwpDrawTextBox::Read()
m_pStream->Read(m_aTextRec.pTextString, TextLength);
}
-rtl::OUString LwpDrawTextBox::RegisterStyle()
+OUString LwpDrawTextBox::RegisterStyle()
{
XFParaStyle* pStyle = new XFParaStyle();
@@ -1064,7 +1064,7 @@ rtl::OUString LwpDrawTextBox::RegisterStyle()
XFFont* pFont = new XFFont();
rtl_TextEncoding aEncoding = RTL_TEXTENCODING_MS_1252;
- rtl::OUString aFontName = rtl::OUString((sal_Char*)m_aTextRec.tmpTextFaceName,
+ OUString aFontName = OUString((sal_Char*)m_aTextRec.tmpTextFaceName,
strlen((char*)m_aTextRec.tmpTextFaceName), aEncoding);
pFont->SetFontName(aFontName);
@@ -1076,7 +1076,7 @@ rtl::OUString LwpDrawTextBox::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName )
+XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName )
{
XFFrame* pTextBox = new XFFrame(sal_True);
@@ -1093,7 +1093,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName )
}
XFParagraph* pXFPara = new XFParagraph();
- pXFPara->Add(rtl::OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding));
+ pXFPara->Add(OUString((sal_Char*)m_aTextRec.pTextString, (TextLength-2), aEncoding));
pXFPara->SetStyleName(rStyleName);
pTextBox->Add(pXFPara);
@@ -1247,7 +1247,7 @@ void LwpDrawTextArt::Read()
}
-rtl::OUString LwpDrawTextArt::RegisterStyle()
+OUString LwpDrawTextArt::RegisterStyle()
{
XFParaStyle* pStyle = new XFParaStyle();
@@ -1256,7 +1256,7 @@ rtl::OUString LwpDrawTextArt::RegisterStyle()
XFFont* pFont = new XFFont();
rtl_TextEncoding aEncoding = RTL_TEXTENCODING_MS_1252;
- rtl::OUString aFontName = rtl::OUString((sal_Char*)m_aTextArtRec.tmpTextFaceName,
+ OUString aFontName = OUString((sal_Char*)m_aTextArtRec.tmpTextFaceName,
strlen((char*)m_aTextArtRec.tmpTextFaceName), aEncoding);
pFont->SetFontName(aFontName);
@@ -1268,7 +1268,7 @@ rtl::OUString LwpDrawTextArt::RegisterStyle()
return pXFStyleManager->AddStyle(pStyle)->GetStyleName();
}
-XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName)
+XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName)
{
XFFrame* pRetObj = NULL;
XFDrawStyle* pStyle = new XFDrawStyle();
@@ -1292,7 +1292,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName)
}
XFParagraph* pXFPara = new XFParagraph();
- pXFPara->Add(rtl::OUString((sal_Char*)m_aTextArtRec.pTextString, (m_aTextArtRec.nTextLen-1), aEncoding));
+ pXFPara->Add(OUString((sal_Char*)m_aTextArtRec.pTextString, (m_aTextArtRec.nTextLen-1), aEncoding));
pXFPara->SetStyleName(rStyleName);
pRetObj->Add(pXFPara);
@@ -1302,7 +1302,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName)
return pRetObj;
}
-XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const rtl::OUString& rStyleName )
+XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const OUString& rStyleName )
{
return this->CreateDrawObj(rStyleName);
}
@@ -1457,7 +1457,7 @@ void LwpDrawBitmap::Read()
m_pStream->Read(pPicData, nDIBRemaining);
}
-rtl::OUString LwpDrawBitmap::RegisterStyle()
+OUString LwpDrawBitmap::RegisterStyle()
{
XFImageStyle* pBmpStyle = new XFImageStyle();
pBmpStyle->SetYPosType(enumXFFrameYPosFromTop, enumXFFrameYRelFrame);
@@ -1467,7 +1467,7 @@ rtl::OUString LwpDrawBitmap::RegisterStyle()
return pXFStyleManager->AddStyle(pBmpStyle)->GetStyleName();
}
-XFFrame* LwpDrawBitmap::CreateDrawObj(const rtl::OUString& rStyleName)
+XFFrame* LwpDrawBitmap::CreateDrawObj(const OUString& rStyleName)
{
XFImage* pImage = new XFImage();
pImage->SetImageData(m_pImageData, m_aBmpRec.nFileSize);
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 80a0430fdf57..e570b7c121c1 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -95,7 +95,7 @@ protected:
const SdwColor& rColor);
void SetPosition(XFFrame* pObj);
void SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag, sal_uInt8 nLineWidth);
- rtl::OUString GetArrowName(sal_uInt8 nArrowStyle);
+ OUString GetArrowName(sal_uInt8 nArrowStyle);
protected:
/**
@@ -107,21 +107,21 @@ protected:
* @descr register styles of a draw object according to the saved records data.
* @return the style name which has been registered.
*/
- virtual rtl::OUString RegisterStyle() = 0;
+ virtual OUString RegisterStyle() = 0;
/**
* @descr create XF-draw object and assign the style name to it.
* @param style name.
* @return pointer of the created XF-draw object.
*/
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName) = 0;
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName) = 0;
/**
* @descr create XF-draw object and assign the style name to it.
* @param style name.
* @return pointer of the created XF-draw object.
*/
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName) = 0;
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName) = 0;
public:
/**
@@ -156,12 +156,12 @@ public:
protected:
virtual void Read() {}
- virtual rtl::OUString RegisterStyle()
+ virtual OUString RegisterStyle()
{
- return rtl::OUString();
+ return OUString();
}
- virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
+ virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) { return NULL; }
+ virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) { return NULL; }
};
@@ -180,9 +180,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
/**
@@ -201,9 +201,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
@@ -223,9 +223,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
/**
@@ -243,12 +243,12 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
private:
- XFFrame* CreateRoundedRect(const rtl::OUString& rStyleName);
+ XFFrame* CreateRoundedRect(const OUString& rStyleName);
};
/**
@@ -266,9 +266,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
@@ -288,9 +288,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
/**
@@ -311,9 +311,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
/**
@@ -336,9 +336,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
/**
@@ -353,12 +353,12 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle()
+ virtual OUString RegisterStyle()
{
- return rtl::OUString();
+ return OUString();
}
- virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
+ virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/){return NULL;}
+ virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/){return NULL;}
};
/**
@@ -376,9 +376,9 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle();
- virtual XFFrame* CreateDrawObj(const rtl::OUString& rStyleName);
- virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& rStyleName);
+ virtual OUString RegisterStyle();
+ virtual XFFrame* CreateDrawObj(const OUString& rStyleName);
+ virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName);
};
#endif
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 852e34ab656d..f1b082a7f2c2 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -93,11 +93,10 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
sal_Bool IsWordproFile( uno::Reference<XInputStream>& rInputStream);
-sal_Bool IsWordproFile(rtl::OUString file);
+sal_Bool IsWordproFile(OUString file);
LWPFilterReader::LWPFilterReader()
{
@@ -110,7 +109,7 @@ LWPFilterReader::~LWPFilterReader()
sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
throw( RuntimeException )
{
- ::rtl::OUString sURL;
+ OUString sURL;
for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
{
//Note we should attempt to use "InputStream" if it exists first!
@@ -206,11 +205,11 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
}
-::rtl::OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (::com::sun::star::uno::RuntimeException)
{
- rtl::OUString ret;
- rtl::OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection)
+ OUString ret;
+ OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection)
// 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
// there is no parameter that forbids to open as template
@@ -247,7 +246,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(!bOpenAsTemplate)
{
aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate");
+ aDescriptor[nPropertyCount].Name = OUString("AsTemplate");
aDescriptor[nPropertyCount].Value <<= sal_True;
}
return OUString("wordpro_template");
@@ -281,7 +280,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(!bOpenAsTemplate)
{
aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate");
+ aDescriptor[nPropertyCount].Name = OUString("AsTemplate");
aDescriptor[nPropertyCount].Value <<= sal_True;
}
return OUString("wordpro_template");
@@ -450,7 +449,7 @@ sal_Bool IsWordProStr(const sal_Int8 *pBuf)
return bRet;
}
-sal_Bool IsWordproFile(rtl::OUString file)
+sal_Bool IsWordproFile(OUString file)
{
sal_Bool bRet = sal_False;
SfxMedium aMedium( file, STREAM_STD_READ);
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index 8d50f3c54982..3c058ec434ab 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -163,7 +163,7 @@ public:
* @descr function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever
* a file is to be loaded.
*/
- virtual ::rtl::OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
public:
uno::Reference< XFilter > rFilter;
diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx
index d54660f88f3f..24d1e37afb23 100644
--- a/lotuswordpro/source/filter/lwpfrib.hxx
+++ b/lotuswordpro/source/filter/lwpfrib.hxx
@@ -108,10 +108,10 @@ protected:
LwpFrib* m_pNext;
sal_uInt8 m_nFribType;
ModifierInfo* m_pModifiers;
- rtl::OUString m_StyleName;
+ OUString m_StyleName;
public:
sal_Bool m_ModFlag;
- rtl::OUString GetStyleName(){return m_StyleName;}//add by 1-10
+ OUString GetStyleName(){return m_StyleName;}//add by 1-10
// void SetStyle(LwpFoundry* pFoundry);
sal_Bool IsModified(){return m_ModFlag;}
void SetModifiers(ModifierInfo* pModifiers);
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index 77db1448d460..5c293eb82d95 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -659,15 +659,15 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
else if (sFormula == A2OUSTR("%FLeeeeoa") || sFormula == A2OUSTR("%FLffffooaa") || sFormula == A2OUSTR("%FLEEEEOA"))
{
pDateStyle = new XFDateStyle;
- rtl::OUString sText;
+ OUString sText;
pDateStyle->AddYear();
- sText = rtl::OUString(0x5e74);
+ sText = OUString(0x5e74);
pDateStyle->AddText(sText);
pDateStyle->AddMonth(sal_False);
- sText = rtl::OUString(0x6708);
+ sText = OUString(0x6708);
pDateStyle->AddText(sText);
pDateStyle->AddMonthDay(sal_False);
- sText = rtl::OUString(0x65e5);
+ sText = OUString(0x65e5);
pDateStyle->AddText(sText);
}
else if (sFormula == A2OUSTR("%FLoa") || sFormula == A2OUSTR("%FLooaa") || sFormula == A2OUSTR("%FLOA") )
@@ -675,10 +675,10 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
pDateStyle = new XFDateStyle;
OUString sText;
pDateStyle->AddMonth(sal_False);
- sText = rtl::OUString(0x6708);
+ sText = OUString(0x6708);
pDateStyle->AddText(sText);
pDateStyle->AddMonthDay(sal_False);
- sText = rtl::OUString(0x65e5);
+ sText = OUString(0x65e5);
pDateStyle->AddText(sText);
}
else if (sFormula == A2OUSTR("%FLYYYY/M/D") || sFormula == A2OUSTR("%FLGGGG/od/ad"))
@@ -967,11 +967,11 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
{
pTimeStyle = new XFTimeStyle;
pTimeStyle->AddHour(sal_False);
- rtl::OUString sText;
- sText = rtl::OUString(0x70b9);
+ OUString sText;
+ sText = OUString(0x70b9);
pTimeStyle->AddText(sText);
pTimeStyle->AddMinute(sal_False);
- sText = rtl::OUString(0x5206);
+ sText = OUString(0x5206);
pTimeStyle->AddText(sText);
}
else if (sFormula == A2OUSTR("%FLjjjF") || sFormula == A2OUSTR("%FLJJJFF") )
@@ -979,11 +979,11 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
pTimeStyle = new XFTimeStyle;
pTimeStyle->SetAmPm(sal_True);
pTimeStyle->AddHour(sal_False);
- rtl::OUString sText;
- sText = rtl::OUString(0x70b9);
+ OUString sText;
+ sText = OUString(0x70b9);
pTimeStyle->AddText(sText);
pTimeStyle->AddMinute(sal_False);
- sText = rtl::OUString(0x5206);
+ sText = OUString(0x5206);
pTimeStyle->AddText(sText);
}
//chinese version end
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index 239df1787504..89c0db7b5029 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -269,7 +269,7 @@ void LwpFribPtr::XFConvert()
break;
case FRIB_TAG_HARDSPACE:
{
- rtl::OUString sHardSpace(sal_Unicode(0x00a0));
+ OUString sHardSpace(sal_Unicode(0x00a0));
LwpHyperlinkMgr* pHyperlink =
m_pPara->GetStory()->GetHyperlinkMgr();
if (pHyperlink->GetHyperlinkFlag())
@@ -280,7 +280,7 @@ void LwpFribPtr::XFConvert()
break;
case FRIB_TAG_SOFTHYPHEN:
{
- rtl::OUString sSoftHyphen(sal_Unicode(0x00ad));
+ OUString sSoftHyphen(sal_Unicode(0x00ad));
pFrib->ConvertChars(m_pXFPara,sSoftHyphen);
}
break;
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx
index 71dcc243d7dd..489b0cfd47ce 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.cxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx
@@ -137,7 +137,7 @@ void LwpGlobalMgr::SetEditorAttrMap(sal_uInt16 nID, LwpEditorAttr* pAttr)
m_EditorAttrMap[nID] = pAttr;
}
-rtl::OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID)
+OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID)
{
std::map<sal_uInt16,LwpEditorAttr*>::iterator iter;
iter = m_EditorAttrMap.find(nID);
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index aa6fa88968af..171ab2c69776 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -701,7 +701,7 @@ void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont)
{
pEquData[nIndex] = pGrafData[nBegin + nIndex];
}
- pXFNotePara->Add(rtl::OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), osl_getThreadTextEncoding()));
+ pXFNotePara->Add(OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), osl_getThreadTextEncoding()));
delete [] pEquData;
}
pXFNote->Add(pXFNotePara);
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx
index 8c22e0bc2af2..4956575ec1ba 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.cxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx
@@ -304,14 +304,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP
{
if (bNegtive)
{
- aPrefix = rtl::OUString("(");
+ aPrefix = OUString("(");
}
if (!bPost)
{
aPrefix += aSymbol;
if (bShowSpace)
{
- aPrefix += rtl::OUString(" ");
+ aPrefix += OUString(" ");
}
}
}
@@ -322,14 +322,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP
aSuffix = aSymbol;
if (bShowSpace)
{
- aSuffix.Insert(rtl::OUString(" "),0);
+ aSuffix.Insert(OUString(" "),0);
}
}
if (bNegtive)
{
- aSuffix += rtl::OUString(")");
+ aSuffix += OUString(")");
}
}
}
@@ -421,11 +421,11 @@ XFStyle* LwpNumericFormat::Convert()
{
if (cNegative.IsDefaultPrefix() && aNegPrefix.Len() == 0)
{
- aNegPrefix = rtl::OUString("(");
+ aNegPrefix = OUString("(");
}
if (cNegative.IsDefaultSuffix() && aNegSuffix.Len() == 0)
{
- aNegSuffix = rtl::OUString(")");
+ aNegSuffix = OUString(")");
}
}
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 97ff249d0e86..25e14e5b393d 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -193,50 +193,50 @@ private:
void InitCurrencySymbol()
{
sal_uInt16 nC=FMT_ARGENTINEANPESO;
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A")); //FMT_ARGENTINEANPESO = 1,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A$")); //FMT_AUSTRALIANDOLLAR = 2,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("A")); //FMT_ARGENTINEANPESO = 1,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("A$")); //FMT_AUSTRALIANDOLLAR = 2,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC = 4,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO = 5,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("£",RTL_TEXTENCODING_UTF8)); //FMT_BRITISHPOUND = 6,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("C$")); //FMT_CANADIANDOLLAR = 7,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("C$")); //FMT_CANADIANDOLLAR = 7,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("PRC¥",RTL_TEXTENCODING_UTF8),sal_False,sal_True); //FMT_CHINESEYUAN = 8,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("ECU"),sal_True, sal_True);//FMT_ECU = 11,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("HK$")); //FMT_HONGKONGDOLLAR = 16,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA = 9,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE = 10,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("ECU"),sal_True, sal_True);//FMT_ECU = 11,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA = 12,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC = 13,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK = 14,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA = 15,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("HK$")); //FMT_HONGKONGDOLLAR = 16,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT = 17,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE = 18,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("IR£",RTL_TEXTENCODING_UTF8)); //FMT_IRISHPUNT = 20,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA = 21,
m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("¥",RTL_TEXTENCODING_UTF8)); //FMT_JAPANESEYEN = 22,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Mex$")); //FMT_MEXICANPESO = 25,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NZ$")); //FMT_NEWZEALANDDOLLAR = 27,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("S$")); //FMT_SINGAPOREDOLLAR = 33,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R")); //FMT_SOUTHAFRICANRAND = 36,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("W")); //FMT_SOUTHKOREANWON = 37,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NT$")); //FMT_TAIWANDOLLAR = 41,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("$")); //FMT_USDOLLAR = 43,
- m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC = 23,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Mex$")); //FMT_MEXICANPESO = 25,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER = 26,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("NZ$")); //FMT_NEWZEALANDDOLLAR = 27,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE = 28,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY = 29,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO = 30,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI = 31,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE = 32,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("S$")); //FMT_SINGAPOREDOLLAR = 33,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA = 34,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR = 35,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("R")); //FMT_SOUTHAFRICANRAND = 36,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("W")); //FMT_SOUTHKOREANWON = 37,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA = 38,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA = 39,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC = 40,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("NT$")); //FMT_TAIWANDOLLAR = 41,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT = 42,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("$")); //FMT_USDOLLAR = 43,
+ m_aCurrencyInfo[nC++]=LwpCurrencyInfo(OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY = 44,
m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(String("€",RTL_TEXTENCODING_UTF8)); //FMT_EURO = 52
}
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx
index 0c54a2bd4d8c..41680114c34f 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/source/filter/lwpobjid.hxx
@@ -143,14 +143,14 @@ inline void LwpObjectID::SetHigh(sal_uInt16 nh)
}
inline size_t LwpObjectID::HashCode() const
{
- rtl::OUString str;
+ OUString str;
if(m_nIndex)
{
- str = rtl::OUString(m_nIndex) + rtl::OUString(m_nHigh);
+ str = OUString(m_nIndex) + OUString(m_nHigh);
}
else
{
- str = rtl::OUString(m_nLow) + rtl::OUString(m_nHigh);
+ str = OUString(m_nLow) + OUString(m_nHigh);
}
return str.hashCode();
}
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index 78720e2372a1..2c83616d5a97 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -102,7 +102,7 @@ protected:
LwpObjectID m_pPrevObj;
LwpObjectID m_pNextObj;
- rtl::OUString m_strStyleName;
+ OUString m_strStyleName;
};
/**
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index e274aa37cfb5..5628772dfdef 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -570,7 +570,7 @@ void LwpPara::RegisterStyle()
// test codes
if (m_pSilverBullet->IsBulletOrdered())
{
- rtl::OUString aPreBullStyleName;
+ OUString aPreBullStyleName;
LwpNumberingOverride* pNumbering = this->GetParaNumbering();
sal_uInt16 nPosition = pNumbering->GetPosition();
sal_Bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition);
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 220d48e3dd04..37dab63f6b9c 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -170,7 +170,7 @@ public:
inline LwpSilverBullet* GetSilverBullet();
inline LwpObjectID GetSilverBulletID();
- rtl::OUString GetBulletChar() const;
+ OUString GetBulletChar() const;
sal_uInt32 GetBulletFontID() const;
sal_uInt16 GetLevel() const;
sal_Bool GetBulletFlag() const;
@@ -180,12 +180,12 @@ public:
double GetBelowSpacing();
LwpParaProperty* GetProperty(sal_uInt32 nPropType);
void GatherDropcapInfo();
- rtl::OUString GetBulletStyleName() const;
+ OUString GetBulletStyleName() const;
void SetBelowSpacing(double value);
- void SetBulletStyleName(const rtl::OUString& rNewName);
+ void SetBulletStyleName(const OUString& rNewName);
void SetBulletFlag(sal_Bool bFlag);
void SetIndent(LwpIndentOverride* pIndentOverride);
- void SetFirstFrib(rtl::OUString Content,sal_uInt32 FontID);
+ void SetFirstFrib(OUString Content,sal_uInt32 FontID);
OUString GetContentText(sal_Bool bAllText = sal_False);
void SetParaDropcap(sal_Bool bFlag);
@@ -222,25 +222,25 @@ protected:
LwpParaProperty* m_pProps;
//LwpForked3NotifyList* m_NotifyList; //not saved
- rtl::OUString m_StyleName;
- rtl::OUString m_ParentStyleName;//Add to support toc
+ OUString m_StyleName;
+ OUString m_ParentStyleName;//Add to support toc
LwpBreaksOverride* m_pBreaks;
- rtl::OUString m_AftPageBreakName;
- rtl::OUString m_BefPageBreakName;
- rtl::OUString m_AftColumnBreakName;
+ OUString m_AftPageBreakName;
+ OUString m_BefPageBreakName;
+ OUString m_AftColumnBreakName;
- rtl::OUString m_BefColumnBreakName;
+ OUString m_BefColumnBreakName;
LwpIndentOverride* m_pIndentOverride;
- rtl::OUString m_Content;//for silver bullet,get text of first frib, add by 2/1
+ OUString m_Content;//for silver bullet,get text of first frib, add by 2/1
sal_uInt32 m_FontID;//for silver bullet
- rtl::OUString m_AllText;//get all text in this paragraph
+ OUString m_AllText;//get all text in this paragraph
sal_Bool m_bHasBullet;
LwpObjectID m_aSilverBulletID;
LwpSilverBullet* m_pSilverBullet;
LwpBulletOverride* m_pBullOver;
boost::scoped_ptr<LwpNumberingOverride> m_pParaNumbering;
- rtl::OUString m_aBulletStyleName;
+ OUString m_aBulletStyleName;
sal_Bool m_bBullContinue;
//end add
@@ -253,7 +253,7 @@ protected:
XFContentContainer* m_pXFContainer; //Current container for VO_PARA
- rtl::OUString m_TabStyleName;
+ OUString m_TabStyleName;
enum
{
/* bit definitions for the paragraph object flags */
@@ -305,7 +305,7 @@ inline LwpObjectID LwpPara::GetSilverBulletID()
{
return m_aSilverBulletID;
}
-inline rtl::OUString LwpPara::GetBulletChar() const
+inline OUString LwpPara::GetBulletChar() const
{
return m_Content;
}
@@ -317,7 +317,7 @@ inline sal_uInt16 LwpPara::GetLevel() const
{
return m_nLevel;
}
-inline void LwpPara::SetBulletStyleName(const rtl::OUString& rNewName)
+inline void LwpPara::SetBulletStyleName(const OUString& rNewName)
{
m_aBulletStyleName = rNewName;
}
@@ -341,7 +341,7 @@ inline XFContentContainer* LwpPara::GetXFContainer()
{
return m_pXFContainer;
}
-inline rtl::OUString LwpPara::GetBulletStyleName() const
+inline OUString LwpPara::GetBulletStyleName() const
{
return m_aBulletStyleName;
}
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 30f33fa6c40a..06690f8e43f8 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -142,7 +142,7 @@ void LwpPara::SetAllText(OUString sText)
/**
* @short set first frib content
*/
-void LwpPara::SetFirstFrib(rtl::OUString Content,sal_uInt32 FontID)
+void LwpPara::SetFirstFrib(OUString Content,sal_uInt32 FontID)
{
m_FontID= FontID;
m_Content=Content;
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 320f60c9ab0c..27dedc073512 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -131,7 +131,7 @@ void LwpSilverBullet::RegisterStyle()
m_pHideLevels[nPos] = aParaNumbering.nNumLevel;
sal_uInt16 nDisplayLevel = this->GetDisplayLevel(nPos);
bCumulative = (sal_Bool)(nDisplayLevel > 1);
- rtl::OUString aPrefix = this->GetAdditionalName(nPos);
+ OUString aPrefix = this->GetAdditionalName(nPos);
XFNumFmt aFmt;
if (!bCumulative && aParaNumbering.pPrefix)
@@ -157,7 +157,7 @@ void LwpSilverBullet::RegisterStyle()
}
else
{
- rtl::OUString aPrefix, aSuffix;
+ OUString aPrefix, aSuffix;
if (aParaNumbering.pPrefix)
{
aPrefix = aParaNumbering.pPrefix->GetText();
@@ -168,7 +168,7 @@ void LwpSilverBullet::RegisterStyle()
}
pListStyle->SetListBullet(nPos, this->GetNumCharByStyleID(pParaNumber).toChar(),
- rtl::OUString("Times New Roman"), aPrefix, aSuffix);
+ OUString("Times New Roman"), aPrefix, aSuffix);
}
pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
@@ -186,9 +186,9 @@ void LwpSilverBullet::RegisterStyle()
* @descr:
* @return: Font name of the bullet.
*/
-rtl::OUString LwpSilverBullet::GetBulletFontName()
+OUString LwpSilverBullet::GetBulletFontName()
{
- rtl::OUString aEmpty;
+ OUString aEmpty;
//foundry has been set?
if (!m_pFoundry)
@@ -212,7 +212,7 @@ rtl::OUString LwpSilverBullet::GetBulletFontName()
}
//get font name from font manager.
- rtl::OUString aFontName = pFontMgr->GetNameByID(nBulletFontID);
+ OUString aFontName = pFontMgr->GetNameByID(nBulletFontID);
return aFontName;
}
@@ -223,7 +223,7 @@ rtl::OUString LwpSilverBullet::GetBulletFontName()
*/
UChar32 LwpSilverBullet::GetBulletChar()
{
- rtl::OUString aBulletChar = m_pBulletPara->GetBulletChar();
+ OUString aBulletChar = m_pBulletPara->GetBulletChar();
return aBulletChar.toChar();
}
@@ -254,9 +254,9 @@ LwpPara* LwpSilverBullet::GetBulletPara()
* includes numbering prefix, format and suffix.
* @return: An OUString object which store the numbering character.
*/
-rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
+OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
{
- rtl::OUString aEmpty;
+ OUString aEmpty;
if (!pParaNumber)
{
@@ -264,7 +264,7 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
return aEmpty;
}
- rtl::OUString strNumChar("1");
+ OUString strNumChar("1");
sal_uInt16 nStyleID = pParaNumber->GetStyleID();
UChar32 uC = 0x0000;
@@ -273,40 +273,40 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
case NUMCHAR_1:
case NUMCHAR_01:
case NUMCHAR_Chinese4:
- strNumChar = rtl::OUString("1");
+ strNumChar = OUString("1");
break;
case NUMCHAR_A :
- strNumChar = rtl::OUString("A");
+ strNumChar = OUString("A");
break;
case NUMCHAR_a:
- strNumChar = rtl::OUString("a");
+ strNumChar = OUString("a");
break;
case NUMCHAR_I:
- strNumChar = rtl::OUString("I");
+ strNumChar = OUString("I");
break;
case NUMCHAR_i:
- strNumChar = rtl::OUString("i");
+ strNumChar = OUString("i");
break;
case NUMCHAR_other:
uC = static_cast<UChar32>(pParaNumber->GetNumberChar());
- strNumChar = rtl::OUString(uC);
+ strNumChar = OUString(uC);
break;
case NUMCHAR_Chinese1:
{
sal_Unicode sBuf[13] = {0x58f9,0x002c,0x0020,0x8d30,0x002c,0x0020,0x53c1,0x002c,0x0020,0x002e,0x002e,0x002e,0x0};
- strNumChar = rtl::OUString(sBuf);
+ strNumChar = OUString(sBuf);
}
break;
case NUMCHAR_Chinese2:
{
sal_Unicode sBuf[13] = {0x4e00,0x002c,0x0020,0x4e8c,0x002c,0x0020,0x4e09,0x002c,0x0020,0x002e,0x002e,0x002e,0x0};
- strNumChar = rtl::OUString(sBuf);
+ strNumChar = OUString(sBuf);
}
break;
case NUMCHAR_Chinese3:
{
sal_Unicode sBuf[13] = {0x7532,0x002c,0x0020,0x4e59,0x002c,0x0020,0x4e19,0x002c,0x0020,0x002e,0x002e,0x002e,0x0};
- strNumChar = rtl::OUString(sBuf);
+ strNumChar = OUString(sBuf);
}
break;
case NUMCHAR_none:
@@ -367,9 +367,9 @@ sal_uInt16 LwpSilverBullet::GetDisplayLevel(sal_uInt8 nPos)
* @param: nPos position of the numbering.
* @return: Division or Section name.
*/
-rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
+OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
{
- rtl::OUString aRet, aEmpty;
+ OUString aRet, aEmpty;
sal_uInt16 nHideBit = (1 << nPos);
sal_Bool bDivisionName = sal_False;
sal_Bool bSectionName = sal_False;
@@ -419,9 +419,9 @@ rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
return aRet;
}
-rtl::OUString LwpSilverBullet::GetDivisionName()
+OUString LwpSilverBullet::GetDivisionName()
{
- rtl::OUString aRet;
+ OUString aRet;
if (!m_pFoundry)
{
@@ -443,9 +443,9 @@ rtl::OUString LwpSilverBullet::GetDivisionName()
return aRet;
}
-rtl::OUString LwpSilverBullet::GetSectionName()
+OUString LwpSilverBullet::GetSectionName()
{
- rtl::OUString aEmpty;
+ OUString aEmpty;
LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY));
if (!pStory)
{
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index 709fb85ef4d4..342e06a09bbe 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -103,23 +103,23 @@ public:
sal_Bool IsBulletOrdered();
- rtl::OUString GetBulletFontName();
+ OUString GetBulletFontName();
- inline rtl::OUString GetBulletStyleName() const;
+ inline OUString GetBulletStyleName() const;
UChar32 GetBulletChar();
- rtl::OUString GetPrefix() { return rtl::OUString(); }
+ OUString GetPrefix() { return OUString(); }
- rtl::OUString GetSuffix() { return rtl::OUString(); }
+ OUString GetSuffix() { return OUString(); }
- inline rtl::OUString GetNumberingName();
+ inline OUString GetNumberingName();
inline LwpPara* GetNumberingPara();
sal_Bool HasName();
- static rtl::OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber);
+ static OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber);
inline sal_Bool IsPosCumulative(sal_uInt16 nHideLevels);
inline sal_Bool IsLesserLevel(sal_uInt16 nPos);
@@ -129,11 +129,11 @@ public:
sal_uInt16 GetDisplayLevel(sal_uInt8 nPos);
- rtl::OUString GetAdditionalName(sal_uInt8 nPos);
+ OUString GetAdditionalName(sal_uInt8 nPos);
- rtl::OUString GetDivisionName();
+ OUString GetDivisionName();
- rtl::OUString GetSectionName();
+ OUString GetSectionName();
private:
sal_uInt16 m_nFlags;
@@ -143,7 +143,7 @@ private:
LwpAtomHolder* m_pAtomHolder;
LwpPara* m_pBulletPara;
- rtl::OUString m_strStyleName;
+ OUString m_strStyleName;
sal_uInt16 m_pHideLevels[10];
private:
@@ -156,12 +156,12 @@ private:
CUMULATIVE = 0x10
};
};
-inline rtl::OUString LwpSilverBullet::GetBulletStyleName() const
+inline OUString LwpSilverBullet::GetBulletStyleName() const
{
return m_strStyleName;
}
-inline rtl::OUString LwpSilverBullet::GetNumberingName()
+inline OUString LwpSilverBullet::GetNumberingName()
{
return GetName()->str();
}
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 5b2e6f62496c..3edee62ca07b 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -511,12 +511,12 @@ OUString LwpStory::RegisterFirstFribStyle()
return A2OUSTR("");
}
-sal_Bool LwpStory::IsBullStyleUsedBefore(const rtl::OUString& rStyleName, const sal_uInt8& nPos)
+sal_Bool LwpStory::IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos)
{
std::vector <NamePosPair>::reverse_iterator rIter;
for (rIter = m_vBulletStyleNameList.rbegin(); rIter != m_vBulletStyleNameList.rend(); ++rIter)
{
- rtl::OUString aName = (*rIter).first;
+ OUString aName = (*rIter).first;
sal_uInt8 nPosition = (*rIter).second;
if (aName == rStyleName && nPosition == nPos)
{
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index 7bbd2b5a2f99..8ef75e32604b 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -80,7 +80,7 @@ private:
LwpObjectID m_FirstParaStyle;
// for bullet , 05/23/2005
- typedef std::pair<rtl::OUString, sal_uInt8> NamePosPair;
+ typedef std::pair<OUString, sal_uInt8> NamePosPair;
std::vector <NamePosPair> m_vBulletStyleNameList;
// , 02/16/2005
@@ -133,8 +133,8 @@ public:
LwpPara* GetLastParaOfPreviousStory();
OUString GetContentText(sal_Bool bAllText = sal_False);//add by ,for CHB,05/5/25
- inline void AddBullStyleName2List(const rtl::OUString& rStyleName, const sal_uInt8& nPos);
- sal_Bool IsBullStyleUsedBefore(const rtl::OUString& rStyleName, const sal_uInt8& nPos);
+ inline void AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos);
+ sal_Bool IsBullStyleUsedBefore(const OUString& rStyleName, const sal_uInt8& nPos);
OUString RegisterFirstFribStyle();
};
@@ -193,7 +193,7 @@ LwpHyperlinkMgr* LwpStory::GetHyperlinkMgr()
{
return m_pHyperlinkMgr;
}
-inline void LwpStory::AddBullStyleName2List(const rtl::OUString& rStyleName, const sal_uInt8& nPos)
+inline void LwpStory::AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos)
{
m_vBulletStyleNameList.push_back(std::make_pair(rStyleName, nPos));
}
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index e8acdfe0aa25..a9988bc27249 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -128,9 +128,9 @@ sal_Bool LwpFormulaInfo::ReadText()
m_pObjStrm->QuickRead( pBuf.get(), nStrLen );
*(pBuf.get()+nStrLen)='\0';
String aText;
- aText += rtl::OUString("\"");
+ aText += OUString("\"");
aText.Append(String(pBuf.get(),nStrLen,osl_getThreadTextEncoding()));
- aText += rtl::OUString("\"");
+ aText += OUString("\"");
m_aStack.push_back(new LwpFormulaText(aText));
return sal_True;
@@ -446,9 +446,9 @@ LwpFormulaConst::LwpFormulaConst(double dVal)
m_dVal = dVal;
}
-rtl::OUString LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/)
+OUString LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/)
{
- return rtl::OUString::valueOf(m_dVal);
+ return OUString::valueOf(m_dVal);
}
/**
@@ -483,7 +483,7 @@ LwpFormulaCellAddr::LwpFormulaCellAddr(sal_Int16 aCol, sal_Int16 aRow)
* @param
* @return String
*/
-rtl::OUString LwpFormulaCellAddr::ToString(LwpTableLayout* pCellsMap)
+OUString LwpFormulaCellAddr::ToString(LwpTableLayout* pCellsMap)
{
String aCellAddr;
aCellAddr.AppendAscii("<");//&lt;
@@ -519,7 +519,7 @@ LwpFormulaCellRangeAddr::LwpFormulaCellRangeAddr(sal_Int16 aStartCol,
* @param
* @return String.
*/
-rtl::OUString LwpFormulaCellRangeAddr::ToString(LwpTableLayout* pCellsMap)
+OUString LwpFormulaCellRangeAddr::ToString(LwpTableLayout* pCellsMap)
{
String aCellAddr;
aCellAddr.AppendAscii("<");//&lt;
@@ -587,7 +587,7 @@ void LwpFormulaFunc::AddArg(LwpFormulaArg* pArg)
*/
String LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap)
{
- rtl::OUStringBuffer aFormula;
+ OUStringBuffer aFormula;
aFormula.append(static_cast<sal_Unicode>('('));
aFormula.append(ToString(pCellsMap));
aFormula.append(static_cast<sal_Unicode>(')'));
@@ -600,7 +600,7 @@ String LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap)
* @param
* @return sal_Bool.
*/
-rtl::OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
+OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
{
String aFormula;
@@ -636,7 +636,7 @@ rtl::OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
* @param
* @return sal_Bool.
*/
-rtl::OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
+OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
{
String aFormula;
if (2==m_aArgs.size())
@@ -669,7 +669,7 @@ rtl::OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
* @param
* @return sal_Bool.
*/
-rtl::OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap)
+OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap)
{
String aFormula;
if (1==m_aArgs.size())
@@ -699,64 +699,64 @@ String LwpFormulaTools::GetName(sal_uInt16 nTokenType)
switch(nTokenType)
{
case TK_SUM:
- aName = rtl::OUString("SUM");
+ aName = OUString("SUM");
break;
case TK_IF:
- aName = rtl::OUString("IF");//Not supported by SODC
+ aName = OUString("IF");//Not supported by SODC
break;
case TK_COUNT:
- aName = rtl::OUString("COUNT");//Not supported by SODC
+ aName = OUString("COUNT");//Not supported by SODC
break;
case TK_MINIMUM:
- aName = rtl::OUString("MIN");
+ aName = OUString("MIN");
break;
case TK_MAXIMUM:
- aName = rtl::OUString("MAX");
+ aName = OUString("MAX");
break;
case TK_AVERAGE:
- aName = rtl::OUString("MEAN");
+ aName = OUString("MEAN");
break;
case TK_ADD:
- aName = rtl::OUString("+");
+ aName = OUString("+");
break;
case TK_SUBTRACT:
- aName = rtl::OUString("-");
+ aName = OUString("-");
break;
case TK_MULTIPLY:
- aName = rtl::OUString("*");
+ aName = OUString("*");
break;
case TK_DIVIDE:
- aName = rtl::OUString("/");
+ aName = OUString("/");
break;
case TK_UNARY_MINUS:
- aName = rtl::OUString("-");
+ aName = OUString("-");
break;
case TK_LESS:
- aName = rtl::OUString("L");
+ aName = OUString("L");
break;
case TK_LESS_OR_EQUAL:
- aName = rtl::OUString("LEQ");
+ aName = OUString("LEQ");
break;
case TK_GREATER:
- aName = rtl::OUString("G");
+ aName = OUString("G");
break;
case TK_GREATER_OR_EQUAL:
- aName = rtl::OUString("GEQ");
+ aName = OUString("GEQ");
break;
case TK_EQUAL:
- aName = rtl::OUString("EQ");
+ aName = OUString("EQ");
break;
case TK_NOT_EQUAL:
- aName = rtl::OUString("NEQ");
+ aName = OUString("NEQ");
break;
case TK_NOT:
- aName = rtl::OUString("NOT");
+ aName = OUString("NOT");
break;
case TK_AND:
- aName = rtl::OUString("AND");
+ aName = OUString("AND");
break;
case TK_OR:
- aName = rtl::OUString("OR");
+ aName = OUString("OR");
break;
default:
assert(false);
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index ceaa41970a32..8efc8975d28a 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -110,7 +110,7 @@ class LwpFormulaArg
{
public:
virtual ~LwpFormulaArg() = 0;
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap)=0;
+ virtual OUString ToString(LwpTableLayout* pCellsMap)=0;
virtual String ToArgString(LwpTableLayout* pCellsMap){ return ToString(pCellsMap);}
};
@@ -125,7 +125,7 @@ class LwpFormulaConst:public LwpFormulaArg
{
public:
LwpFormulaConst( double dVal);
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap);
private:
double m_dVal;
};
@@ -134,7 +134,7 @@ class LwpFormulaText:public LwpFormulaArg
{
public:
LwpFormulaText( String aText);
- virtual rtl::OUString ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;}
+ virtual OUString ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;}
private:
String m_aText;
};
@@ -147,7 +147,7 @@ public:
sal_Int16 GetCol(){return m_aCol;}
sal_Int16 GetRow(){return m_aRow;}
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap);
private:
sal_Int16 m_aCol;
sal_Int16 m_aRow;
@@ -158,7 +158,7 @@ class LwpFormulaCellRangeAddr:public LwpFormulaArg
public:
LwpFormulaCellRangeAddr(sal_Int16 aStartCol, sal_Int16 aStartRow, sal_Int16 aEndCol, sal_Int16 aEndRow);
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap);
private:
sal_Int16 m_aStartCol;
sal_Int16 m_aStartRow;
@@ -174,7 +174,7 @@ public:
void AddArg(LwpFormulaArg* pArg);
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap);
String ToArgString(LwpTableLayout* pCellsMap);
protected:
@@ -186,14 +186,14 @@ class LwpFormulaOp : public LwpFormulaFunc
{
public:
LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap);
};
class LwpFormulaUnaryOp : public LwpFormulaFunc
{
public:
LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
- virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
+ virtual OUString ToString(LwpTableLayout* pCellsMap);
};
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 7eb92efe9156..ef4af4549ca3 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -153,7 +153,7 @@ void LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
if(!pLevel)
{
// add an blank template so that SODC won't add default style to this level
- pToc->AddTemplate(Int32ToOUString(i), rtl::OUString(), pTemplate);
+ pToc->AddTemplate(Int32ToOUString(i), OUString(), pTemplate);
continue;
}
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index a965917168f2..53b3a021a54e 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -133,7 +133,7 @@ private:
std::vector<std::pair<OUString,OUString> > m_TOCList;
- rtl::OUString m_TabStyleName;
+ OUString m_TabStyleName;
XFContentContainer* m_pCont;
};
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index 07879029c2e5..dd723cc42816 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -235,7 +235,7 @@ OUString LwpTools::convertToFileUrl(const OString &fileName)
OUString LwpTools::DateTimeToOUString(LtTm & dt)
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append(dt.tm_year);
buf.append( A2OUSTR("-") );
buf.append(dt.tm_mon);
@@ -262,10 +262,10 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
else
style = icu::DateFormat::SHORT;//system short date format
/* ::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLocale();
- rtl::OUString strLang = aLocale.Language;
- rtl::OUString strCountry = aLocale.Country;
+ OUString strLang = aLocale.Language;
+ OUString strCountry = aLocale.Country;
strLang = strLang + A2OUSTR("_");
- rtl::OUString strLocale = strLang + strCountry;
+ OUString strLocale = strLang + strCountry;
int32_t nLength = 0;
int32_t nLengthNeed;
@@ -287,8 +287,8 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
/* FIXME-BCP47: handle language tags! */
//1 get locale for system
::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLanguageTag().getLocale();
- rtl::OUString strLang = aLocale.Language;
- rtl::OUString strCountry = aLocale.Country;
+ OUString strLang = aLocale.Language;
+ OUString strCountry = aLocale.Country;
icu::Locale bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()),
(char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr()));
//2 get icu format pattern by locale
@@ -676,10 +676,10 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool bLongFormat)
XFTimeStyle* LwpTools::GetSystemTimeStyle()
{
/* ::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLocale();
- rtl::OUString strLang = aLocale.Language;
- rtl::OUString strCountry = aLocale.Country;
+ OUString strLang = aLocale.Language;
+ OUString strCountry = aLocale.Country;
strLang = strLang + A2OUSTR("_");
- rtl::OUString strLocale = strLang + strCountry;
+ OUString strLocale = strLang + strCountry;
int32_t nLength = 0;
int32_t nLengthNeed;
@@ -701,8 +701,8 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
/* FIXME-BCP47: handle language tags! */
//1 get locale for system
::com::sun::star::lang::Locale aLocale=Application::GetSettings().GetLanguageTag().getLocale();
- rtl::OUString strLang = aLocale.Language;
- rtl::OUString strCountry = aLocale.Country;
+ OUString strLang = aLocale.Language;
+ OUString strCountry = aLocale.Country;
icu::Locale bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()),
(char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr()));
diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx
index 1ecc9cd6643e..2ed2f41f8d11 100644
--- a/lotuswordpro/source/filter/lwptools.hxx
+++ b/lotuswordpro/source/filter/lwptools.hxx
@@ -106,7 +106,7 @@ public:
static sal_Bool isFileUrl(const OString& fileName);
static OUString convertToFileUrl(const OString& fileName);
- static rtl::OUString DateTimeToOUString(LtTm& dt);
+ static OUString DateTimeToOUString(LtTm& dt);
static XFDateStyle* GetSystemDateStyle(sal_Bool bLongFormat);
static XFTimeStyle* GetSystemTimeStyle();
diff --git a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx b/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
index 60a71e2126d9..30265d9a0dee 100644
--- a/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfattrlist.hxx
@@ -75,7 +75,7 @@ public:
/**
* @descr: Add a attribute to the attribute list.
*/
- virtual void AddAttribute(const rtl::OUString& name, const rtl::OUString& value) = 0;
+ virtual void AddAttribute(const OUString& name, const OUString& value) = 0;
/**
* @descr: Clear all the attributes in the attribute list.
diff --git a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx
index 500ca86553c1..27715d416ba9 100644
--- a/lotuswordpro/source/filter/xfilter/ixfcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfcontent.hxx
@@ -79,12 +79,12 @@ public:
* @descr Set style to apply. You can get the style name by use XFStyleManager::AddStyle(pStyle),
* or just set a fixed style name.
*/
- virtual void SetStyleName(rtl::OUString style) = 0;
+ virtual void SetStyleName(OUString style) = 0;
/**
* @descr return the style name.
*/
- virtual rtl::OUString GetStyleName() = 0;
+ virtual OUString GetStyleName() = 0;
/**
* @descr Deep copy.
diff --git a/lotuswordpro/source/filter/xfilter/ixfstream.hxx b/lotuswordpro/source/filter/xfilter/ixfstream.hxx
index 9a120f82bf39..d400b98326c6 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfstream.hxx
@@ -87,19 +87,19 @@ public:
* @descr Wrap XDocumentHandler::startElement()
* @param oustr element tag name.
*/
- virtual void StartElement(const rtl::OUString& oustr) = 0;
+ virtual void StartElement(const OUString& oustr) = 0;
/**
* @descr Wrap XDocumentHandler::endElement()
* @param oustr element tag name.
*/
- virtual void EndElement(const rtl::OUString& oustr) = 0;
+ virtual void EndElement(const OUString& oustr) = 0;
/**
* @descr output text node.
* @param oustr text content.
*/
- virtual void Characters(const rtl::OUString& oustr) = 0;
+ virtual void Characters(const OUString& oustr) = 0;
/**
* @descr return the Attribute list interface.
diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
index 94596056b988..5309a2866e4b 100644
--- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx
@@ -72,21 +72,21 @@ public:
/**
* @descr: return the style name.
*/
- virtual rtl::OUString GetStyleName() = 0;
+ virtual OUString GetStyleName() = 0;
/**
* @descr: set the name of the style.
*/
- virtual void SetStyleName(const rtl::OUString& styleName) = 0;
+ virtual void SetStyleName(const OUString& styleName) = 0;
/**
* @descr return the parent style name.
*/
- virtual rtl::OUString GetParentStyleName() = 0;
+ virtual OUString GetParentStyleName() = 0;
/**
* @descr: Parant paragraph style.
*/
- virtual void SetParentStyleName(const rtl::OUString& parent) = 0;
+ virtual void SetParentStyleName(const OUString& parent) = 0;
/**
* @descr: return the style family. You can reference to enumXFStyle.
*/
diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
index abeac7369e70..5c88f41be6cb 100644
--- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx
@@ -67,23 +67,23 @@
class XFAnnotation : public XFContentContainer
{
public:
- void SetDate(rtl::OUString date);
+ void SetDate(OUString date);
- void SetAuthor(rtl::OUString author);
+ void SetAuthor(OUString author);
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strDate;
- rtl::OUString m_strAuthor;
+ OUString m_strDate;
+ OUString m_strAuthor;
};
-inline void XFAnnotation::SetDate(rtl::OUString date)
+inline void XFAnnotation::SetDate(OUString date)
{
m_strDate = date;
}
-inline void XFAnnotation::SetAuthor(rtl::OUString author)
+inline void XFAnnotation::SetAuthor(OUString author)
{
m_strAuthor = author;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
index 5f413b7423c5..186d89c5313d 100644
--- a/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx
@@ -68,37 +68,37 @@ public:
XFArrowStyle();
public:
- void SetArrowName(rtl::OUString name);
+ void SetArrowName(OUString name);
- void SetViewbox(rtl::OUString viewBox);
+ void SetViewbox(OUString viewBox);
- void SetSVGPath(rtl::OUString path);
+ void SetSVGPath(OUString path);
virtual enumXFStyle GetStyleFamily();
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strName;
- rtl::OUString m_strViewBox;
- rtl::OUString m_strPath;
+ OUString m_strName;
+ OUString m_strViewBox;
+ OUString m_strPath;
};
inline XFArrowStyle::XFArrowStyle()
{
}
-inline void XFArrowStyle::SetArrowName(rtl::OUString name)
+inline void XFArrowStyle::SetArrowName(OUString name)
{
m_strName = name;
}
-inline void XFArrowStyle::SetViewbox(rtl::OUString viewBox)
+inline void XFArrowStyle::SetViewbox(OUString viewBox)
{
m_strViewBox = viewBox;
}
-inline void XFArrowStyle::SetSVGPath(rtl::OUString path)
+inline void XFArrowStyle::SetSVGPath(OUString path)
{
m_strPath = path;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
index 5ce056d483e8..ca400eda93e4 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx
@@ -93,7 +93,7 @@ inline void Encode_(sal_uInt8 *src, sal_Char* dest)
/**
* @descr Base64 encode.
*/
-rtl::OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len)
+OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len)
{
sal_Char *buffer;
sal_Int32 nNeeded;
@@ -126,7 +126,7 @@ rtl::OUString XFBase64::Encode(sal_uInt8 *buf, sal_Int32 len)
Encode_(last,buffer+nNeeded+1-5);
}
- rtl::OUString str = rtl::OUString::createFromAscii(buffer);
+ OUString str = OUString::createFromAscii(buffer);
delete[] buffer;
return str;
diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
index 0e019b13deb0..68a2233deb7e 100644
--- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx
@@ -75,7 +75,7 @@ public:
/**
* @descr Encode binary buffer to base64 encoding.
*/
- static rtl::OUString Encode(sal_uInt8 *buf, sal_Int32 len);
+ static OUString Encode(sal_uInt8 *buf, sal_Int32 len);
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index fb14177b2063..308dbea736ad 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -96,7 +96,7 @@ void XFBGImage::ToXml(IXFStream *pStrm)
if( m_bPosition )
{
- rtl::OUString str = GetAlignName(m_eVertAlign) + A2OUSTR(" ");
+ OUString str = GetAlignName(m_eVertAlign) + A2OUSTR(" ");
if( m_eHoriAlign == enumXFAlignStart )
str += A2OUSTR("left");
else if( m_eHoriAlign == enumXFAlignCenter )
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
index a107ea060e42..2d5dbea093d8 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
@@ -75,7 +75,7 @@ public:
/**
* @descr Use file link as image source.
*/
- void SetFileLink(rtl::OUString fileName);
+ void SetFileLink(OUString fileName);
/**
* @descr Use base64 stream as image source.
@@ -108,8 +108,8 @@ public:
friend bool operator==(XFBGImage& img1, XFBGImage& img2);
friend bool operator!=(XFBGImage& img1, XFBGImage& img2);
private:
- rtl::OUString m_strFileName;
- rtl::OUString m_strData;
+ OUString m_strFileName;
+ OUString m_strData;
sal_Bool m_bUserFileLink;
sal_Bool m_bRepeate;
sal_Bool m_bStretch;
@@ -118,7 +118,7 @@ private:
enumXFAlignType m_eVertAlign;
};
-inline void XFBGImage::SetFileLink(rtl::OUString fileName)
+inline void XFBGImage::SetFileLink(OUString fileName)
{
m_strFileName = fileName;
m_bUserFileLink = sal_True;
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
index 1e90ad243daa..9a212e19add6 100644
--- a/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbookmark.hxx
@@ -74,15 +74,15 @@ public:
m_bStart = isStart;
}
- rtl::OUString GetDivision(){return m_strDivision;}
- void SetDivision(rtl::OUString sDivName){m_strDivision = sDivName;}
- rtl::OUString GetName(){return m_strName;}
+ OUString GetDivision(){return m_strDivision;}
+ void SetDivision(OUString sDivName){m_strDivision = sDivName;}
+ OUString GetName(){return m_strName;}
public:
/**
* @descr Set bookmark name, which will be used in bookmark-ref or formula.
*/
- void SetName(rtl::OUString name)
+ void SetName(OUString name)
{
m_strName = name;
}
@@ -107,8 +107,8 @@ public:
private:
sal_Bool m_bStart;
- rtl::OUString m_strName;
- rtl::OUString m_strDivision;
+ OUString m_strName;
+ OUString m_strDivision;
};
class XFBookmarkStart : public XFBookmark
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 9a99b5b33319..89a3fcb07836 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -113,9 +113,9 @@ void XFBorder::SetWidthOutter(double outer)
m_fWidthOutter = outer;
}
-rtl::OUString XFBorder::GetLineWidth()
+OUString XFBorder::GetLineWidth()
{
- rtl::OUString str;
+ OUString str;
if( m_bDouble )
{
@@ -126,9 +126,9 @@ rtl::OUString XFBorder::GetLineWidth()
return str;
}
-rtl::OUString XFBorder::ToString()
+OUString XFBorder::ToString()
{
- rtl::OUString str;
+ OUString str;
if( m_bDouble )
{
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx
index 57aba73ed174..67c5be707734 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx
@@ -107,9 +107,9 @@ private:
/**
* @descr Forst line width to OOo border width format.
*/
- rtl::OUString GetLineWidth();
+ OUString GetLineWidth();
- rtl::OUString ToString();
+ OUString ToString();
friend bool operator==(XFBorder& b1, XFBorder& b2);
friend bool operator!=(XFBorder& b1, XFBorder& b2);
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 49f25956fa9b..25dd1609d99c 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -166,13 +166,13 @@ void XFCell::SetValue(double value)
SetValue(DoubleToOUString(value,18));
}
-void XFCell::SetValue(rtl::OUString value)
+void XFCell::SetValue(OUString value)
{
m_eValueType = enumXFValueTypeFloat;
m_strValue = value;
}
-rtl::OUString XFCell::GetCellName()
+OUString XFCell::GetCellName()
{
XFRow *pRow = m_pOwnerRow;
@@ -184,7 +184,7 @@ rtl::OUString XFCell::GetCellName()
if( !pTable )
return A2OUSTR("");
- rtl::OUString name;
+ OUString name;
if( pTable->IsSubTable() )
{
name = pTable->GetTableName() + A2OUSTR(".") + Int32ToOUString(m_nCol) + A2OUSTR(".") + Int32ToOUString(pRow->GetRow());
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index b293f76a0841..9ecddf5f6924 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -108,12 +108,12 @@ public:
/**
* @descr Set cell number value.
*/
- void SetValue(rtl::OUString value);
+ void SetValue(OUString value);
/**
* @descr Set cell formula.
*/
- void SetFormula(rtl::OUString formula);
+ void SetFormula(OUString formula);
/**
* @descr Set cell protected.
@@ -133,7 +133,7 @@ public:
/**
* @descr Return cell name. It's a tool function for formula.
*/
- rtl::OUString GetCellName();
+ OUString GetCellName();
/**
* @descr Return cell column id.
@@ -167,9 +167,9 @@ private:
sal_Int32 m_nColSpaned;
sal_Int32 m_nRepeated;
enumXFValueType m_eValueType;
- rtl::OUString m_strValue;
- rtl::OUString m_strDisplay;
- rtl::OUString m_strFormula;
+ OUString m_strValue;
+ OUString m_strDisplay;
+ OUString m_strFormula;
sal_Bool m_bProtect;
};
@@ -183,7 +183,7 @@ inline void XFCell::SetRepeated(sal_Int32 repeated)
m_nRepeated = repeated;
}
-inline void XFCell::SetFormula(rtl::OUString formula)
+inline void XFCell::SetFormula(OUString formula)
{
m_strFormula = formula;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index ab0fe328bece..268a7c784365 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -202,7 +202,7 @@ sal_Bool XFCellStyle::Equal(IXFStyle *pStyle)
void XFCellStyle::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
pAttrList->Clear();
if( !style.isEmpty() )
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index 5b096427d45d..12799354f339 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -86,7 +86,7 @@ public:
/**
* @descr Set cell data format style name.
*/
- void SetDataStyle(rtl::OUString style);
+ void SetDataStyle(OUString style);
/**
* @descr: Set the pading of the paragraph.This is the distance
@@ -132,8 +132,8 @@ public:
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strDataStyle;
- rtl::OUString m_strParentStyleName;
+ OUString m_strDataStyle;
+ OUString m_strParentStyleName;
enumXFAlignType m_eHoriAlign;
enumXFAlignType m_eVertAlign;
@@ -154,7 +154,7 @@ inline void XFCellStyle::SetAlignType(enumXFAlignType hori, enumXFAlignType vert
m_eVertAlign = vert;
}
-inline void XFCellStyle::SetDataStyle(rtl::OUString style)
+inline void XFCellStyle::SetDataStyle(OUString style)
{
m_strDataStyle = style;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/source/filter/xfilter/xfchange.hxx
index b3b607d1fe40..4786399322cd 100644
--- a/lotuswordpro/source/filter/xfilter/xfchange.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfchange.hxx
@@ -84,12 +84,12 @@ public:
XFChangeRegion(){}
~XFChangeRegion(){}
virtual void ToXml(IXFStream *pStrm);
- void SetChangeID(rtl::OUString sID){m_sID=sID;}
- rtl::OUString GetChangeID(){return m_sID;}
- void SetEditor(rtl::OUString sEditor){m_sEditor=sEditor;}
+ void SetChangeID(OUString sID){m_sID=sID;}
+ OUString GetChangeID(){return m_sID;}
+ void SetEditor(OUString sEditor){m_sEditor=sEditor;}
protected:
- rtl::OUString m_sID;
- rtl::OUString m_sEditor;
+ OUString m_sID;
+ OUString m_sEditor;
};
class XFChangeInsert : public XFChangeRegion
@@ -114,10 +114,10 @@ public:
XFChange(){}
~XFChange(){}
void ToXml(IXFStream *pStrm);
- void SetChangeID(rtl::OUString sID){m_sID=sID;}
- rtl::OUString GetChangeID(){return m_sID;}
+ void SetChangeID(OUString sID){m_sID=sID;}
+ OUString GetChangeID(){return m_sID;}
private:
- rtl::OUString m_sID;
+ OUString m_sID;
};
class XFChangeStart : public XFContent
@@ -126,10 +126,10 @@ public:
XFChangeStart(){}
~XFChangeStart(){}
void ToXml(IXFStream *pStrm);
- void SetChangeID(rtl::OUString sID){m_sID=sID;}
- rtl::OUString GetChangeID(){return m_sID;}
+ void SetChangeID(OUString sID){m_sID=sID;}
+ OUString GetChangeID(){return m_sID;}
private:
- rtl::OUString m_sID;
+ OUString m_sID;
};
class XFChangeEnd : public XFContent
@@ -138,10 +138,10 @@ public:
XFChangeEnd(){}
~XFChangeEnd(){}
void ToXml(IXFStream *pStrm);
- void SetChangeID(rtl::OUString sID){m_sID=sID;}
- rtl::OUString GetChangeID(){return m_sID;}
+ void SetChangeID(OUString sID){m_sID=sID;}
+ OUString GetChangeID(){return m_sID;}
private:
- rtl::OUString m_sID;
+ OUString m_sID;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.cxx b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
index 09d505865dd8..ede680821d7e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
@@ -61,7 +61,7 @@
#include <stdio.h>
#include "xfcolor.hxx"
-rtl::OUString XFColor::ToString() const
+OUString XFColor::ToString() const
{
char buf[8];
@@ -72,7 +72,7 @@ rtl::OUString XFColor::ToString() const
if( buf[i] == ' ' )
buf[i] = '0';
}
- return rtl::OUString::createFromAscii(buf);
+ return OUString::createFromAscii(buf);
}
bool operator==(XFColor& c1, XFColor& c2)
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
index 1d503224c9bf..e169e70f4e8a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
@@ -113,7 +113,7 @@ public:
*/
sal_Bool IsValid() const{ return m_bValid;}
- rtl::OUString ToString ()const;
+ OUString ToString ()const;
friend bool operator==(XFColor& c1, XFColor& c2);
friend bool operator!=(XFColor& c1, XFColor& c2);
diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx
index af89aff656fb..fc7b9ba5b008 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx
@@ -78,19 +78,19 @@ public:
/**
* @short: All content except XFTextContent can have a style.
*/
- virtual void SetStyleName(rtl::OUString style){m_strStyleName = style;}
+ virtual void SetStyleName(OUString style){m_strStyleName = style;}
/**
* @short: return the style name.
*/
- virtual rtl::OUString GetStyleName(){return m_strStyleName;}
+ virtual OUString GetStyleName(){return m_strStyleName;}
/**
*/
virtual IXFContent* Clone(){return NULL;}
protected:
- rtl::OUString m_strStyleName;
+ OUString m_strStyleName;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
index 7453fe3d7ac9..1403c12d627f 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
@@ -121,7 +121,7 @@ void XFContentContainer::RemoveAt(sal_uInt32 nPos)
{
m_aContents.erase(m_aContents.begin()+nPos);
}
-void XFContentContainer::Add(const rtl::OUString& text)
+void XFContentContainer::Add(const OUString& text)
{
XFTextContent *pTC = new XFTextContent();
pTC->SetText(text);
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
index b2eefac5b8d6..3097de2347c9 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
@@ -95,7 +95,7 @@ public:
/**
* @descr convience function for add text content.
*/
- virtual void Add(const rtl::OUString& text);
+ virtual void Add(const OUString& text);
/**
* @descr return the number of contents in the container.
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
index d53b99c67b55..9df7507dd001 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.hxx
@@ -72,7 +72,7 @@ public:
XFCrossRefStart();
~XFCrossRefStart();
void SetRefType(sal_uInt8 nType);
- void SetMarkName(rtl::OUString sName);
+ void SetMarkName(OUString sName);
void ToXml(IXFStream *pStrm);
private:
enum{
@@ -82,7 +82,7 @@ private:
CROSSREF_PARANUMBER = 3
};
sal_uInt8 m_nType;
- rtl::OUString m_strMarkName;
+ OUString m_strMarkName;
};
inline void XFCrossRefStart::SetRefType(sal_uInt8 nType)
@@ -90,7 +90,7 @@ inline void XFCrossRefStart::SetRefType(sal_uInt8 nType)
m_nType = nType;
}
-inline void XFCrossRefStart::SetMarkName(rtl::OUString sName)
+inline void XFCrossRefStart::SetMarkName(OUString sName)
{
m_strMarkName = sName;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx
index 924e92c81c48..513855132f1a 100644
--- a/lotuswordpro/source/filter/xfilter/xfdate.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx
@@ -76,9 +76,9 @@ public:
public:
void SetDate(XFDateTime& dt);
- void SetDate(const rtl::OUString& date);
+ void SetDate(const OUString& date);
- void SetText(rtl::OUString& text);
+ void SetText(OUString& text);
void SetFixed(sal_Bool fixed = sal_True);
@@ -86,9 +86,9 @@ public:
private:
sal_Bool m_bFixed;
- rtl::OUString m_strText;
+ OUString m_strText;
XFDateTime m_aDateTime;
- rtl::OUString m_strDate;
+ OUString m_strDate;
sal_Bool m_bValued;
};
@@ -99,13 +99,13 @@ inline void XFDate::SetDate(XFDateTime& dt)
m_bValued = sal_True;
}
-inline void XFDate::SetDate(const rtl::OUString& date)
+inline void XFDate::SetDate(const OUString& date)
{
m_strDate = date;
m_bValued = sal_True;
}
-inline void XFDate::SetText(rtl::OUString& text)
+inline void XFDate::SetText(OUString& text)
{
m_strText = text;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
index 352ede62fc22..026c129f5f48 100644
--- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx
@@ -91,9 +91,9 @@ public:
void SetFixed(sal_Bool fixed);
- void SetLanguage(rtl::OUString lang);
+ void SetLanguage(OUString lang);
- void SetCountry(rtl::OUString country);
+ void SetCountry(OUString country);
void SetAutoOrder(sal_Bool bAutoOrder);
@@ -119,7 +119,7 @@ public:
void AddAmPm(sal_Bool bAmPm);
- void AddText( rtl::OUString part );
+ void AddText( OUString part );
virtual enumXFStyle GetStyleFamily();
@@ -128,8 +128,8 @@ public:
private:
sal_Bool m_bFixed;
sal_Bool m_bAutoOrder;
- rtl::OUString m_strLanguage;
- rtl::OUString m_strCountry;
+ OUString m_strLanguage;
+ OUString m_strCountry;
XFStyleContainer m_aParts;
};
@@ -143,12 +143,12 @@ inline void XFDateStyle::SetFixed(sal_Bool fixed)
m_bFixed = fixed;
}
-inline void XFDateStyle::SetLanguage(rtl::OUString lang)
+inline void XFDateStyle::SetLanguage(OUString lang)
{
m_strLanguage = lang;
}
-inline void XFDateStyle::SetCountry(rtl::OUString country)
+inline void XFDateStyle::SetCountry(OUString country)
{
m_strCountry = country;
}
@@ -214,7 +214,7 @@ inline void XFDateStyle::AddQuarter(sal_Bool bLongFmt)
m_aParts.AddStyle(part);
}
-inline void XFDateStyle::AddText( rtl::OUString text )
+inline void XFDateStyle::AddText( OUString text )
{
XFDatePart *part = new XFDatePart();
part->SetPartType(enumXFDateText);
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
index f62fb8688119..9120aaba4079 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.cxx
@@ -59,7 +59,7 @@
************************************************************************/
#include "xfdocfield.hxx"
-void XFFileName::SetType(rtl::OUString sType)
+void XFFileName::SetType(OUString sType)
{
m_strType = sType;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
index bf41b369c607..f98bb2ef0604 100644
--- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx
@@ -66,10 +66,10 @@
class XFFileName : public XFContent
{
public:
- void SetType(rtl::OUString sType);
+ void SetType(OUString sType);
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strType;
+ OUString m_strType;
};
class XFWordCount : public XFContent
{
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
index b7abdf13040c..1cfa356a5157 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx
@@ -102,7 +102,7 @@ void XFDrawLine::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("svg:y2"), DoubleToOUString(m_aPoint2.GetY()) + A2OUSTR("cm") );
//transform
- rtl::OUString strTransform;
+ OUString strTransform;
if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE )
strTransform = A2OUSTR("rotate (") + DoubleToOUString(m_fRotate) + A2OUSTR(") ");
if( m_nFlag&XFDRAWOBJECT_FLAG_TRANLATE )
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
index 5ee61396a983..c2bec7330cd7 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx
@@ -114,7 +114,7 @@ void XFDrawObject::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("svg:height"), DoubleToOUString(m_aRect.GetHeight()) + A2OUSTR("cm") );
//transform
- rtl::OUString strTransform;
+ OUString strTransform;
if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE )
strTransform = A2OUSTR("rotate (") + DoubleToOUString(m_fRotate) + A2OUSTR(") ");
if( m_nFlag&XFDRAWOBJECT_FLAG_TRANLATE )
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
index 5bdd5973214c..45eb38170b9f 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx
@@ -86,7 +86,7 @@ public:
/**
* @descr Set style name for drawing text.
*/
- void SetTextStyleName(rtl::OUString style);
+ void SetTextStyleName(OUString style);
/**
* @descr Set drawing obejct rotate.
@@ -114,7 +114,7 @@ public:
protected:
XFContentContainer m_aContents;
- rtl::OUString m_strTextStyle;
+ OUString m_strTextStyle;
double m_fRotate;
XFPoint m_aRotatePoint;
double m_fScaleX;
@@ -125,7 +125,7 @@ protected:
unsigned int m_nFlag;
};
-inline void XFDrawObject::SetTextStyleName(rtl::OUString style)
+inline void XFDrawObject::SetTextStyleName(OUString style)
{
m_strTextStyle = style;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index d0cc8b8a68e2..a77bd24034e0 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -63,10 +63,10 @@ XFSvgPathEntry::XFSvgPathEntry()
{
}
-rtl::OUString XFSvgPathEntry::ToString()
+OUString XFSvgPathEntry::ToString()
{
assert(!m_strCommand.isEmpty());
- rtl::OUString str = m_strCommand;
+ OUString str = m_strCommand;
std::vector<XFPoint>::iterator it;
for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it )
@@ -140,13 +140,13 @@ void XFDrawPath::ToXml(IXFStream *pStrm)
//view-box:
XFRect rect = m_aRect;
- rtl::OUString strViewBox = A2OUSTR("0 0 ");
+ OUString strViewBox = A2OUSTR("0 0 ");
strViewBox += DoubleToOUString(rect.GetWidth()*1000) + A2OUSTR(" ");
strViewBox += DoubleToOUString(rect.GetHeight()*1000);
pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), strViewBox);
//points
- rtl::OUString strPath;
+ OUString strPath;
std::vector<XFSvgPathEntry>::iterator it;
for( it = m_aPaths.begin(); it != m_aPaths.end(); ++it )
{
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index d27f989fc8c9..5124512b534d 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -76,18 +76,18 @@ public:
/**
* @descr Set svg path command,L for line,M for move,...
*/
- void SetCommand(rtl::OUString cmd);
+ void SetCommand(OUString cmd);
/**
* @descr Set svg path point.
*/
void AddPoint(XFPoint pt);
- rtl::OUString ToString();
+ OUString ToString();
friend class XFDrawPath;
private:
- rtl::OUString m_strCommand;
+ OUString m_strCommand;
std::vector<XFPoint> m_aPoints;
};
@@ -127,7 +127,7 @@ private:
std::vector<XFSvgPathEntry> m_aPaths;
};
-inline void XFSvgPathEntry::SetCommand(rtl::OUString cmd)
+inline void XFSvgPathEntry::SetCommand(OUString cmd)
{
m_strCommand = cmd;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
index 809524c93ac3..b59a84cdadb1 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
@@ -71,13 +71,13 @@ void XFDrawPolygon::ToXml(IXFStream *pStrm)
pAttrList->Clear();
//view-box:
XFRect rect = CalcViewBox();
- rtl::OUString strViewBox = A2OUSTR("0 0 ");
+ OUString strViewBox = A2OUSTR("0 0 ");
strViewBox += DoubleToOUString(rect.GetWidth()*1000) + A2OUSTR(" ");
strViewBox += DoubleToOUString(rect.GetHeight()*1000);
pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), strViewBox);
//points
- rtl::OUString strPoints;
+ OUString strPoints;
for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it )
{
XFPoint pt = *it;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
index 0e178534955a..00a14896c88b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
@@ -71,13 +71,13 @@ void XFDrawPolyline::ToXml(IXFStream *pStrm)
pAttrList->Clear();
//view-box:
XFRect rect = CalcViewBox();
- rtl::OUString strViewBox = A2OUSTR("0 0 ");
+ OUString strViewBox = A2OUSTR("0 0 ");
strViewBox += DoubleToOUString(rect.GetWidth()*1000) + A2OUSTR(" ");
strViewBox += DoubleToOUString(rect.GetHeight()*1000);
pAttrList->AddAttribute( A2OUSTR("svg:viewBox"), strViewBox);
//points
- rtl::OUString strPoints;
+ OUString strPoints;
for( it = m_aPoints.begin(); it != m_aPoints.end(); ++it )
{
XFPoint pt = *it;
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index 78e3bf7932cb..49ee8bd99b57 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -267,7 +267,7 @@ void XFDrawStyle::ToXml(IXFStream *pStrm)
if (m_pFontWorkStyle)
{
// style
- rtl::OUString aStr = A2OUSTR("");
+ OUString aStr = A2OUSTR("");
switch (m_pFontWorkStyle->GetStyleType())
{
default: // fall through!
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index 6be52102006b..4f16e41ba3dc 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -111,12 +111,12 @@ public:
/**
* @descr Set drawing object arrow start style,only lines can have arrows.
*/
- void SetArrowStart(rtl::OUString start, double size=0.3, sal_Bool center = sal_False);
+ void SetArrowStart(OUString start, double size=0.3, sal_Bool center = sal_False);
/**
* @descr Set drawing obejct arrow end style,only lines can have arrows.
*/
- void SetArrowEnd(rtl::OUString end, double size=0.3, sal_Bool center = sal_False);
+ void SetArrowEnd(OUString end, double size=0.3, sal_Bool center = sal_False);
void SetFontWorkStyle(sal_Int8 nForm, enumXFFWStyle eStyle, enumXFFWAdjust eAdjust);
@@ -130,8 +130,8 @@ private:
sal_Int32 m_nWrapLines;
XFDrawLineStyle *m_pLineStyle;
XFDrawAreaStyle *m_pAreaStyle;
- rtl::OUString m_strArrowStart;
- rtl::OUString m_strArrowEnd;
+ OUString m_strArrowStart;
+ OUString m_strArrowEnd;
double m_fArrowStartSize;
double m_fArrowEndSize;
sal_Bool m_bArrowStartCenter;
@@ -145,7 +145,7 @@ inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs)
}
-inline void XFDrawStyle::SetArrowStart(rtl::OUString start, double size, sal_Bool center)
+inline void XFDrawStyle::SetArrowStart(OUString start, double size, sal_Bool center)
{
assert(size>0);
m_strArrowStart = start;
@@ -153,7 +153,7 @@ inline void XFDrawStyle::SetArrowStart(rtl::OUString start, double size, sal_Boo
m_bArrowStartCenter = center;
}
-inline void XFDrawStyle::SetArrowEnd(rtl::OUString end, double size, sal_Bool center)
+inline void XFDrawStyle::SetArrowEnd(OUString end, double size, sal_Bool center)
{
assert(size>0);
m_strArrowEnd = end;
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
index a2ad88943806..eb0597406b52 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
@@ -89,7 +89,7 @@ private:
sal_Int32 m_nCharCount;
sal_Int32 m_nLines;
double m_fDistance;
- rtl::OUString m_strStyleName;
+ OUString m_strStyleName;
};
inline void XFDropcap::SetCharCount(sal_Int32 count)
diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
index 1b5fcb70a22f..7cd9eb4a384b 100644
--- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx
@@ -79,8 +79,8 @@ public:
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strID;
- rtl::OUString m_strLabel;
+ OUString m_strID;
+ OUString m_strLabel;
XFContentContainer m_aContents;
};
@@ -95,7 +95,7 @@ inline void XFEndNote::SetLabel(sal_Unicode label)
chs[0] = label;
chs[1] = 0;
- m_strLabel = rtl::OUString(chs);
+ m_strLabel = OUString(chs);
}
inline void XFEndNote::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx
index c5f79a53d18a..4943eb78d7dd 100644
--- a/lotuswordpro/source/filter/xfilter/xfentry.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx
@@ -80,22 +80,22 @@ public:
/**
* @descr Set entry string value.
*/
- void SetStringValue(const rtl::OUString& value);
+ void SetStringValue(const OUString& value);
/**
* @descr Set display string.
*/
- void SetStringDisplay(const rtl::OUString& display);
+ void SetStringDisplay(const OUString& display);
/**
* @descr Set entry name.
*/
- void SetEntryName(const rtl::OUString& name);
+ void SetEntryName(const OUString& name);
/**
* @descr Set entry key. The keys is available only for enumXFEntryAlphabetical.
*/
- void SetKey(const rtl::OUString& key1, const rtl::OUString& key2=A2OUSTR(""));
+ void SetKey(const OUString& key1, const OUString& key2=A2OUSTR(""));
/**
* @descr Set whether it's a main entry. This is available only for enumXFEntryAlphabetical.
@@ -111,11 +111,11 @@ public:
private:
enumXFEntry m_eType;
- rtl::OUString m_strValue;
- rtl::OUString m_strDisplay;
- rtl::OUString m_strKey1;
- rtl::OUString m_strKey2;
- rtl::OUString m_strName;
+ OUString m_strValue;
+ OUString m_strDisplay;
+ OUString m_strKey1;
+ OUString m_strKey2;
+ OUString m_strName;
sal_Bool m_bMainEntry;
sal_Int32 m_nOutlineLevel;
};
@@ -125,22 +125,22 @@ inline void XFEntry::SetEntryType(enumXFEntry type)
m_eType = type;
}
-inline void XFEntry::SetStringValue(const rtl::OUString& value)
+inline void XFEntry::SetStringValue(const OUString& value)
{
m_strValue = value;
}
-inline void XFEntry::SetStringDisplay(const rtl::OUString& display)
+inline void XFEntry::SetStringDisplay(const OUString& display)
{
m_strDisplay = display;
}
-inline void XFEntry::SetEntryName(const rtl::OUString& name)
+inline void XFEntry::SetEntryName(const OUString& name)
{
m_strName = name;
}
-inline void XFEntry::SetKey(const rtl::OUString& key1, const rtl::OUString& key2/* =A2OUSTR */)
+inline void XFEntry::SetKey(const OUString& key1, const OUString& key2/* =A2OUSTR */)
{
m_strKey1 = key1;
m_strKey2 = key2;
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index c7d1310c399d..7ea9f5872b2e 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -88,9 +88,9 @@ XFFont::XFFont()
}
/*
The Following variable are to be compared:
- rtl::OUString m_strFontName;
- rtl::OUString m_strFontNameAsia;
- rtl::OUString m_strFontNameComplex;
+ OUString m_strFontName;
+ OUString m_strFontNameAsia;
+ OUString m_strFontNameComplex;
sal_Int16 m_nFontSize;
sal_Int16 m_nFontSizeAsia;
sal_Int16 m_nFontSizeComplex;
@@ -261,19 +261,19 @@ void XFFont::ToXml(IXFStream *pStrm)
//font size:
if( (m_nFlag & XFFONT_FLAG_SIZE) && m_nFontSize != 0 )
{
- rtl::OUString strSize = Int32ToOUString(m_nFontSize);
+ OUString strSize = Int32ToOUString(m_nFontSize);
strSize += A2OUSTR("pt");
pAttrList->AddAttribute(A2OUSTR("fo:font-size"),strSize);
}
if( (m_nFlag & XFFONT_FLAG_SIZE_ASIA) && m_nFontSizeAsia )
{
- rtl::OUString strSize = Int32ToOUString(m_nFontSizeAsia);
+ OUString strSize = Int32ToOUString(m_nFontSizeAsia);
strSize += A2OUSTR("pt");
pAttrList->AddAttribute(A2OUSTR("style:font-size-asian"),strSize);
}
if( (m_nFlag & XFFONT_FLAG_SIZE_COMPLEX) && m_nFontSizeComplex )
{
- rtl::OUString strSize = Int32ToOUString(m_nFontSizeComplex);
+ OUString strSize = Int32ToOUString(m_nFontSizeComplex);
strSize += A2OUSTR("pt");
pAttrList->AddAttribute(A2OUSTR("style:font-size-complex"),strSize);
}
@@ -347,7 +347,7 @@ void XFFont::ToXml(IXFStream *pStrm)
if( (m_nFlag & XFFONT_FLAG_EMPHASIZE) && m_eEmphasize )
{
- rtl::OUString empha = GetEmphasizeName(m_eEmphasize);
+ OUString empha = GetEmphasizeName(m_eEmphasize);
empha += A2OUSTR(" ");
if( m_bEmphasizeTop )
empha += A2OUSTR("above");
@@ -375,7 +375,7 @@ void XFFont::ToXml(IXFStream *pStrm)
((m_nFlag & XFFONT_FLAG_POSITION) && m_nPosition != 0)
)
{
- rtl::OUString tmp;
+ OUString tmp;
tmp = Int32ToOUString(m_nPosition) + A2OUSTR("% ");
tmp += Int32ToOUString(m_nScale) + A2OUSTR("%");
pAttrList->AddAttribute(A2OUSTR("style:text-position"), tmp );
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx
index ce9711fc7d9f..73e319019eb0 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.hxx
@@ -120,17 +120,17 @@ public:
/**
* @descr Set font name.
*/
- void SetFontName(rtl::OUString name);
+ void SetFontName(OUString name);
/**
* @descr Set font name for asia locale.
*/
- void SetFontNameAsia(rtl::OUString name);
+ void SetFontNameAsia(OUString name);
/**
* @descr Set font name for BIDI locale.
*/
- void SetFontNameComplex(rtl::OUString name);
+ void SetFontNameComplex(OUString name);
/**
* @descr Set font size.
@@ -262,9 +262,9 @@ public:
friend bool operator!=(XFFont& f1, XFFont& f2);
friend class XFFontFactory;
private:
- rtl::OUString m_strFontName;
- rtl::OUString m_strFontNameAsia;
- rtl::OUString m_strFontNameComplex;
+ OUString m_strFontName;
+ OUString m_strFontNameAsia;
+ OUString m_strFontNameComplex;
sal_Int16 m_nFontSize;
sal_Int16 m_nFontSizeAsia;
sal_Int16 m_nFontSizeComplex;
@@ -298,7 +298,7 @@ private:
};
-inline void XFFont::SetFontName(rtl::OUString name)
+inline void XFFont::SetFontName(OUString name)
{
m_strFontName = name;
m_nFlag |= XFFONT_FLAG_NAME;
@@ -307,13 +307,13 @@ inline void XFFont::SetFontName(rtl::OUString name)
SetFontNameComplex(name);
}
-inline void XFFont::SetFontNameAsia(rtl::OUString name)
+inline void XFFont::SetFontNameAsia(OUString name)
{
m_strFontNameAsia = name;
m_nFlag |= XFFONT_FLAG_NAME_ASIA;
}
-inline void XFFont::SetFontNameComplex(rtl::OUString name)
+inline void XFFont::SetFontNameComplex(OUString name)
{
m_strFontNameComplex = name;
m_nFlag |= XFFONT_FLAG_NAME_COMPLEX;
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
index e4059dee45a8..1e615f1b1b9e 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
@@ -59,19 +59,19 @@
************************************************************************/
#include "xffontdecl.hxx"
-XFFontDecl::XFFontDecl(rtl::OUString name, rtl::OUString family, sal_Bool fixed)
+XFFontDecl::XFFontDecl(OUString name, OUString family, sal_Bool fixed)
{
m_strFontName = name;
m_strFontFamily = family;
m_bPitchFixed = fixed;
}
-rtl::OUString XFFontDecl::GetFontName()
+OUString XFFontDecl::GetFontName()
{
return m_strFontName;
}
-rtl::OUString XFFontDecl::GetFontFamily()
+OUString XFFontDecl::GetFontFamily()
{
return m_strFontFamily;
}
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
index f46b091980d5..80ebbda9a5df 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
@@ -71,24 +71,24 @@
class XFFontDecl
{
public:
- XFFontDecl(rtl::OUString name, rtl::OUString family, sal_Bool fixed = false);
+ XFFontDecl(OUString name, OUString family, sal_Bool fixed = false);
public:
/**
* @descr Get font name.
*/
- rtl::OUString GetFontName();
+ OUString GetFontName();
/**
* @descr Get font family.
*/
- rtl::OUString GetFontFamily();
+ OUString GetFontFamily();
sal_Bool GetFontPitchFixed();
private:
- rtl::OUString m_strFontName;
- rtl::OUString m_strFontFamily;
+ OUString m_strFontName;
+ OUString m_strFontFamily;
sal_Bool m_bPitchFixed;
};
diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
index 8185a2b6ac43..0435244c0985 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx
@@ -80,8 +80,8 @@ public:
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strID;
- rtl::OUString m_strLabel;
+ OUString m_strID;
+ OUString m_strLabel;
};
inline XFFootNote::XFFootNote()
@@ -95,7 +95,7 @@ inline void XFFootNote::SetLabel(sal_Unicode label)
chs[0] = label;
chs[1] = 0;
- m_strLabel = rtl::OUString(chs);
+ m_strLabel = OUString(chs);
}
inline void XFFootNote::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
index b3a92e27ab39..245e694174da 100644
--- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx
@@ -68,15 +68,15 @@ public:
XFFootnoteConfig();
public:
- void SetBodyStyle(rtl::OUString style);
+ void SetBodyStyle(OUString style);
- void SetCitationStyle(rtl::OUString style);
+ void SetCitationStyle(OUString style);
- void SetDefaultStyle(rtl::OUString style);
+ void SetDefaultStyle(OUString style);
- void SetMasterPage(rtl::OUString masterPage);
+ void SetMasterPage(OUString masterPage);
- void SetNumberFormat(rtl::OUString numberFormat);
+ void SetNumberFormat(OUString numberFormat);
void SetStartValue(sal_Int32 value=0);
@@ -86,26 +86,26 @@ public:
void SetInsertInPage(sal_Bool page=sal_True);
- void SetNumPrefix(rtl::OUString numprefix);
+ void SetNumPrefix(OUString numprefix);
- void SetNumSuffix(rtl::OUString numsuffix);
+ void SetNumSuffix(OUString numsuffix);
- void SetMessageOn(rtl::OUString message);
+ void SetMessageOn(OUString message);
- void SetMessageFrom(rtl::OUString message);
+ void SetMessageFrom(OUString message);
virtual void ToXml(IXFStream *pStrm);
protected:
- rtl::OUString m_strBodyStyle;
- rtl::OUString m_strCitationStyle;
- rtl::OUString m_strDefaultStyle;
- rtl::OUString m_strMasterPage;
- rtl::OUString m_strNumFmt;
- rtl::OUString m_strNumPrefix;
- rtl::OUString m_strNumSuffix;
- rtl::OUString m_strMessageFrom;
- rtl::OUString m_strMessageOn;
+ OUString m_strBodyStyle;
+ OUString m_strCitationStyle;
+ OUString m_strDefaultStyle;
+ OUString m_strMasterPage;
+ OUString m_strNumFmt;
+ OUString m_strNumPrefix;
+ OUString m_strNumSuffix;
+ OUString m_strMessageFrom;
+ OUString m_strMessageOn;
sal_Int32 m_nStartValue;
sal_Int32 m_nRestartType;
sal_Bool m_bInsertInPage;
@@ -125,27 +125,27 @@ inline XFFootnoteConfig::XFFootnoteConfig()
m_bIsFootnote = sal_True;
}
-inline void XFFootnoteConfig::SetBodyStyle(rtl::OUString style)
+inline void XFFootnoteConfig::SetBodyStyle(OUString style)
{
m_strBodyStyle = style;
}
-inline void XFFootnoteConfig::SetCitationStyle(rtl::OUString style)
+inline void XFFootnoteConfig::SetCitationStyle(OUString style)
{
m_strCitationStyle = style;
}
-inline void XFFootnoteConfig::SetDefaultStyle(rtl::OUString style)
+inline void XFFootnoteConfig::SetDefaultStyle(OUString style)
{
m_strDefaultStyle = style;
}
-inline void XFFootnoteConfig::SetMasterPage(rtl::OUString masterPage)
+inline void XFFootnoteConfig::SetMasterPage(OUString masterPage)
{
m_strMasterPage = masterPage;
}
-inline void XFFootnoteConfig::SetNumberFormat(rtl::OUString numberFormat)
+inline void XFFootnoteConfig::SetNumberFormat(OUString numberFormat)
{
m_strNumFmt = numberFormat;
}
@@ -172,22 +172,22 @@ inline void XFFootnoteConfig::SetInsertInPage(sal_Bool page)
m_bInsertInPage = page;
}
-inline void XFFootnoteConfig::SetNumPrefix(rtl::OUString numprefix)
+inline void XFFootnoteConfig::SetNumPrefix(OUString numprefix)
{
m_strNumPrefix = numprefix;
}
-inline void XFFootnoteConfig::SetNumSuffix(rtl::OUString numsuffix)
+inline void XFFootnoteConfig::SetNumSuffix(OUString numsuffix)
{
m_strNumSuffix = numsuffix;
}
-inline void XFFootnoteConfig::SetMessageOn(rtl::OUString message)
+inline void XFFootnoteConfig::SetMessageOn(OUString message)
{
m_strMessageOn = message;
}
-inline void XFFootnoteConfig::SetMessageFrom(rtl::OUString message)
+inline void XFFootnoteConfig::SetMessageFrom(OUString message)
{
m_strMessageFrom = message;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx
index ea55077d63b6..9670a1b6bce5 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx
@@ -105,7 +105,7 @@ public:
/**
* @descr Set frame name.
*/
- void SetName(rtl::OUString name);
+ void SetName(OUString name);
/**
* @descr Set z-index of the frame.
@@ -154,7 +154,7 @@ public:
/**
* @descr: Link the text content of the two frame.
*/
- void SetNextLink(rtl::OUString next);
+ void SetNextLink(OUString next);
/**
* @descr Get the frame type. image, drawing or text-box.
@@ -181,12 +181,12 @@ private:
protected:
enumXFAnchor m_eAnchor;
sal_Int32 m_nAnchorPage;
- rtl::OUString m_strName;
+ OUString m_strName;
sal_uInt32 m_nZIndex;
XFRect m_aRect;
double m_fMinHeight;
double m_fMaxHeight;
- rtl::OUString m_strNextLink;
+ OUString m_strNextLink;
enumXFFrameType m_eType;
sal_uInt32 m_nFlag;
sal_Bool m_isTextBox;
@@ -197,7 +197,7 @@ inline void XFFrame::SetAnchorType(enumXFAnchor anchor)
m_eAnchor = anchor;
}
-inline void XFFrame::SetName(rtl::OUString name)
+inline void XFFrame::SetName(OUString name)
{
m_strName = name;
}
@@ -250,7 +250,7 @@ inline void XFFrame::SetPosition(const XFRect& rect)
m_aRect = rect;
}
-inline void XFFrame::SetNextLink(rtl::OUString next)
+inline void XFFrame::SetNextLink(OUString next)
{
m_strNextLink = next;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
index 0ba7435dcc7d..b884e5cefa44 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
@@ -200,7 +200,7 @@ void XFFrameStyle::ToXml(IXFStream *pStrm)
//protect:
if( m_bProtectContent || m_bProtectSize || m_bProtectPos )
{
- rtl::OUString protect;
+ OUString protect;
if( m_bProtectContent )
protect += A2OUSTR("content");
if( m_bProtectSize )
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
index fe5c993b9c5f..e634e48985c6 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
@@ -75,39 +75,39 @@ int XFGlobal::s_nObjID = 1;
int XFGlobal::s_nImageID = 1;
-rtl::OUString XFGlobal::GenSectionName()
+OUString XFGlobal::GenSectionName()
{
//give it a initial name:
return A2OUSTR("sect") + Int32ToOUString(s_nSectionID++);
}
-rtl::OUString XFGlobal::GenFrameName()
+OUString XFGlobal::GenFrameName()
{
//give it a initial name:
return A2OUSTR("frame") + Int32ToOUString(s_nFrameID++);
}
-rtl::OUString XFGlobal::GenTableName()
+OUString XFGlobal::GenTableName()
{
return A2OUSTR("table") + Int32ToOUString(s_nFrameID++);
}
-rtl::OUString XFGlobal::GenNoteName()
+OUString XFGlobal::GenNoteName()
{
return A2OUSTR("ftn") + Int32ToOUString(s_nNoteID++);
}
-rtl::OUString XFGlobal::GenStrokeDashName()
+OUString XFGlobal::GenStrokeDashName()
{
return A2OUSTR("stroke dash ") + Int32ToOUString(s_nStrokeDashID++);
}
-rtl::OUString XFGlobal::GenAreaName()
+OUString XFGlobal::GenAreaName()
{
return A2OUSTR("draw area") + Int32ToOUString(s_nAreaID++);
}
-rtl::OUString XFGlobal::GenImageName()
+OUString XFGlobal::GenImageName()
{
return A2OUSTR("Graphic") + Int32ToOUString(s_nImageID++);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
index 496c77f9fb71..caa8b0a578f4 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
@@ -96,37 +96,37 @@ public:
/**
* @descr Generate a name for the section.
*/
- static rtl::OUString GenSectionName();
+ static OUString GenSectionName();
/**
* @descr Gen a name for the frame.
*/
- static rtl::OUString GenFrameName();
+ static OUString GenFrameName();
/**
* @descr Generate a name for a table.
*/
- static rtl::OUString GenTableName();
+ static OUString GenTableName();
/**
* @descr Generate a name for a note.
*/
- static rtl::OUString GenNoteName();
+ static OUString GenNoteName();
/**
* @descr Generate a name for the stroke style.
*/
- static rtl::OUString GenStrokeDashName();
+ static OUString GenStrokeDashName();
/**
* @descr Generate a name for the area fill style.
*/
- static rtl::OUString GenAreaName();
+ static OUString GenAreaName();
/**
* @descr Generate a name for an image object
*/
- static rtl::OUString GenImageName();
+ static OUString GenImageName();
/**
* @descr Reset all global variables.
diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
index 85c7b830053b..417af0239bd1 100644
--- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx
@@ -66,21 +66,21 @@ public:
XFHyperlink();
public:
- void SetHRef(rtl::OUString href);
+ void SetHRef(OUString href);
- void SetText(rtl::OUString text);
+ void SetText(OUString text);
- void SetName(rtl::OUString name);
+ void SetName(OUString name);
- void SetTargetFrame(rtl::OUString frame=A2OUSTR("_self"));
+ void SetTargetFrame(OUString frame=A2OUSTR("_self"));
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strHRef;
- rtl::OUString m_strName;
- rtl::OUString m_strFrame;
- rtl::OUString m_strText;
+ OUString m_strHRef;
+ OUString m_strName;
+ OUString m_strFrame;
+ OUString m_strText;
};
inline XFHyperlink::XFHyperlink()
@@ -88,22 +88,22 @@ inline XFHyperlink::XFHyperlink()
m_strFrame = A2OUSTR("_self");
}
-inline void XFHyperlink::SetHRef(rtl::OUString href)
+inline void XFHyperlink::SetHRef(OUString href)
{
m_strHRef = href;
}
-inline void XFHyperlink::SetName(rtl::OUString name)
+inline void XFHyperlink::SetName(OUString name)
{
m_strName = name;
}
-inline void XFHyperlink::SetTargetFrame(rtl::OUString frame)
+inline void XFHyperlink::SetTargetFrame(OUString frame)
{
m_strFrame = frame;
}
-inline void XFHyperlink::SetText(rtl::OUString text)
+inline void XFHyperlink::SetText(OUString text)
{
m_strText = text;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.cxx b/lotuswordpro/source/filter/xfilter/xfimage.cxx
index f23816d54a1f..0938bc12702f 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.cxx
@@ -66,7 +66,7 @@ XFImage::XFImage() : m_bUseLink(sal_False)
m_strName = XFGlobal::GenImageName();
}
-void XFImage::SetFileURL(rtl::OUString url)
+void XFImage::SetFileURL(OUString url)
{
m_strImageFile = url;
m_bUseLink = sal_True;
diff --git a/lotuswordpro/source/filter/xfilter/xfimage.hxx b/lotuswordpro/source/filter/xfilter/xfimage.hxx
index 31d150e32dff..faa0dcff77ad 100644
--- a/lotuswordpro/source/filter/xfilter/xfimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfimage.hxx
@@ -76,7 +76,7 @@ public:
/**
* @descr Use file link source.a
*/
- void SetFileURL(rtl::OUString url);
+ void SetFileURL(OUString url);
/**
* @descr Use base64 stream.
@@ -89,8 +89,8 @@ public:
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strImageFile;
- rtl::OUString m_strData;
+ OUString m_strImageFile;
+ OUString m_strData;
sal_Bool m_bUseLink;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
index f65e5d7b673f..3d30962f008a 100644
--- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx
@@ -164,7 +164,7 @@ void XFImageStyle::ToXml(IXFStream *pStrm)
//protect:
if( m_bProtectContent || m_bProtectSize || m_bProtectPos )
{
- rtl::OUString protect;
+ OUString protect;
if( m_bProtectContent )
protect += A2OUSTR("content");
if( m_bProtectSize )
@@ -190,7 +190,7 @@ void XFImageStyle::ToXml(IXFStream *pStrm)
//clip:
if( FABS(m_fClipLeft)>FLOAT_MIN || FABS(m_fClipRight)>FLOAT_MIN || FABS(m_fClipTop)>FLOAT_MIN || FABS(m_fClipBottom)>FLOAT_MIN )
{
- rtl::OUString clip = A2OUSTR("rect(");
+ OUString clip = A2OUSTR("rect(");
clip += DoubleToOUString(m_fClipTop) + A2OUSTR("cm ");
clip += DoubleToOUString(m_fClipRight) + A2OUSTR("cm ");
clip += DoubleToOUString(m_fClipBottom) + A2OUSTR("cm ");
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index c62289a4f555..bb6a972f6988 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -92,7 +92,7 @@ XFIndex::~XFIndex()
}
}
-void XFIndex::AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTemplate* templ)
+void XFIndex::AddTemplate(OUString level, OUString style, XFIndexTemplate* templ)
{
templ->SetLevel( level );
if(m_eType != enumXFIndexTOC) // TOC's styles are applied to template entries separately
@@ -112,7 +112,7 @@ void XFIndex::SetSeparator(sal_Bool sep)
m_bSeparator = sep;
}
-void XFIndex::AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName)
+void XFIndex::AddTocSource(sal_uInt16 nLevel, const OUString sStyleName)
{
if (nLevel > MAX_TOC_LEVEL)
{
@@ -126,9 +126,9 @@ void XFIndex::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- rtl::OUString strIndexName;
- rtl::OUString strTplName;
- rtl::OUString strSourceName;
+ OUString strIndexName;
+ OUString strTplName;
+ OUString strSourceName;
if(m_eType == enumXFIndexTOC )
{
@@ -221,7 +221,7 @@ void XFIndex::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( A2OUSTR("text:outline-level"), Int32ToOUString(i));
pStrm->StartElement( A2OUSTR("text:index-source-styles") );
- std::vector<rtl::OUString>::iterator it_str;
+ std::vector<OUString>::iterator it_str;
for (it_str = m_aTOCSource[i].begin(); it_str != m_aTOCSource[i].end(); ++it_str)
{
pAttrList->Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 94b08575305f..e5b7c1e4870e 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -85,25 +85,25 @@ public:
/**
* @descr Set template level.
*/
- void SetLevel(rtl::OUString level);
+ void SetLevel(OUString level);
/**
* @descr Set style.
*/
- void SetStyleName(rtl::OUString style);
+ void SetStyleName(OUString style);
/**
* @descr Add a entry in the template.
*/
- void AddEntry(enumXFIndexTemplate entry, rtl::OUString styleName = A2OUSTR(""));
+ void AddEntry(enumXFIndexTemplate entry, OUString styleName = A2OUSTR(""));
/**
* @descr Add a tab entry in the template.
*/
- void AddTabEntry(enumXFTab type, double len, sal_Unicode leader = '*', sal_Unicode delimiter='.', rtl::OUString styleName = A2OUSTR(""));
+ void AddTabEntry(enumXFTab type, double len, sal_Unicode leader = '*', sal_Unicode delimiter='.', OUString styleName = A2OUSTR(""));
/**
* @descr Add a entry in the template.
*/
- void AddTextEntry(rtl::OUString sSpan, rtl::OUString styleName = A2OUSTR(""));
+ void AddTextEntry(OUString sSpan, OUString styleName = A2OUSTR(""));
/**
* @descr clear all index template parts.
@@ -115,22 +115,22 @@ private:
/**
* @descr Helper function.
*/
- void SetTagName(rtl::OUString tag);
+ void SetTagName(OUString tag);
friend class XFIndex;
private:
- rtl::OUString m_nLevel;
- rtl::OUString m_strStyle;
+ OUString m_nLevel;
+ OUString m_strStyle;
enumXFTab m_eTabType;
double m_fTabLength;
- rtl::OUString m_strTabDelimiter;
- rtl::OUString m_strTabLeader;
- rtl::OUString m_strTagName;
- typedef std::pair<enumXFIndexTemplate, rtl::OUString> TOCTEMPLATE_ENTRY_TYPE;
+ OUString m_strTabDelimiter;
+ OUString m_strTabLeader;
+ OUString m_strTagName;
+ typedef std::pair<enumXFIndexTemplate, OUString> TOCTEMPLATE_ENTRY_TYPE;
std::vector<TOCTEMPLATE_ENTRY_TYPE> m_aEntries; // template entry + text style
- std::map<sal_uInt16, rtl::OUString> m_aTextEntries;
+ std::map<sal_uInt16, OUString> m_aTextEntries;
- rtl::OUString m_strChapterTextStyle;
+ OUString m_strChapterTextStyle;
};
/**
@@ -153,7 +153,7 @@ public:
/**
* @descr Add index templaet entry.
*/
- void AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTemplate* templ);
+ void AddTemplate(OUString level, OUString style, XFIndexTemplate* templ);
/**
* @descr Set if protected index to prevent handly-revise.
@@ -167,12 +167,12 @@ public:
virtual void ToXml(IXFStream *pStrm);
- void AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName);
+ void AddTocSource(sal_uInt16 nLevel, const OUString sStyleName);
private:
enumXFIndex m_eType;
- rtl::OUString m_strTitle;
- rtl::OUString m_strSectStyle;
+ OUString m_strTitle;
+ OUString m_strSectStyle;
bool m_bProtect;
bool m_bSeparator;
XFParagraph *m_pTitle;
@@ -180,7 +180,7 @@ private:
std::vector<XFIndexTemplate *> m_aTemplates; // template entry + style
#define MAX_TOC_LEVEL 10
- std::vector<rtl::OUString> m_aTOCSource[MAX_TOC_LEVEL+1];
+ std::vector<OUString> m_aTOCSource[MAX_TOC_LEVEL+1];
sal_uInt32 m_nMaxLevel;
};
@@ -190,37 +190,37 @@ inline XFIndexTemplate::XFIndexTemplate()
m_nLevel = Int32ToOUString(0);
}
-inline void XFIndexTemplate::SetLevel(rtl::OUString level)
+inline void XFIndexTemplate::SetLevel(OUString level)
{
m_nLevel = level;
}
-inline void XFIndexTemplate::SetStyleName(rtl::OUString style)
+inline void XFIndexTemplate::SetStyleName(OUString style)
{
m_strStyle = style;
}
-inline void XFIndexTemplate::SetTagName(rtl::OUString tag)
+inline void XFIndexTemplate::SetTagName(OUString tag)
{
m_strTagName = tag;
}
-inline void XFIndexTemplate::AddEntry(enumXFIndexTemplate entry, rtl::OUString styleName)
+inline void XFIndexTemplate::AddEntry(enumXFIndexTemplate entry, OUString styleName)
{
- std::pair<enumXFIndexTemplate, rtl::OUString> pair(entry, styleName);
+ std::pair<enumXFIndexTemplate, OUString> pair(entry, styleName);
m_aEntries.push_back(pair);
}
-inline void XFIndexTemplate::AddTabEntry(enumXFTab type, double len, sal_Unicode leader, sal_Unicode delimiter, rtl::OUString styleName)
+inline void XFIndexTemplate::AddTabEntry(enumXFTab type, double len, sal_Unicode leader, sal_Unicode delimiter, OUString styleName)
{
m_eTabType = type;
- m_strTabLeader = rtl::OUString( leader );
- m_strTabDelimiter = rtl::OUString( delimiter );
+ m_strTabLeader = OUString( leader );
+ m_strTabDelimiter = OUString( delimiter );
m_fTabLength = len;
AddEntry(enumXFIndexTemplateTab, styleName);
}
-inline void XFIndexTemplate::AddTextEntry(rtl::OUString sText, rtl::OUString styleName)
+inline void XFIndexTemplate::AddTextEntry(OUString sText, OUString styleName)
{
sal_uInt16 nLen = m_aEntries.size();
AddEntry(enumXFIndexTemplateSpan, styleName);
diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
index bc93fce89ee6..565d2c6a0025 100644
--- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
@@ -69,20 +69,20 @@
class XFInputList : public XFContent
{
public:
- void SetName(rtl::OUString sName);
- void SetLabels(std::vector<rtl::OUString> list);
+ void SetName(OUString sName);
+ void SetLabels(std::vector<OUString> list);
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strName;
- std::vector<rtl::OUString> m_list;
+ OUString m_strName;
+ std::vector<OUString> m_list;
};
-inline void XFInputList::SetName(rtl::OUString sName)
+inline void XFInputList::SetName(OUString sName)
{
m_strName = sName;
}
-inline void XFInputList::SetLabels(std::vector<rtl::OUString> list)
+inline void XFInputList::SetLabels(std::vector<OUString> list)
{
m_list=list;
}
diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
index 4d5f73bc2d05..cd514da8c673 100644
--- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx
@@ -74,11 +74,11 @@ public:
void SetNumberIncrement(sal_Int32 increment);
- void SetSeperator(sal_Int32 increment, rtl::OUString seperator);
+ void SetSeperator(sal_Int32 increment, OUString seperator);
- void SetNumberFormat(rtl::OUString numfmt = A2OUSTR("1"));
+ void SetNumberFormat(OUString numfmt = A2OUSTR("1"));
- void SetTextStyle(rtl::OUString style);
+ void SetTextStyle(OUString style);
void SetRestartOnPage(sal_Bool restart = sal_True);
@@ -93,9 +93,9 @@ private:
double m_fOffset;
sal_Int32 m_nIncrement;
sal_Int32 m_nSepIncrement;
- rtl::OUString m_strSeparator;
- rtl::OUString m_strNumFmt;
- rtl::OUString m_strTextStyle;
+ OUString m_strSeparator;
+ OUString m_strNumFmt;
+ OUString m_strTextStyle;
sal_Bool m_bRestartOnPage;
sal_Bool m_bCountEmptyLines;
sal_Bool m_bCountFrameLines;
@@ -127,18 +127,18 @@ inline void XFLineNumberConfig::SetNumberIncrement(sal_Int32 increment)
m_nIncrement = increment;
}
-inline void XFLineNumberConfig::SetSeperator(sal_Int32 increment, rtl::OUString seperator)
+inline void XFLineNumberConfig::SetSeperator(sal_Int32 increment, OUString seperator)
{
m_nSepIncrement = increment;
m_strSeparator = seperator;
}
-inline void XFLineNumberConfig::SetNumberFormat(rtl::OUString numfmt)
+inline void XFLineNumberConfig::SetNumberFormat(OUString numfmt)
{
m_strNumFmt = numfmt;
}
-inline void XFLineNumberConfig::SetTextStyle(rtl::OUString style)
+inline void XFLineNumberConfig::SetTextStyle(OUString style)
{
m_strTextStyle = style;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 37e3dca1ad2e..505403261968 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -121,7 +121,7 @@ void XFListLevelBullet::ToXml(IXFStream *pStrm)
//text:style-name,ignore now.
m_aNumFmt.ToXml(pStrm);
//bullet-char
- rtl::OUString bullet(m_chBullet);
+ OUString bullet(m_chBullet);
pAttrList->AddAttribute( A2OUSTR("text:bullet-char"), bullet );
pStrm->StartElement( A2OUSTR("text:list-level-style-bullet") );
@@ -274,9 +274,9 @@ void XFListStyle::SetListPosition(sal_Int32 level,
void XFListStyle::SetListBullet(sal_Int32 level,
UChar32 bullet,
- rtl::OUString fontname,
- rtl::OUString prefix,
- rtl::OUString suffix
+ OUString fontname,
+ OUString prefix,
+ OUString suffix
)
{
assert(level>=1&&level<=10);
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
index 655cce9bae09..a5395fe0237d 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
@@ -150,15 +150,15 @@ public:
{
m_chBullet = ch;
}
- void SetPrefix(rtl::OUString prefix)
+ void SetPrefix(OUString prefix)
{
m_aNumFmt.SetPrefix(prefix);
}
- void SetSuffix(rtl::OUString suffix)
+ void SetSuffix(OUString suffix)
{
m_aNumFmt.SetSuffix(suffix);
}
- void SetFontName(rtl::OUString name)
+ void SetFontName(OUString name)
{
m_strFontName = name;
}
@@ -167,7 +167,7 @@ public:
private:
XFNumFmt m_aNumFmt;
int32_t m_chBullet;
- rtl::OUString m_strFontName;
+ OUString m_strFontName;
};
//not complete.
@@ -178,7 +178,7 @@ public:
private:
sal_Int16 m_nWidth;
sal_Int16 m_nHeight;
- rtl::OUString m_strBinaryData;
+ OUString m_strBinaryData;
};
@@ -205,9 +205,9 @@ public:
void SetListBullet(sal_Int32 level,
UChar32 bullet_char,
- rtl::OUString fontname = A2OUSTR(""),
- rtl::OUString prefix = A2OUSTR(""),
- rtl::OUString suffix = A2OUSTR("")
+ OUString fontname = A2OUSTR(""),
+ OUString prefix = A2OUSTR(""),
+ OUString suffix = A2OUSTR("")
);
void SetListNumber( sal_Int32 level, XFNumFmt& numFmt, sal_Int16 nStartValue = 1 );
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index fa7304019181..19879326cbc9 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -97,7 +97,7 @@ enumXFStyle XFMasterPage::GetStyleFamily()
}
-void XFMasterPage::SetPageMaster(rtl::OUString pm)
+void XFMasterPage::SetPageMaster(OUString pm)
{
m_strPageMaster = pm;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index 1c5a9af12dac..f61b67cf0a56 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -73,7 +73,7 @@ public:
virtual ~XFMasterPage();
public:
- void SetPageMaster(rtl::OUString pm);
+ void SetPageMaster(OUString pm);
void SetHeader(XFHeader *pHeader);
@@ -84,7 +84,7 @@ public:
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strPageMaster;
+ OUString m_strPageMaster;
XFHeader *m_pHeader;
XFFooter *m_pFooter;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index 01da9c813ae6..924ab181b0f0 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -228,8 +228,8 @@ void XFNumberStyle::ToXml_Negative(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- rtl::OUString strStyleName = GetStyleName();
- rtl::OUString strGEStyle = strStyleName + A2OUSTR("PO");
+ OUString strStyleName = GetStyleName();
+ OUString strGEStyle = strStyleName + A2OUSTR("PO");
SetStyleName(strGEStyle);
ToXml_Normal(pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index cd29303e2fc3..1a2953c951b7 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -82,15 +82,15 @@ public:
void SetColor(const XFColor& color);
XFColor GetColor(){return m_aColor;}
- void SetPrefix(rtl::OUString prefix);
+ void SetPrefix(OUString prefix);
- void SetSurfix(rtl::OUString surfix);
+ void SetSurfix(OUString surfix);
- void SetNegativeStyle(rtl::OUString prefix, rtl::OUString suffix, const XFColor& color=XFColor(255,0,0));
+ void SetNegativeStyle(OUString prefix, OUString suffix, const XFColor& color=XFColor(255,0,0));
void SetNumberType(enumXFNumberType type);
- void SetCurrencySymbol(sal_Bool post, rtl::OUString symbol, sal_Bool bShowSpace=sal_False);
+ void SetCurrencySymbol(sal_Bool post, OUString symbol, sal_Bool bShowSpace=sal_False);
virtual enumXFStyle GetStyleFamily();
@@ -117,14 +117,14 @@ protected:
sal_Bool m_bGroup;
XFColor m_aColor;
sal_Bool m_bCurrencySymbolPost;
- rtl::OUString m_strCurrencySymbol;
- rtl::OUString m_strPrefix;
- rtl::OUString m_strSuffix;
+ OUString m_strCurrencySymbol;
+ OUString m_strPrefix;
+ OUString m_strSuffix;
sal_Bool m_bRedIfNegative;
XFColor m_aNegativeColor;
- rtl::OUString m_strNegativePrefix;
- rtl::OUString m_strNegativeSuffix;
+ OUString m_strNegativePrefix;
+ OUString m_strNegativeSuffix;
};
inline void XFNumberStyle::SetDecimalDigits(sal_Int32 decimal)
@@ -142,7 +142,7 @@ inline void XFNumberStyle::SetMinExponent(sal_Int32 exponent)
m_nMinExponent = exponent;
}
-inline void XFNumberStyle::SetNegativeStyle(rtl::OUString prefix, rtl::OUString suffix, const XFColor& color)
+inline void XFNumberStyle::SetNegativeStyle(OUString prefix, OUString suffix, const XFColor& color)
{
m_bRedIfNegative = sal_True;
m_aNegativeColor = color;
@@ -165,17 +165,17 @@ inline void XFNumberStyle::SetNumberType(enumXFNumberType type)
m_eType = type;
}
-inline void XFNumberStyle::SetPrefix(rtl::OUString prefix)
+inline void XFNumberStyle::SetPrefix(OUString prefix)
{
m_strPrefix = prefix;
}
-inline void XFNumberStyle::SetSurfix(rtl::OUString surfix)
+inline void XFNumberStyle::SetSurfix(OUString surfix)
{
m_strSuffix = surfix;
}
-inline void XFNumberStyle::SetCurrencySymbol(sal_Bool post, rtl::OUString symbol, sal_Bool bShowSpace)
+inline void XFNumberStyle::SetCurrencySymbol(sal_Bool post, OUString symbol, sal_Bool bShowSpace)
{
m_bCurrencySymbolPost = post;
m_strCurrencySymbol = symbol;
diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
index f74899425c4e..2fc99df98012 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
@@ -82,7 +82,7 @@ public:
(2 item2
* @param: prefix
*********************************************************************/
- void SetPrefix(rtl::OUString prefix)
+ void SetPrefix(OUString prefix)
{
m_strPrefix = prefix;
}
@@ -93,7 +93,7 @@ public:
2) item2
* @param: prefix
*********************************************************************/
- void SetSuffix(rtl::OUString suffix)
+ void SetSuffix(OUString suffix)
{
m_strSuffix = suffix;
}
@@ -117,7 +117,7 @@ public:
'','','','','',
* @param: prefix
*********************************************************************/
- void SetFormat(rtl::OUString format)
+ void SetFormat(OUString format)
{
m_strFormat = format;
}
@@ -140,9 +140,9 @@ public:
pAttrList->AddAttribute( A2OUSTR("text:start-value"), Int16ToOUString(m_nStartValue) );
}
private:
- rtl::OUString m_strPrefix;
- rtl::OUString m_strSuffix;
- rtl::OUString m_strFormat;
+ OUString m_strPrefix;
+ OUString m_strSuffix;
+ OUString m_strFormat;
sal_Int16 m_nStartValue;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
index f8da4b214599..5c72ff198067 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
@@ -61,27 +61,27 @@
#include "ixfstream.hxx"
#include "ixfattrlist.hxx"
-void XFOfficeMeta::SetCreator(rtl::OUString creator)
+void XFOfficeMeta::SetCreator(OUString creator)
{
m_strCreator = creator;
}
-void XFOfficeMeta::SetDescription(rtl::OUString dsr)
+void XFOfficeMeta::SetDescription(OUString dsr)
{
m_strDsr = dsr;
}
-void XFOfficeMeta::SetKeywords(rtl::OUString keywords)
+void XFOfficeMeta::SetKeywords(OUString keywords)
{
m_strKeywords = keywords;
}
-void XFOfficeMeta::SetCreationTime(rtl::OUString crtime)
+void XFOfficeMeta::SetCreationTime(OUString crtime)
{
m_strCrtime = crtime;
}
-void XFOfficeMeta::SetLastTime(rtl::OUString lstime)
+void XFOfficeMeta::SetLastTime(OUString lstime)
{
m_strLstime = lstime;
}
-void XFOfficeMeta::SetEditTime(rtl::OUString edtime)
+void XFOfficeMeta::SetEditTime(OUString edtime)
{
m_strEdtime = edtime;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
index 74a82f56fa31..118fea5642eb 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
@@ -69,23 +69,23 @@ public:
XFOfficeMeta(){}
virtual ~XFOfficeMeta(){}
- void SetCreator(rtl::OUString creator);
- void SetDescription(rtl::OUString dsr);
- void SetKeywords(rtl::OUString keywords);
- void SetCreationTime(rtl::OUString crtime);
- void SetLastTime(rtl::OUString lstime);
- void SetEditTime(rtl::OUString edtime);
+ void SetCreator(OUString creator);
+ void SetDescription(OUString dsr);
+ void SetKeywords(OUString keywords);
+ void SetCreationTime(OUString crtime);
+ void SetLastTime(OUString lstime);
+ void SetEditTime(OUString edtime);
virtual void ToXml(IXFStream *pStream);
private:
- rtl::OUString m_strGenerator;
- rtl::OUString m_strTitle;
- rtl::OUString m_strCreator;
- rtl::OUString m_strDsr;
- rtl::OUString m_strKeywords;
- rtl::OUString m_strCrtime;
- rtl::OUString m_strLstime;
- rtl::OUString m_strEdtime;
+ OUString m_strGenerator;
+ OUString m_strTitle;
+ OUString m_strCreator;
+ OUString m_strDsr;
+ OUString m_strKeywords;
+ OUString m_strCrtime;
+ OUString m_strLstime;
+ OUString m_strEdtime;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
index dfb7946e3cd0..52a73d3fb6a2 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagenumber.hxx
@@ -71,7 +71,7 @@
class XFPageNumber : public XFContent
{
public:
- void SetNumFmt(rtl::OUString fmt);
+ void SetNumFmt(OUString fmt);
virtual void ToXml(IXFStream *pStrm);
@@ -79,7 +79,7 @@ private:
XFNumFmt m_aNumFmt;
};
-inline void XFPageNumber::SetNumFmt(rtl::OUString fmt)
+inline void XFPageNumber::SetNumFmt(OUString fmt)
{
m_aNumFmt.SetFormat(fmt);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 277e14c6446a..8ce3d775464e 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -403,7 +403,7 @@ sal_Bool XFParaStyle::Equal(IXFStyle *pStyle)
void XFParaStyle::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
pAttrList->Clear();
if( !style.isEmpty() )
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index ba4607cfcd78..336a25adf063 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -101,9 +101,9 @@ public:
* @descr Set layout for the paragraph.When such property was setted, this paragraph will
* start at an new page.
*/
- void SetMasterPage(rtl::OUString master);
+ void SetMasterPage(OUString master);
- rtl::OUString GetMasterPage();
+ OUString GetMasterPage();
/**
* @descr set the paragraph defaut font.
@@ -242,7 +242,7 @@ public:
sal_Bool GetNumberRight(){return m_bNumberRight;}
protected:
- rtl::OUString m_strMasterPage;
+ OUString m_strMasterPage;
enumXFAlignType m_eAlignType;
enumXFAlignType m_eLastLineAlign;
sal_Bool m_bJustSingleWord;
@@ -268,7 +268,7 @@ protected:
sal_Bool m_bNumberRight;
};
-inline void XFParaStyle::SetMasterPage(rtl::OUString master)
+inline void XFParaStyle::SetMasterPage(OUString master)
{
m_strMasterPage = master;
}
@@ -328,7 +328,7 @@ inline void XFParaStyle::ClearTabStyles()
m_aTabs.Reset();
}
-inline rtl::OUString XFParaStyle::GetMasterPage()
+inline OUString XFParaStyle::GetMasterPage()
{
return m_strMasterPage;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
index 783f88c9556d..9e4c08a6e18f 100644
--- a/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfplaceholder.hxx
@@ -71,14 +71,14 @@ class XFHolderStart : public XFContent
public:
XFHolderStart();
~XFHolderStart();
- void SetType(rtl::OUString sType);
- void SetDesc(rtl::OUString sDesc);
- void SetPrompt(rtl::OUString sText);
+ void SetType(OUString sType);
+ void SetDesc(OUString sDesc);
+ void SetPrompt(OUString sText);
void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strType;
- rtl::OUString m_strDesc;
- rtl::OUString m_strText;
+ OUString m_strType;
+ OUString m_strDesc;
+ OUString m_strText;
};
XFHolderStart::XFHolderStart()
@@ -89,17 +89,17 @@ XFHolderStart::~XFHolderStart()
{
}
-inline void XFHolderStart::SetType(rtl::OUString sType)
+inline void XFHolderStart::SetType(OUString sType)
{
m_strType = sType;
}
-inline void XFHolderStart::SetDesc(rtl::OUString sDesc)
+inline void XFHolderStart::SetDesc(OUString sDesc)
{
m_strDesc = sDesc;
}
-inline void XFHolderStart::SetPrompt(rtl::OUString sText)
+inline void XFHolderStart::SetPrompt(OUString sText)
{
m_strText = sText;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfruby.hxx b/lotuswordpro/source/filter/xfilter/xfruby.hxx
index 4b7f93a7a77e..ecae0cf8245e 100644
--- a/lotuswordpro/source/filter/xfilter/xfruby.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfruby.hxx
@@ -71,10 +71,10 @@ public:
class XFRubyEnd : public XFContent
{
public:
- void SetText(rtl::OUString sText);
+ void SetText(OUString sText);
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strText;
+ OUString m_strText;
};
void XFRubyStart::ToXml(IXFStream *pStrm)
@@ -88,7 +88,7 @@ void XFRubyStart::ToXml(IXFStream *pStrm)
pStrm->StartElement( A2OUSTR("text:ruby-base") );
}
-void XFRubyEnd::SetText(rtl::OUString sText)
+void XFRubyEnd::SetText(OUString sText)
{
m_strText = sText;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
index 64d09a6847d1..14f2b03edc4d 100644
--- a/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrubystyle.hxx
@@ -94,7 +94,7 @@ enumXFStyle XFRubyStyle::GetStyleFamily()
void XFRubyStyle::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
pAttrList->Clear();
if( !style.isEmpty() )
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
index 8848d7695573..047a4487230f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx
@@ -73,7 +73,7 @@ XFSaxAttrList::~XFSaxAttrList()
// delete m_pSvAttrList;
}
-void XFSaxAttrList::AddAttribute(const rtl::OUString& name, const rtl::OUString& value)
+void XFSaxAttrList::AddAttribute(const OUString& name, const OUString& value)
{
m_pSvAttrList->AddAttribute(name,value);
}
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
index c22d248b8c00..831740985b9f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx
@@ -76,7 +76,7 @@ public:
public:
//Interface ISaxAttributeList:
- virtual void AddAttribute(const rtl::OUString& name, const rtl::OUString& value);
+ virtual void AddAttribute(const OUString& name, const OUString& value);
virtual void Clear();
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
index b0c94dc8c82d..1e057761d87f 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
@@ -104,14 +104,14 @@ void XFSaxStream::EndDocument()
m_aHandler->endDocument();
}
-void XFSaxStream::StartElement(const rtl::OUString& oustr)
+void XFSaxStream::StartElement(const OUString& oustr)
{
if (m_aHandler.is())
m_aHandler->startElement( oustr, m_pAttrList->GetAttributeList() );
m_pAttrList->Clear();
}
-void XFSaxStream::EndElement(const rtl::OUString& oustr)
+void XFSaxStream::EndElement(const OUString& oustr)
{
if (m_aHandler.is())
m_aHandler->endElement(oustr);
@@ -120,7 +120,7 @@ void XFSaxStream::EndElement(const rtl::OUString& oustr)
m_pAttrList->Clear();
}
-void XFSaxStream::Characters(const rtl::OUString& oustr)
+void XFSaxStream::Characters(const OUString& oustr)
{
if (m_aHandler.is())
m_aHandler->characters(oustr);
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index 834d8f82483e..a343a5b3c5e4 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -109,17 +109,17 @@ public:
/**
* @descr Start output element.
*/
- virtual void StartElement(const rtl::OUString& oustr);
+ virtual void StartElement(const OUString& oustr);
/**
* @descr End output element.
*/
- virtual void EndElement(const rtl::OUString& oustr);
+ virtual void EndElement(const OUString& oustr);
/**
* @descr Output Character section.
*/
- virtual void Characters(const rtl::OUString& oustr);
+ virtual void Characters(const OUString& oustr);
/**
* @descr Get the attribute list interface.
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index c54cc3c8402c..f7e9918ecd8a 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -77,7 +77,7 @@ void XFSection::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
if( !style.isEmpty() )
pAttrList->AddAttribute( A2OUSTR("text:style-name"), style);
//section name
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index 089785b76066..f77a2a972a40 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -84,11 +84,11 @@ public:
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strSectionName;
+ OUString m_strSectionName;
sal_Bool m_bProtected;
sal_Bool m_bHiden;
XFColor m_aBackColor;
- rtl::OUString m_strSourceLink;
+ OUString m_strSourceLink;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index e705f764c256..194e02b28278 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -69,10 +69,10 @@ XFShadow::~XFShadow()
{
}
-rtl::OUString XFShadow::ToString()
+OUString XFShadow::ToString()
{
- rtl::OUString buf;
- rtl::OUString strOff = DoubleToOUString(m_fOffset);
+ OUString buf;
+ OUString strOff = DoubleToOUString(m_fOffset);
buf = m_aColor.ToString();
switch(m_ePosition)
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
index 7d8972580e38..a94d0a6d102e 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
@@ -106,7 +106,7 @@ public:
*/
XFColor GetColor();
- rtl::OUString ToString();
+ OUString ToString();
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
index 64524c59a56b..361495647536 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
@@ -68,22 +68,22 @@ XFStyle::~XFStyle()
{
}
-rtl::OUString XFStyle::GetStyleName()
+OUString XFStyle::GetStyleName()
{
return m_strStyleName;
}
-void XFStyle::SetStyleName(const rtl::OUString& styleName)
+void XFStyle::SetStyleName(const OUString& styleName)
{
m_strStyleName = styleName;
}
-rtl::OUString XFStyle::GetParentStyleName()
+OUString XFStyle::GetParentStyleName()
{
return m_strParentStyleName;
}
-void XFStyle::SetParentStyleName(const rtl::OUString& styleName)
+void XFStyle::SetParentStyleName(const OUString& styleName)
{
m_strParentStyleName = styleName;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
index 2ba09745b658..15a8c7ffe768 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
@@ -77,22 +77,22 @@ public:
/**
* @descr get style name.
*/
- virtual rtl::OUString GetStyleName();
+ virtual OUString GetStyleName();
/**
* @descr set style name.
*/
- virtual void SetStyleName(const rtl::OUString& styleName);
+ virtual void SetStyleName(const OUString& styleName);
/**
* @descr Set parent style name.
*/
- virtual rtl::OUString GetParentStyleName();
+ virtual OUString GetParentStyleName();
/**
* @descr return parent style name.
*/
- virtual void SetParentStyleName(const rtl::OUString& styleName);
+ virtual void SetParentStyleName(const OUString& styleName);
/**
* @descr get styel family.
@@ -110,8 +110,8 @@ public:
virtual sal_Bool Equal(IXFStyle *pStyle);
protected:
- rtl::OUString m_strStyleName;
- rtl::OUString m_strParentStyleName;
+ OUString m_strStyleName;
+ OUString m_strParentStyleName;
enumXFStyle m_enumFamily;
};
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 0b98b935b14b..7c9a19e72a8e 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -65,7 +65,7 @@
#include "xffontfactory.hxx"
#include "../lwpglobalmgr.hxx"
-XFStyleContainer::XFStyleContainer(const rtl::OUString& strStyleNamePrefix)
+XFStyleContainer::XFStyleContainer(const OUString& strStyleNamePrefix)
:m_strStyleNamePrefix(strStyleNamePrefix)
{
}
@@ -111,7 +111,7 @@ void XFStyleContainer::Reset()
IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle)
{
IXFStyle *pConStyle = NULL;
- rtl::OUString name;
+ OUString name;
if( !pStyle )
return NULL;
@@ -168,7 +168,7 @@ IXFStyle* XFStyleContainer::FindSameStyle(IXFStyle *pStyle)
return NULL;
}
-IXFStyle* XFStyleContainer::FindStyle(rtl::OUString name)
+IXFStyle* XFStyleContainer::FindStyle(OUString name)
{
std::vector<IXFStyle*>::iterator it;
for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it )
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index 259f1f78fe5f..420a2eb8f6f9 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -74,7 +74,7 @@ class XFStyleContainer : public IXFObject
public:
XFStyleContainer(){}
- XFStyleContainer(const rtl::OUString& strStyleNamePrefix);
+ XFStyleContainer(const OUString& strStyleNamePrefix);
XFStyleContainer(const XFStyleContainer& other);
@@ -97,7 +97,7 @@ public:
/**
* @descr get style by name.
*/
- IXFStyle* FindStyle(rtl::OUString name);
+ IXFStyle* FindStyle(OUString name);
/**
* @descr clear container.
@@ -125,7 +125,7 @@ private:
static void ManageStyleFont(IXFStyle *pStyle);
private:
std::vector<IXFStyle*> m_aStyles;
- rtl::OUString m_strStyleNamePrefix;
+ OUString m_strStyleNamePrefix;
};
inline size_t XFStyleContainer::GetCount() const
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 3062c8898158..7e04eb482769 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -107,7 +107,7 @@ void XFStyleManager::AddFontDecl(XFFontDecl& aFontDecl)
IXFStyle* XFStyleManager::AddStyle(IXFStyle *pStyle)
{
assert(pStyle);
- rtl::OUString name;
+ OUString name;
IXFStyle *pStyleRet = NULL;
if( !pStyle )
@@ -219,7 +219,7 @@ IXFStyle* XFStyleManager::AddStyle(IXFStyle *pStyle)
return pStyleRet;
}
-IXFStyle* XFStyleManager::FindStyle(rtl::OUString name)
+IXFStyle* XFStyleManager::FindStyle(OUString name)
{
IXFStyle *pStyle = (IXFStyle*)FindParaStyle(name);
if( pStyle )
@@ -272,7 +272,7 @@ IXFStyle* XFStyleManager::FindStyle(rtl::OUString name)
return NULL;
}
-XFParaStyle* XFStyleManager::FindParaStyle(rtl::OUString name)
+XFParaStyle* XFStyleManager::FindParaStyle(OUString name)
{
IXFStyle *pStyle = s_aParaStyles.FindStyle(name);
if( pStyle )
@@ -281,7 +281,7 @@ XFParaStyle* XFStyleManager::FindParaStyle(rtl::OUString name)
return (XFParaStyle*)s_aStdParaStyles.FindStyle(name);
}
-XFTextStyle* XFStyleManager::FindTextStyle(rtl::OUString name)
+XFTextStyle* XFStyleManager::FindTextStyle(OUString name)
{
IXFStyle *pStyle = s_aTextStyles.FindStyle(name);
if( pStyle )
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
index 5e4f6770f878..2c7705b9d82d 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
@@ -97,11 +97,11 @@ public:
IXFStyle* AddStyle(IXFStyle *pStyle);
- IXFStyle* FindStyle(rtl::OUString name);
+ IXFStyle* FindStyle(OUString name);
- XFParaStyle* FindParaStyle(rtl::OUString name);
+ XFParaStyle* FindParaStyle(OUString name);
- XFTextStyle* FindTextStyle(rtl::OUString name);
+ XFTextStyle* FindTextStyle(OUString name);
void SetLineNumberConfig(XFLineNumberConfig *pLNConfig);
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 12db75debf7b..678a1a12d627 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -126,7 +126,7 @@ XFTable::~XFTable()
m_aColumns.clear();
}
-void XFTable::SetColumnStyle(sal_Int32 col, rtl::OUString style)
+void XFTable::SetColumnStyle(sal_Int32 col, OUString style)
{
m_aColumns[col] = style;
}
@@ -157,7 +157,7 @@ void XFTable::AddHeaderRow(XFRow *pRow)
m_aHeaderRows.Add(pRow);
}
-rtl::OUString XFTable::GetTableName()
+OUString XFTable::GetTableName()
{
if( m_bSubTable )
{
@@ -188,7 +188,7 @@ XFRow* XFTable::GetRow(sal_Int32 row)
sal_Int32 XFTable::GetColumnCount()
{
int colMax = -1;
- std::map<sal_Int32,rtl::OUString>::iterator it;
+ std::map<sal_Int32,OUString>::iterator it;
for( it=m_aColumns.begin(); it!=m_aColumns.end(); ++it )
{
if( it->first>colMax )
@@ -225,11 +225,11 @@ void XFTable::ToXml(IXFStream *pStrm)
//output columns:
{
int lastCol = 0;
- std::map<sal_Int32,rtl::OUString>::iterator it;
+ std::map<sal_Int32,OUString>::iterator it;
for( it=m_aColumns.begin(); it!=m_aColumns.end(); ++it )
{
sal_Int32 col = (*it).first;
- rtl::OUString style = m_aColumns[col];
+ OUString style = m_aColumns[col];
//default col repeated:
if( col >lastCol+1 )
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 00b1fde1419c..e9ae0229603b 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -79,24 +79,24 @@ public:
virtual ~XFTable();
public:
- void SetTableName(rtl::OUString name);
+ void SetTableName(OUString name);
- void SetColumnStyle(sal_Int32 col, rtl::OUString style);
+ void SetColumnStyle(sal_Int32 col, OUString style);
void AddRow(XFRow *pRow);
void AddHeaderRow(XFRow *pRow);
- void SetDefaultCellStyle(rtl::OUString style);
+ void SetDefaultCellStyle(OUString style);
- void SetDefaultRowStyle(rtl::OUString style);
+ void SetDefaultRowStyle(OUString style);
- void SetDefaultColStyle(rtl::OUString style);
+ void SetDefaultColStyle(OUString style);
public:
void SetOwnerCell(XFCell *pCell);
- rtl::OUString GetTableName();
+ OUString GetTableName();
sal_Int32 GetRowCount();
@@ -115,18 +115,18 @@ public:
void RemoveRow(sal_Int32 row);
private:
- rtl::OUString m_strName;
+ OUString m_strName;
sal_Bool m_bSubTable;
XFCell *m_pOwnerCell;
XFContentContainer m_aHeaderRows;
std::map<sal_Int32,XFRow*> m_aRows;
- std::map<sal_Int32,rtl::OUString> m_aColumns;
- rtl::OUString m_strDefCellStyle;
- rtl::OUString m_strDefRowStyle;
- rtl::OUString m_strDefColStyle;
+ std::map<sal_Int32,OUString> m_aColumns;
+ OUString m_strDefCellStyle;
+ OUString m_strDefRowStyle;
+ OUString m_strDefColStyle;
};
-inline void XFTable::SetTableName(rtl::OUString name)
+inline void XFTable::SetTableName(OUString name)
{
m_strName = name;
}
@@ -143,17 +143,17 @@ inline sal_Bool XFTable::IsSubTable()
}
-inline void XFTable::SetDefaultCellStyle(rtl::OUString style)
+inline void XFTable::SetDefaultCellStyle(OUString style)
{
m_strDefCellStyle = style;
}
-inline void XFTable::SetDefaultRowStyle(rtl::OUString style)
+inline void XFTable::SetDefaultRowStyle(OUString style)
{
m_strDefRowStyle = style;
}
-inline void XFTable::SetDefaultColStyle(rtl::OUString style)
+inline void XFTable::SetDefaultColStyle(OUString style)
{
m_strDefColStyle = style;
}
diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
index 2dda0206a641..22fe63574ad4 100644
--- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx
@@ -83,8 +83,8 @@ public:
private:
enumXFTab m_eType;
double m_fLength;
- rtl::OUString m_strDelimiter;
- rtl::OUString m_strLeader;
+ OUString m_strDelimiter;
+ OUString m_strLeader;
};
inline void XFTabStyle::SetTabType(enumXFTab type)
@@ -103,7 +103,7 @@ inline void XFTabStyle::SetDelimiter(sal_Unicode delimiter)
chs[0] = delimiter;
chs[1] = 0;
- m_strDelimiter = rtl::OUString(chs);
+ m_strDelimiter = OUString(chs);
}
inline void XFTabStyle::SetLeaderChar(sal_Unicode leader)
@@ -112,7 +112,7 @@ inline void XFTabStyle::SetLeaderChar(sal_Unicode leader)
chs[0] = leader;
chs[1] = 0;
- m_strLeader = rtl::OUString(chs);
+ m_strLeader = OUString(chs);
}
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index 83cf2d6249e3..fe66d2cb7fe9 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -60,7 +60,7 @@
#include "xftextcontent.hxx"
#include "ixfstream.hxx"
-XFTextContent::XFTextContent(rtl::OUString text):m_strText(text)
+XFTextContent::XFTextContent(OUString text):m_strText(text)
{
}
@@ -73,7 +73,7 @@ enumXFContent XFTextContent::GetContentType()
return enumXFContentText;
}
-void XFTextContent::SetText(const rtl::OUString& text)
+void XFTextContent::SetText(const OUString& text)
{
m_strText = text;
}
@@ -81,9 +81,9 @@ void XFTextContent::SetText(const rtl::OUString& text)
void XFTextContent::ToXml(IXFStream *pStrm)
{
// pStrm->Characters(m_strText);
- rtl::OUString sSpaceToken(" ");
- sSpaceToken += rtl::OUString(" ");
- rtl::OUString sSubString;
+ OUString sSpaceToken(" ");
+ sSpaceToken += OUString(" ");
+ OUString sSubString;
sal_Int32 nIndex = 0;
sal_Int32 nSize = m_strText.getLength();
sal_Int32 i,j;
@@ -107,7 +107,7 @@ void XFTextContent::ToXml(IXFStream *pStrm)
}
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- pAttrList->AddAttribute( A2OUSTR("text:c"), rtl::OUString::valueOf(j-nIndex) );
+ pAttrList->AddAttribute( A2OUSTR("text:c"), OUString::valueOf(j-nIndex) );
pStrm->StartElement( A2OUSTR("text:s") );
pStrm->EndElement( A2OUSTR("text:s") );
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
index 870a64a4ccf2..7f55f2149392 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
@@ -74,7 +74,7 @@ class XFTextContent : public XFContent
public:
XFTextContent(){}
- XFTextContent(rtl::OUString text);
+ XFTextContent(OUString text);
virtual ~XFTextContent();
@@ -82,14 +82,14 @@ public:
/**
* @descr Set the text.
*/
- void SetText(const rtl::OUString& text);
+ void SetText(const OUString& text);
virtual enumXFContent GetContentType();
virtual void ToXml(IXFStream *pStrm);
private:
- rtl::OUString m_strText;
+ OUString m_strText;
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
index 9e176a6cf360..0631c2660ca8 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
@@ -67,8 +67,8 @@ XFTextSpan::XFTextSpan()
}
-XFTextSpan::XFTextSpan(rtl::OUString& text,
- rtl::OUString& style
+XFTextSpan::XFTextSpan(OUString& text,
+ OUString& style
)
{
Add(text);
@@ -99,7 +99,7 @@ void XFTextSpan::Add(IXFContent *pContent)
m_aContents.push_back(pContent);
}
-void XFTextSpan::Add(rtl::OUString& text)
+void XFTextSpan::Add(OUString& text)
{
IXFContent *pText = new XFTextContent(text);
Add(pText);
@@ -107,7 +107,7 @@ void XFTextSpan::Add(rtl::OUString& text)
void XFTextSpan::ToXml(IXFStream *pStrm)
{
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
IXFAttrList *pAttrList = pStrm->GetAttrList();
assert(pAttrList);
@@ -130,7 +130,7 @@ void XFTextSpan::ToXml(IXFStream *pStrm)
void XFTextSpanStart::ToXml(IXFStream *pStrm)
{
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
IXFAttrList *pAttrList = pStrm->GetAttrList();
assert(pAttrList);
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
index f60ffb1ba3f8..4b5b349d91b9 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
@@ -70,12 +70,12 @@ class XFTextSpan : public XFContent
{
public:
XFTextSpan();
- XFTextSpan(rtl::OUString& text, rtl::OUString& style );
+ XFTextSpan(OUString& text, OUString& style );
virtual ~XFTextSpan();
void Add(IXFContent *pContent);
- void Add(rtl::OUString& text);
+ void Add(OUString& text);
virtual enumXFContent GetContentType();
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index 1820c2885514..577734714388 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -112,16 +112,16 @@ enumXFStyle XFTextStyle::GetStyleFamily()
void XFTextStyle::ToXml(IXFStream *strm)
{
IXFAttrList *pAttrList = strm->GetAttrList();
- rtl::OUString style = GetStyleName();
+ OUString style = GetStyleName();
pAttrList->Clear();
if( !style.isEmpty() )
- pAttrList->AddAttribute(rtl::OUString("style:name"),GetStyleName());
+ pAttrList->AddAttribute(OUString("style:name"),GetStyleName());
if( !GetParentStyleName().isEmpty() )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
- pAttrList->AddAttribute(rtl::OUString("style:family"),A2OUSTR("text") );
- strm->StartElement(rtl::OUString("style:style"));
+ pAttrList->AddAttribute(OUString("style:family"),A2OUSTR("text") );
+ strm->StartElement(OUString("style:style"));
//Font properties:
pAttrList->Clear();
@@ -129,10 +129,10 @@ void XFTextStyle::ToXml(IXFStream *strm)
if( m_pFont )
m_pFont->ToXml(strm);
- strm->StartElement(rtl::OUString("style:properties"));
- strm->EndElement(rtl::OUString("style:properties"));
+ strm->StartElement(OUString("style:properties"));
+ strm->EndElement(OUString("style:properties"));
- strm->EndElement(rtl::OUString("style:style"));
+ strm->EndElement(OUString("style:style"));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
index 722e988c18e4..ba4b7b67e68d 100644
--- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx
@@ -80,12 +80,12 @@ public:
void SetLongFmt(sal_Bool bLongFmt);
- void SetText(rtl::OUString& text);
+ void SetText(OUString& text);
protected:
enumXFDatePart m_ePart;
sal_Bool m_bLongFmt;
- rtl::OUString m_strText;
+ OUString m_strText;
};
class XFTimePart : public XFDateTimePart
@@ -120,7 +120,7 @@ public:
void SetAmPm(sal_Bool bAmPm);
- void AddText( rtl::OUString part );
+ void AddText( OUString part );
virtual enumXFStyle GetStyleFamily();
@@ -146,7 +146,7 @@ inline void XFDateTimePart::SetLongFmt(sal_Bool bLongFmt)
m_bLongFmt = bLongFmt;
}
-inline void XFDateTimePart::SetText(rtl::OUString& text)
+inline void XFDateTimePart::SetText(OUString& text)
{
m_strText = text;
}
@@ -186,7 +186,7 @@ inline void XFTimeStyle::SetAmPm(sal_Bool bAmPm)
m_bAmPm = bAmPm;
}
-inline void XFTimeStyle::AddText( rtl::OUString text )
+inline void XFTimeStyle::AddText( OUString text )
{
XFTimePart part;
part.SetPartType(enumXFDateText);
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 942928a15b9c..89803b599f09 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -64,54 +64,54 @@
#include <rtl/ustrbuf.hxx>
#include <sstream>
-rtl::OUString Int32ToOUString(sal_Int32 num)
+OUString Int32ToOUString(sal_Int32 num)
{
/*std::stringstream sstrm;
sstrm<<(int)num;
- return rtl::OUString::createFromAscii(sstrm.str().c_str());
+ return OUString::createFromAscii(sstrm.str().c_str());
*/
- return rtl::OUString::valueOf(num);
+ return OUString::valueOf(num);
}
-rtl::OUString Int16ToOUString(sal_Int16 num)
+OUString Int16ToOUString(sal_Int16 num)
{
/*std::stringstream sstrm;
sstrm<<(int)num;
- return rtl::OUString::createFromAscii(sstrm.str().c_str());
+ return OUString::createFromAscii(sstrm.str().c_str());
*/
sal_Int32 nNum = static_cast<sal_Int32>(num);
- return rtl::OUString::valueOf(nNum);
+ return OUString::valueOf(nNum);
}
-rtl::OUString FloatToOUString(float num, sal_Int32 /*precision*/)
+OUString FloatToOUString(float num, sal_Int32 /*precision*/)
{
/*std::stringstream sstrm;
std::string strRet;
sstrm.precision(precision);
sstrm<<num;
- return rtl::OUString::createFromAscii(sstrm.str().c_str());
+ return OUString::createFromAscii(sstrm.str().c_str());
*/
- return rtl::OUString::valueOf(num);
+ return OUString::valueOf(num);
}
-rtl::OUString DoubleToOUString(double num, sal_Int32 /*precision*/)
+OUString DoubleToOUString(double num, sal_Int32 /*precision*/)
{
/*std::stringstream sstrm;
std::string strRet;
sstrm.precision(precision);
sstrm<<num;
- return rtl::OUString::createFromAscii(sstrm.str().c_str());
+ return OUString::createFromAscii(sstrm.str().c_str());
*/
- return rtl::OUString::valueOf(num);
+ return OUString::valueOf(num);
}
-rtl::OUString DateTimeToOUString(XFDateTime& dt)
+OUString DateTimeToOUString(XFDateTime& dt)
{
- rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append(dt.nYear);
buf.append( A2OUSTR("-") );
buf.append(dt.nMonth);
@@ -129,7 +129,7 @@ rtl::OUString DateTimeToOUString(XFDateTime& dt)
return buf.makeStringAndClear();
}
-rtl::OUString GetTableColName(sal_Int32 col)
+OUString GetTableColName(sal_Int32 col)
{
int remain = 0;
char ch;
@@ -156,7 +156,7 @@ rtl::OUString GetTableColName(sal_Int32 col)
}
//tool functions:
-rtl::OUString GetUnderlineName(enumXFUnderline type)
+OUString GetUnderlineName(enumXFUnderline type)
{
switch(type)
{
@@ -218,7 +218,7 @@ rtl::OUString GetUnderlineName(enumXFUnderline type)
return A2OUSTR("");
}
-rtl::OUString GetReliefName(enumXFRelief type)
+OUString GetReliefName(enumXFRelief type)
{
switch(type)
{
@@ -234,7 +234,7 @@ rtl::OUString GetReliefName(enumXFRelief type)
return A2OUSTR("");
}
-rtl::OUString GetCrossoutName(enumXFCrossout type)
+OUString GetCrossoutName(enumXFCrossout type)
{
switch(type)
{
@@ -259,7 +259,7 @@ rtl::OUString GetCrossoutName(enumXFCrossout type)
return A2OUSTR("");
}
-rtl::OUString GetTransformName(enumXFTransform type)
+OUString GetTransformName(enumXFTransform type)
{
switch(type) {
case enumXFTransformUpper:
@@ -280,7 +280,7 @@ rtl::OUString GetTransformName(enumXFTransform type)
return A2OUSTR("");
}
-rtl::OUString GetEmphasizeName(enumXFEmphasize type)
+OUString GetEmphasizeName(enumXFEmphasize type)
{
switch(type) {
case enumXFEmphasizeDot:
@@ -301,7 +301,7 @@ rtl::OUString GetEmphasizeName(enumXFEmphasize type)
return A2OUSTR("");
}
-rtl::OUString GetTextDirName(enumXFTextDir dir)
+OUString GetTextDirName(enumXFTextDir dir)
{
switch(dir)
{
@@ -335,7 +335,7 @@ rtl::OUString GetTextDirName(enumXFTextDir dir)
return A2OUSTR("");
}
-rtl::OUString GetFrameXPos(enumXFFrameXPos pos)
+OUString GetFrameXPos(enumXFFrameXPos pos)
{
switch(pos)
{
@@ -357,7 +357,7 @@ rtl::OUString GetFrameXPos(enumXFFrameXPos pos)
return A2OUSTR("");
}
-rtl::OUString GetFrameXRel(enumXFFrameXRel rel)
+OUString GetFrameXRel(enumXFFrameXRel rel)
{
switch(rel)
{
@@ -406,7 +406,7 @@ rtl::OUString GetFrameXRel(enumXFFrameXRel rel)
return A2OUSTR("");
}
-rtl::OUString GetFrameYPos(enumXFFrameYPos pos)
+OUString GetFrameYPos(enumXFFrameYPos pos)
{
switch(pos)
{
@@ -424,7 +424,7 @@ rtl::OUString GetFrameYPos(enumXFFrameYPos pos)
return A2OUSTR("");
}
-rtl::OUString GetFrameYRel(enumXFFrameYRel rel)
+OUString GetFrameYRel(enumXFFrameYRel rel)
{
switch(rel)
{
@@ -452,7 +452,7 @@ rtl::OUString GetFrameYRel(enumXFFrameYRel rel)
return A2OUSTR("");
}
-rtl::OUString GetAlignName(enumXFAlignType align)
+OUString GetAlignName(enumXFAlignType align)
{
if( align == enumXFAlignStart )
return A2OUSTR("start");
@@ -474,7 +474,7 @@ rtl::OUString GetAlignName(enumXFAlignType align)
return A2OUSTR("");
}
-rtl::OUString GetDrawKind(enumXFDrawKind kind)
+OUString GetDrawKind(enumXFDrawKind kind)
{
if( kind == enumXFDrawKindFull )
return A2OUSTR("full");
@@ -486,9 +486,9 @@ rtl::OUString GetDrawKind(enumXFDrawKind kind)
return A2OUSTR("arc");
}
-rtl::OUString GetPageUsageName(enumXFPageUsage usage)
+OUString GetPageUsageName(enumXFPageUsage usage)
{
- rtl::OUString sRet;
+ OUString sRet;
switch(usage)
{
case enumXFPageUsageAll:
@@ -510,9 +510,9 @@ rtl::OUString GetPageUsageName(enumXFPageUsage usage)
return sRet;
}
-rtl::OUString GetValueType(enumXFValueType type)
+OUString GetValueType(enumXFValueType type)
{
- rtl::OUString sRet;
+ OUString sRet;
switch(type)
{
case enumXFValueTypeBoolean:
@@ -543,7 +543,7 @@ rtl::OUString GetValueType(enumXFValueType type)
return sRet;
}
-rtl::OUString GetColorMode(enumXFColorMode mode)
+OUString GetColorMode(enumXFColorMode mode)
{
switch(mode)
{
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index f9b13bd9530d..d89da05554ae 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -66,49 +66,49 @@
#include <string>
-#define A2OUSTR(str) rtl::OUString::createFromAscii(str)
+#define A2OUSTR(str) OUString::createFromAscii(str)
-rtl::OUString Int32ToOUString(sal_Int32 num);
+OUString Int32ToOUString(sal_Int32 num);
-rtl::OUString Int16ToOUString(sal_Int16 num);
+OUString Int16ToOUString(sal_Int16 num);
-rtl::OUString FloatToOUString(float num, sal_Int32 precision=6);
+OUString FloatToOUString(float num, sal_Int32 precision=6);
-rtl::OUString DoubleToOUString(double num, sal_Int32 precision=6);
+OUString DoubleToOUString(double num, sal_Int32 precision=6);
-rtl::OUString DateTimeToOUString(XFDateTime& dt);
+OUString DateTimeToOUString(XFDateTime& dt);
-rtl::OUString GetTableColName(sal_Int32 col);
+OUString GetTableColName(sal_Int32 col);
-rtl::OUString GetUnderlineName(enumXFUnderline type);
+OUString GetUnderlineName(enumXFUnderline type);
-rtl::OUString GetReliefName(enumXFRelief type);
+OUString GetReliefName(enumXFRelief type);
-rtl::OUString GetCrossoutName(enumXFCrossout type);
+OUString GetCrossoutName(enumXFCrossout type);
-rtl::OUString GetTransformName(enumXFTransform type);
+OUString GetTransformName(enumXFTransform type);
-rtl::OUString GetEmphasizeName(enumXFEmphasize type);
+OUString GetEmphasizeName(enumXFEmphasize type);
-rtl::OUString GetTextDirName(enumXFTextDir dir);
+OUString GetTextDirName(enumXFTextDir dir);
-rtl::OUString GetFrameXPos(enumXFFrameXPos pos);
+OUString GetFrameXPos(enumXFFrameXPos pos);
-rtl::OUString GetFrameXRel(enumXFFrameXRel rel);
+OUString GetFrameXRel(enumXFFrameXRel rel);
-rtl::OUString GetFrameYPos(enumXFFrameYPos pos);
+OUString GetFrameYPos(enumXFFrameYPos pos);
-rtl::OUString GetFrameYRel(enumXFFrameYRel rel);
+OUString GetFrameYRel(enumXFFrameYRel rel);
-rtl::OUString GetAlignName(enumXFAlignType align);
+OUString GetAlignName(enumXFAlignType align);
-rtl::OUString GetDrawKind(enumXFDrawKind kind);
+OUString GetDrawKind(enumXFDrawKind kind);
-rtl::OUString GetPageUsageName(enumXFPageUsage usage);
+OUString GetPageUsageName(enumXFPageUsage usage);
-rtl::OUString GetValueType(enumXFValueType type);
+OUString GetValueType(enumXFValueType type);
-rtl::OUString GetColorMode(enumXFColorMode mode);
+OUString GetColorMode(enumXFColorMode mode);
#endif
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index b4ebe77d854a..bd9b1591209c 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -55,7 +55,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
using ::osl::MutexGuard;
-using ::rtl::OUString;
#define MYSQLC_URI_PREFIX "sdbc:mysqlc:"
@@ -210,9 +209,9 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
// Check if the server is 4.1 or above
if (this->getMysqlVersion() < 40100) {
throw SQLException(
- ::rtl::OUString( "MariaDB LibreOffice Connector requires MySQL Server 4.1 or above" ),
+ OUString( "MariaDB LibreOffice Connector requires MySQL Server 4.1 or above" ),
*this,
- ::rtl::OUString(),
+ OUString(),
0,
Any());
}
@@ -257,7 +256,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const OUS
OSL_TRACE("OConnection::prepareStatement");
MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
- const ::rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
+ const OUString sSqlStatement = transFormPreparedStatement( _sSql );
Reference< XPreparedStatement > xStatement;
try {
@@ -295,8 +294,8 @@ OUString SAL_CALL OConnection::nativeSQL(const OUString& _sSql)
OSL_TRACE("OConnection::nativeSQL");
MutexGuard aGuard(m_aMutex);
- const ::rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
- ::rtl::OUString sNativeSQL;
+ const OUString sSqlStatement = transFormPreparedStatement( _sSql );
+ OUString sNativeSQL;
try {
sNativeSQL = mysqlc_sdbc_driver::convert(m_settings.cppConnection->nativeSQL(mysqlc_sdbc_driver::convert(sSqlStatement, getConnectionEncoding())),
getConnectionEncoding());
@@ -658,7 +657,7 @@ OUString OConnection::getMysqlVariable(const char *varname)
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
OUString ret;
- ::rtl::OUStringBuffer aStatement;
+ OUStringBuffer aStatement;
aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" );
aStatement.appendAscii( varname );
aStatement.append( sal_Unicode( '\'' ) );
@@ -717,16 +716,16 @@ sal_Int32 OConnection::getMysqlVersion()
// return 0;
//}
// -----------------------------------------------------------------------------
-::rtl::OUString OConnection::transFormPreparedStatement(const ::rtl::OUString& _sSQL)
+OUString OConnection::transFormPreparedStatement(const OUString& _sSQL)
{
- ::rtl::OUString sSqlStatement = _sSQL;
+ OUString sSqlStatement = _sSQL;
if ( !m_xParameterSubstitution.is() ) {
try {
Sequence< Any > aArgs(1);
Reference< XConnection> xCon = this;
- aArgs[0] <<= NamedValue(::rtl::OUString("ActiveConnection"), makeAny(xCon));
+ aArgs[0] <<= NamedValue(OUString("ActiveConnection"), makeAny(xCon));
- m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY);
+ m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY);
} catch(const Exception&) {}
}
if ( m_xParameterSubstitution.is() ) {
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index a03cbe33da32..e9619e9f94dc 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -58,7 +58,6 @@ namespace connectivity
namespace mysqlc
{
- using ::rtl::OUString;
using ::com::sun::star::sdbc::SQLWarning;
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
@@ -215,7 +214,7 @@ namespace connectivity
// TODO: Not used
//sal_Int32 sdbcColumnType(OUString typeName);
inline const ConnectionSettings& getConnectionSettings() const { return m_settings; }
- ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL);
+ OUString transFormPreparedStatement(const OUString& _sSQL);
// should we use the catalog on filebased databases
inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; }
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 45b49f9e4ec0..b415238713c7 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -41,7 +41,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
-using ::rtl::OUString;
using mysqlc_sdbc_driver::getStringFromAny;
#include <cppconn/connection.h>
@@ -54,7 +53,6 @@ using mysqlc_sdbc_driver::getStringFromAny;
static std::string wild("%");
-using ::rtl::OUStringToOString;
// -----------------------------------------------------------------------------
void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nType,const std::vector< std::vector< Any > >& _rRows)
@@ -1497,7 +1495,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
const char * table_types[] = {"TABLE", "VIEW"};
sal_Int32 requiredVersion[] = {0, 50000};
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@@ -1519,7 +1517,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getTypeInfo");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
@@ -1563,7 +1561,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
{
OSL_TRACE("ODatabaseMetaData::getCatalogs");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
try {
@@ -1598,7 +1596,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
{
OSL_TRACE("ODatabaseMetaData::getSchemas");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
try {
@@ -1643,7 +1641,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getColumnPrivileges");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1686,7 +1684,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getColumns");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1739,7 +1737,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
Reference< XResultSet > xResultSet(getOwnConnection().
getDriver().getFactory()->createInstance(
- ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1811,7 +1809,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getProcedures");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1856,7 +1854,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getVersionColumns");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
lcl_setRows_throw(xResultSet, 16,rRows);
return xResultSet;
@@ -1872,7 +1870,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getExportedKeys");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1913,7 +1911,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
{
OSL_TRACE("ODatabaseMetaData::getImportedKeys");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1954,7 +1952,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getPrimaryKeys");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1997,7 +1995,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getIndexInfo");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2040,7 +2038,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2081,7 +2079,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getTablePrivileges");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2103,7 +2101,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
aRow.push_back(makeAny( tableNamePattern )); // TABLE_NAME
aRow.push_back(Any()); // GRANTOR
aRow.push_back(userName); // GRANTEE
- aRow.push_back(makeAny( ::rtl::OUString::createFromAscii( allPrivileges[i] ) )); // PRIVILEGE
+ aRow.push_back(makeAny( OUString::createFromAscii( allPrivileges[i] ) )); // PRIVILEGE
aRow.push_back(Any()); // IS_GRANTABLE
rRows.push_back(aRow);
@@ -2146,7 +2144,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
throw(SQLException, RuntimeException)
{
OSL_TRACE("ODatabaseMetaData::getCrossReference");
- Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
+ Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index e41201d1364b..a6a79e34f929 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -35,7 +35,6 @@ namespace connectivity
typedef ::com::sun::star::uno::RuntimeException my_RuntimeException;
typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > my_XResultSetRef;
using ::com::sun::star::uno::Any;
- using ::rtl::OUString;
//**************************************************************
//************ Class: ODatabaseMetaData
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index b399da89a09b..7a6a32640122 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
using namespace connectivity::mysqlc;
-using ::rtl::OUString;
#include <stdio.h>
#include <cppconn/exception.h>
@@ -83,7 +82,7 @@ OUString MysqlCDriver::getImplementationName_Static()
throw(RuntimeException)
{
OSL_TRACE("MysqlCDriver::getImplementationName_Static");
- return ::rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" );
+ return OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" );
}
/* }}} */
@@ -146,7 +145,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
#else
if ( !m_bAttemptedLoadCppConn )
{
- const ::rtl::OUString sModuleName(CPPCONN_LIB );
+ const OUString sModuleName(CPPCONN_LIB );
m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
m_bAttemptedLoadCppConn = true;
}
@@ -156,16 +155,16 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
{
OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!");
throw SQLException(
- ::rtl::OUString( "Unable to load the " CPPCONN_LIB " library." ),
+ OUString( "Unable to load the " CPPCONN_LIB " library." ),
*this,
- ::rtl::OUString( "08001" ), // "unable to connect"
+ OUString( "08001" ), // "unable to connect"
0,
Any()
);
}
// find the factory symbol
- const ::rtl::OUString sSymbolName = ::rtl::OUString( "sql_mysql_get_driver_instance" );
+ const OUString sSymbolName = OUString( "sql_mysql_get_driver_instance" );
typedef void* (* FGetMySQLDriver)();
const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
@@ -173,9 +172,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
{
OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!");
throw SQLException(
- ::rtl::OUString( CPPCONN_LIB " is invalid: missing the driver factory function." ),
+ OUString( CPPCONN_LIB " is invalid: missing the driver factory function." ),
*this,
- ::rtl::OUString( "08001" ), // "unable to connect"
+ OUString( "08001" ), // "unable to connect"
0,
Any()
);
@@ -186,9 +185,9 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
if ( !cppDriver )
{
throw SQLException(
- ::rtl::OUString( "Unable to obtain the MySQL_Driver instance from Connector/C++." ),
+ OUString( "Unable to obtain the MySQL_Driver instance from Connector/C++." ),
*this,
- ::rtl::OUString( "08001" ), // "unable to connect"
+ OUString( "08001" ), // "unable to connect"
0,
Any()
);
@@ -211,7 +210,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con
impl_initCppConn_lck_throw();
OSL_POSTCOND( cppDriver, "MySQLCDriver::connect: internal error." );
if ( !cppDriver )
- throw RuntimeException( ::rtl::OUString( "MySQLCDriver::connect: internal error." ), *this );
+ throw RuntimeException( OUString( "MySQLCDriver::connect: internal error." ), *this );
}
Reference< XConnection > xConn;
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index 97426243eba9..021c64e7c265 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -40,7 +40,6 @@ namespace connectivity
{
namespace mysqlc
{
- using ::rtl::OUString;
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Exception;
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index bda703152022..6caccde4578f 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -28,7 +28,6 @@ using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
using com::sun::star::uno::Any;
-using ::rtl::OUString;
namespace mysqlc_sdbc_driver
{
@@ -36,11 +35,11 @@ namespace mysqlc_sdbc_driver
void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException)
{
- const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": feature not implemented." );
+ const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + OUString( ": feature not implemented." );
throw SQLException(
sMessage,
_rxContext,
- ::rtl::OUString("HYC00"),
+ OUString("HYC00"),
0,
_pNextException ? *_pNextException : Any()
);
@@ -50,11 +49,11 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException)
{
- const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": invalid arguments." );
+ const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + OUString( ": invalid arguments." );
throw SQLException(
sMessage,
_rxContext,
- ::rtl::OUString("HYC00"),
+ OUString("HYC00"),
0,
_pNextException ? *_pNextException : Any()
);
@@ -152,14 +151,14 @@ int mysqlToOOOType(int cppConnType)
}
-::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
+OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
{
- return ::rtl::OUString( _string.c_str(), _string.size(), encoding );
+ return OUString( _string.c_str(), _string.size(), encoding );
}
-::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding)
+::std::string convert(const OUString& _string, const rtl_TextEncoding encoding)
{
- return ::std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() );
+ return ::std::string( OUStringToOString( _string, encoding ).getStr() );
}
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 03a4a0f2e77e..6333ca8eba65 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -27,7 +27,7 @@
namespace mysqlc_sdbc_driver
{
- rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny);
+ OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny);
void throwFeatureNotImplementedException(
const sal_Char* _pAsciiFeatureName,
@@ -48,9 +48,9 @@ namespace mysqlc_sdbc_driver
int mysqlToOOOType(int mysqlType) throw ();
- ::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
+ OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
- ::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding);
+ ::std::string convert(const OUString& _string, const rtl_TextEncoding encoding);
}
#endif
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index 774ac5810067..004acf9a3f40 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -228,7 +228,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString&
checkParameterIndex(parameter);
try {
- std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
+ std::string stringie(OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie);
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx
index 21d764908a7c..f22d7af4f2d0 100644
--- a/mysqlc/source/mysqlc_propertyids.cxx
+++ b/mysqlc/source/mysqlc_propertyids.cxx
@@ -20,7 +20,6 @@
#include <osl/diagnose.h>
#include "mysqlc_propertyids.hxx"
-using ::rtl::OUString;
namespace connectivity
{
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index 3118813ccddf..f77d9726b5ae 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -37,13 +37,13 @@ namespace mysqlc
{
::std::map<sal_Int32 , rtl_uString*> 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;
static OPropertyMap& getPropMap()
{
@@ -61,7 +61,7 @@ namespace mysqlc
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/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 5e5161e1fb5e..b0bd52881bfe 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::io;
using namespace com::sun::star::util;
using ::osl::MutexGuard;
-using ::rtl::OUString;
#include <cppconn/resultset.h>
#include <cppconn/resultset_metadata.h>
@@ -56,7 +55,7 @@ OUString SAL_CALL OResultSet::getImplementationName()
throw (RuntimeException)
{
OSL_TRACE("OResultSet::getImplementationName");
- return ::rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
+ return OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
}
/* }}} */
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index ebe5b860e1a9..fd22c99441c2 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -43,7 +43,6 @@ namespace connectivity
{
namespace mysqlc
{
- using ::rtl::OUString;
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 0693e472442b..0d0c2732d210 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -27,7 +27,6 @@ using namespace connectivity::mysqlc;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::sdbc;
-using ::rtl::OUString;
// -------------------------------------------------------------------------
OResultSetMetaData::~OResultSetMetaData()
@@ -436,7 +435,7 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
OSL_TRACE("OResultSetMetaData::checkColumnIndex");
if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) {
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.appendAscii( "Column index out of range (expected 1 to " );
buf.append( sal_Int32( meta->getColumnCount() ) );
buf.appendAscii( ", got " );
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index da93ef603372..4bbd7208a87c 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -33,7 +33,6 @@ namespace connectivity
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
- using ::rtl::OUString;
//**************************************************************
//************ Class: ResultSetMetaData
//**************************************************************
@@ -52,9 +51,9 @@ namespace connectivity
{
}
- inline ::rtl::OUString convert( const ::std::string& _string ) const
+ inline OUString convert( const ::std::string& _string ) const
{
- return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding );
+ return OUString( _string.c_str(), _string.size(), m_encoding );
}
/// Avoid ambigous cast error from the compiler.
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index 8f3add7213de..672633c26e1c 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -24,7 +24,6 @@
#include <rtl/ustrbuf.hxx>
using namespace connectivity::mysqlc;
-using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::registry::XRegistryKey;
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 1fae7705bf6a..a275689a2a4a 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::io;
using namespace com::sun::star::util;
using ::osl::MutexGuard;
-using ::rtl::OUString;
#include <stdio.h>
@@ -181,7 +180,7 @@ sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql)
OSL_TRACE("OCommonStatement::execute");
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
- const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
+ const OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
sal_Bool success = false;
try {
@@ -202,7 +201,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString&
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
- const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
+ const OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
Reference< XResultSet > xResultSet;
try {
@@ -289,7 +288,7 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql)
OSL_TRACE("OCommonStatement::executeUpdate");
MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed);
- const ::rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
+ const OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
sal_Int32 affectedRows = 0;
try {
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index a4e6335dde58..a58a9c598aa3 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -44,7 +44,6 @@ namespace connectivity
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::RuntimeException;
- using ::rtl::OUString;
typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement,
::com::sun::star::sdbc::XWarningsSupplier,
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 85a5dc7d7721..dfc1f198fdbc 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -201,26 +201,26 @@ namespace connectivity
#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) \
; \
return pSupported != pEnd; \
diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index c6b3f06b763d..f11dc1d6260a 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -63,26 +63,26 @@ public:
/** Returns the relations of the current fragment. */
const Relations& getRelations() const;
/** Returns the full path of the current fragment. */
- const ::rtl::OUString& getFragmentPath() const;
+ const OUString& getFragmentPath() const;
/** Returns the full fragment path for the target of the passed relation. */
- ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const;
+ OUString getFragmentPathFromRelation( const Relation& rRelation ) const;
/** Returns the full fragment path for the passed relation identifier. */
- ::rtl::OUString getFragmentPathFromRelId( const ::rtl::OUString& rRelId ) const;
+ OUString getFragmentPathFromRelId( const OUString& rRelId ) const;
/** Returns the full fragment path for the first relation of the passed type. */
- ::rtl::OUString getFragmentPathFromFirstType( const ::rtl::OUString& rType ) const;
+ OUString getFragmentPathFromFirstType( const OUString& rType ) const;
// com.sun.star.xml.sax.XFastContextHandler interface ---------------------
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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 ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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);
// record context interface -----------------------------------------------
diff --git a/oox/inc/oox/core/contexthandler2.hxx b/oox/inc/oox/core/contexthandler2.hxx
index 0bd192eeceb2..f1a0c7db38b2 100644
--- a/oox/inc/oox/core/contexthandler2.hxx
+++ b/oox/inc/oox/core/contexthandler2.hxx
@@ -103,7 +103,7 @@ public:
The current element identifier can be accessed with getCurrentElement()
or isCurrentElement(). Used by OOXML import only.
*/
- virtual void onCharacters( const ::rtl::OUString& rChars ) = 0;
+ virtual void onCharacters( const OUString& rChars ) = 0;
/** Will be called when the current element is about to be left.
@@ -179,7 +179,7 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
/** Must be called from characters() in derived classes. */
- void implCharacters( const ::rtl::OUString& rChars );
+ void implCharacters( const OUString& rChars );
/** Must be called from endFastElement() in derived classes. */
void implEndElement( sal_Int32 nElement );
@@ -236,7 +236,7 @@ public:
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 );
@@ -254,7 +254,7 @@ public:
virtual 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 ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
diff --git a/oox/inc/oox/core/fastparser.hxx b/oox/inc/oox/core/fastparser.hxx
index a138756bb0a2..40b5e763998f 100644
--- a/oox/inc/oox/core/fastparser.hxx
+++ b/oox/inc/oox/core/fastparser.hxx
@@ -63,18 +63,18 @@ public:
@param bCloseStream True = closes the passed stream after parsing. */
void parseStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
- const ::rtl::OUString& rStreamName, bool bCloseStream = false )
+ const OUString& rStreamName, bool bCloseStream = false )
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
/** Parses a stream from the passed storage with the specified name.
@param bCloseStream True = closes the stream after parsing. */
- void parseStream( StorageBase& rStorage, const ::rtl::OUString& rStreamName, bool bCloseStream = false )
+ void parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false )
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
- ::rtl::OUString getNamespaceURL( const ::rtl::OUString& rPrefix )
+ OUString getNamespaceURL( const OUString& rPrefix )
throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- sal_Int32 getNamespaceId( const ::rtl::OUString& aUrl );
+ sal_Int32 getNamespaceId( const OUString& aUrl );
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >
getTokenHandler() const { return mxTokenHandler; }
diff --git a/oox/inc/oox/core/fasttokenhandler.hxx b/oox/inc/oox/core/fasttokenhandler.hxx
index 42479244e67d..05c7063d3925 100644
--- a/oox/inc/oox/core/fasttokenhandler.hxx
+++ b/oox/inc/oox/core/fasttokenhandler.hxx
@@ -43,13 +43,13 @@ public:
virtual ~FastTokenHandler();
// 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);
// XFastTokenHandler
- virtual sal_Int32 SAL_CALL getToken( const ::rtl::OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getToken( const OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 5f47ea9fcef2..6f4fc40499c7 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -148,10 +148,10 @@ public:
::comphelper::MediaDescriptor& getMediaDescriptor() const;
/** Returns the URL of the imported or exported file. */
- const ::rtl::OUString& getFileUrl() const;
+ const OUString& getFileUrl() const;
/** Returns an absolute URL for the passed relative or absolute URL. */
- ::rtl::OUString getAbsoluteUrl( const ::rtl::OUString& rUrl ) const;
+ OUString getAbsoluteUrl( const OUString& rUrl ) const;
/** Returns the base storage of the imported/exported file. */
StorageRef getStorage() const;
@@ -165,7 +165,7 @@ public:
accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- openInputStream( const ::rtl::OUString& rStreamName ) const;
+ openInputStream( const OUString& rStreamName ) const;
/** Opens and returns the specified output stream from the base storage.
@@ -176,7 +176,7 @@ public:
accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- openOutputStream( const ::rtl::OUString& rStreamName ) const;
+ openOutputStream( const OUString& rStreamName ) const;
/** Commits changes to base storage (and substorages) */
void commitStorage() const;
@@ -198,19 +198,19 @@ public:
/** Imports the raw binary data from the specified stream.
@return True, if the data could be imported from the stream. */
- bool importBinaryData( StreamDataSequence& orDataSeq, const ::rtl::OUString& rStreamName );
+ bool importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName );
// com.sun.star.lang.XServiceInfo interface -------------------------------
- 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& rServiceName )
+ supportsService( 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 );
@@ -272,7 +272,7 @@ private:
/** Derived classes create a VBA project manager object. */
virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0;
- virtual ::rtl::OUString implGetImplementationName() const = 0;
+ virtual OUString implGetImplementationName() const = 0;
virtual StorageRef implCreateStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0;
diff --git a/oox/inc/oox/core/filterdetect.hxx b/oox/inc/oox/core/filterdetect.hxx
index cf442771b82c..cd9573b0f0bd 100644
--- a/oox/inc/oox/core/filterdetect.hxx
+++ b/oox/inc/oox/core/filterdetect.hxx
@@ -50,7 +50,7 @@ namespace core {
class FilterDetectDocHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler >
{
public:
- explicit FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, ::rtl::OUString& rFilter );
+ explicit FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, OUString& rFilter );
virtual ~FilterDetectDocHandler();
// XFastDocumentHandler
@@ -60,28 +60,28 @@ public:
// XFastContextHandler
virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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 ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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);
private:
void parseRelationship( const AttributeList& rAttribs );
- ::rtl::OUString getFilterNameFromContentType( const ::rtl::OUString& rContentType ) const;
+ OUString getFilterNameFromContentType( const OUString& rContentType ) const;
void parseContentTypesDefault( const AttributeList& rAttribs );
void parseContentTypesOverride( const AttributeList& rAttribs );
private:
typedef ::std::vector< sal_Int32 > ContextVector;
- ::rtl::OUString& mrFilterName;
+ OUString& mrFilterName;
ContextVector maContextStack;
- ::rtl::OUString maTargetPath;
+ OUString maTargetPath;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
};
@@ -122,9 +122,9 @@ public:
// com.sun.star.lang.XServiceInfo interface -------------------------------
- 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.document.XExtendedFilterDetection interface ---------------
@@ -144,7 +144,7 @@ public:
interface of the temporary file will be stored in the 'ComponentData'
property of the passed media descriptor.
*/
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
throw( ::com::sun::star::uno::RuntimeException );
diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/oox/inc/oox/core/fragmenthandler.hxx
index b7615b806c7d..236e212e6e32 100644
--- a/oox/inc/oox/core/fragmenthandler.hxx
+++ b/oox/inc/oox/core/fragmenthandler.hxx
@@ -43,14 +43,14 @@ namespace core {
struct FragmentBaseData
{
XmlFilterBase& mrFilter;
- const ::rtl::OUString maFragmentPath;
+ const OUString maFragmentPath;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >
mxLocator;
RelationsRef mxRelations;
explicit FragmentBaseData(
XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
RelationsRef xRelations );
};
@@ -79,7 +79,7 @@ typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::s
class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE
{
public:
- explicit FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath );
+ explicit FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath );
virtual ~FragmentHandler();
/** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */
@@ -95,14 +95,14 @@ public:
// com.sun.star.xml.sax.XFastContextHandler interface ---------------------
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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 ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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);
// XML stream handling ----------------------------------------------------
@@ -116,7 +116,7 @@ public:
virtual const RecordInfo* getRecordInfos() const;
protected:
- explicit FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, RelationsRef xRelations );
+ explicit FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, RelationsRef xRelations );
};
typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef;
diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/oox/inc/oox/core/fragmenthandler2.hxx
index 5be5b62efebd..21ad03619fd1 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -47,7 +47,7 @@ protected:
public:
explicit FragmentHandler2(
XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
bool bEnableTrimSpace = true );
virtual ~FragmentHandler2();
@@ -70,7 +70,7 @@ public:
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 );
@@ -98,7 +98,7 @@ public:
virtual 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 ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
diff --git a/oox/inc/oox/core/recordparser.hxx b/oox/inc/oox/core/recordparser.hxx
index 78da7cf0a6c1..9e417c03d01a 100644
--- a/oox/inc/oox/core/recordparser.hxx
+++ b/oox/inc/oox/core/recordparser.hxx
@@ -40,8 +40,8 @@ namespace prv { class ContextStack; }
struct RecordInputSource
{
BinaryInputStreamRef mxInStream;
- ::rtl::OUString maPublicId;
- ::rtl::OUString maSystemId;
+ OUString maPublicId;
+ OUString maSystemId;
};
// ============================================================================
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index a28387197568..b78d0d3056eb 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -49,9 +49,9 @@ namespace core {
struct Relation
{
- ::rtl::OUString maId;
- ::rtl::OUString maType;
- ::rtl::OUString maTarget;
+ OUString maId;
+ OUString maType;
+ OUString maTarget;
bool mbExternal;
inline explicit Relation() : mbExternal( false ) {}
@@ -62,35 +62,35 @@ struct Relation
class Relations;
typedef ::boost::shared_ptr< Relations > RelationsRef;
-class OOX_DLLPUBLIC Relations : public ::std::map< ::rtl::OUString, Relation >
+class OOX_DLLPUBLIC Relations : public ::std::map< OUString, Relation >
{
public:
- explicit Relations( const ::rtl::OUString& rFragmentPath );
+ explicit Relations( const OUString& rFragmentPath );
/** Returns the path of the fragment this relations collection is related to. */
- inline const ::rtl::OUString& getFragmentPath() const { return maFragmentPath; }
+ inline const OUString& getFragmentPath() const { return maFragmentPath; }
/** Returns the relation with the passed relation identifier. */
- const Relation* getRelationFromRelId( const ::rtl::OUString& rId ) const;
+ const Relation* getRelationFromRelId( const OUString& rId ) const;
/** Returns the first relation with the passed type. */
- const Relation* getRelationFromFirstType( const ::rtl::OUString& rType ) const;
+ const Relation* getRelationFromFirstType( const OUString& rType ) const;
/** Finds all relations associated with the passed type. */
- RelationsRef getRelationsFromType( const ::rtl::OUString& rType ) const;
+ RelationsRef getRelationsFromType( const OUString& rType ) const;
/** Returns the external target of the relation with the passed relation identifier. */
- ::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString& rRelId ) const;
+ OUString getExternalTargetFromRelId( const OUString& rRelId ) const;
/** Returns the internal target of the relation with the passed relation identifier. */
- ::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString& rRelId ) const;
+ OUString getInternalTargetFromRelId( const OUString& rRelId ) const;
/** Returns the full fragment path for the target of the passed relation. */
- ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const;
+ OUString getFragmentPathFromRelation( const Relation& rRelation ) const;
/** Returns the full fragment path for the passed relation identifier. */
- ::rtl::OUString getFragmentPathFromRelId( const ::rtl::OUString& rRelId ) const;
+ OUString getFragmentPathFromRelId( const OUString& rRelId ) const;
/** Returns the full fragment path for the first relation of the passed type. */
- ::rtl::OUString getFragmentPathFromFirstType( const ::rtl::OUString& rType ) const;
+ OUString getFragmentPathFromFirstType( const OUString& rType ) const;
private:
- ::rtl::OUString maFragmentPath;
+ OUString maFragmentPath;
};
// ============================================================================
diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx
index bf066fdfddb3..4b5c1e093657 100644
--- a/oox/inc/oox/core/xmlfilterbase.hxx
+++ b/oox/inc/oox/core/xmlfilterbase.hxx
@@ -97,7 +97,7 @@ public:
/** Returns the fragment path from the first relation of the passed type,
used for fragments referred by the root relations. */
- ::rtl::OUString getFragmentPathFromFirstType( const ::rtl::OUString& rType );
+ OUString getFragmentPathFromFirstType( const OUString& rType );
/** Imports a fragment using the passed fragment handler, which contains
the full path to the fragment stream.
@@ -114,7 +114,7 @@ public:
fragment could be imported.
*/
::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XDocument> importFragment( const ::rtl::OUString& rFragmentPath );
+ ::com::sun::star::xml::dom::XDocument> importFragment( const OUString& rFragmentPath );
/** Imports a fragment from an xml::dom::XDocument using the
passed fragment handler
@@ -135,7 +135,7 @@ public:
@return The relations collection of the specified fragment.
*/
- RelationsRef importRelations( const ::rtl::OUString& rFragmentPath );
+ RelationsRef importRelations( const OUString& rFragmentPath );
/** Adds new relation.
@@ -147,7 +147,7 @@ public:
@return Added relation Id.
*/
- ::rtl::OUString addRelation( const ::rtl::OUString& rType, const ::rtl::OUString& rTarget, bool bExternal = false );
+ OUString addRelation( const OUString& rType, const OUString& rTarget, bool bExternal = false );
/** Adds new relation to part's relations.
@@ -162,7 +162,7 @@ public:
@return Added relation Id.
*/
- ::rtl::OUString addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutputStream, const ::rtl::OUString& rType, const ::rtl::OUString& rTarget, bool bExternal = false );
+ OUString addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false );
/** Returns a stack of used textfields, used by the pptx importer to replace links to slidepages with rhe real page name */
TextFieldStack& getTextFieldStack() const;
@@ -183,8 +183,8 @@ public:
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
openFragmentStream(
- const ::rtl::OUString& rStreamName,
- const ::rtl::OUString& rMediaType );
+ const OUString& rStreamName,
+ const OUString& rMediaType );
/** Opens specified output stream from the base storage with specified
media type and returns new fast serializer for that stream.
@@ -203,16 +203,16 @@ public:
*/
::sax_fastparser::FSHelperPtr
openFragmentStreamWithSerializer(
- const ::rtl::OUString& rStreamName,
- const ::rtl::OUString& rMediaType );
+ const OUString& rStreamName,
+ const OUString& rMediaType );
/** Returns new unique ID for exported document.
@return newly created ID.
*/
inline sal_Int32 GetUniqueId() { return mnMaxDocId++; }
- inline ::rtl::OString GetUniqueIdOString() { return ::rtl::OString::valueOf( mnMaxDocId++ ); }
- inline ::rtl::OUString GetUniqueIdOUString() { return ::rtl::OUString::valueOf( mnMaxDocId++ ); }
+ inline OString GetUniqueIdOString() { return OString::valueOf( mnMaxDocId++ ); }
+ inline OUString GetUniqueIdOUString() { return OUString::valueOf( mnMaxDocId++ ); }
/** Write the document properties into into the current OPC package.
@@ -222,9 +222,9 @@ public:
*/
XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties );
- ::rtl::OUString getNamespaceURL( const ::rtl::OUString& rPrefix );
+ OUString getNamespaceURL( const OUString& rPrefix );
- sal_Int32 getNamespaceId( const ::rtl::OUString& rUrl );
+ sal_Int32 getNamespaceId( const OUString& rUrl );
void importDocumentProperties();
diff --git a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx b/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
index 3ec86d902e77..218e7bf4406e 100644
--- a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
@@ -48,7 +48,7 @@ template< typename ModelType >
class FragmentBase : public ::oox::core::FragmentHandler2
{
public:
- explicit FragmentBase( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, ModelType& rModel ) :
+ explicit FragmentBase( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, ModelType& rModel ) :
::oox::core::FragmentHandler2( rFilter, rFragmentPath, false ), mrModel( rModel ) {}
virtual ~FragmentBase() {}
diff --git a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
index 292b7161a0be..43d27f586514 100644
--- a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
@@ -61,7 +61,7 @@ public:
/** Imports the absolute anchor size from the cdr:ext element. */
void importExt( const AttributeList& rAttribs );
/** Sets an the relative anchor position from the cdr:from or cdr:to element. */
- void setPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue );
+ void setPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue );
/** Calculates the resulting shape anchor in EMUs. */
EmuRectangle calcAnchorRectEmu( const EmuRectangle& rChartRect ) const;
@@ -84,7 +84,7 @@ class ChartDrawingFragment : public ::oox::core::FragmentHandler2
public:
explicit ChartDrawingFragment(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxDrawPage,
const ::com::sun::star::awt::Size& rChartSize,
const ::com::sun::star::awt::Point& rShapesOffset,
@@ -92,7 +92,7 @@ public:
virtual ~ChartDrawingFragment();
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:
diff --git a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx b/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
index 3c89a33f7f06..c9b1e0c6b776 100644
--- a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
+++ b/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
@@ -37,7 +37,7 @@ class ChartSpaceFragment : public FragmentBase< ChartSpaceModel >
public:
explicit ChartSpaceFragment(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
ChartSpaceModel& rModel );
virtual ~ChartSpaceFragment();
diff --git a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx b/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
index 29ae93f8c058..b3d3405c4670 100644
--- a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
+++ b/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
@@ -49,7 +49,7 @@ struct ChartSpaceModel
View3DRef mxView3D; /// 3D settings.
TitleRef mxTitle; /// Chart main title.
LegendRef mxLegend; /// Chart legend.
- ::rtl::OUString maDrawingPath; /// Path to drawing fragment with embedded shapes.
+ OUString maDrawingPath; /// Path to drawing fragment with embedded shapes.
sal_Int32 mnDispBlanksAs; /// Mode how to display blank values.
sal_Int32 mnStyle; /// Index to default formatting.
bool mbAutoTitleDel; /// True = automatic title deleted manually.
diff --git a/oox/inc/oox/drawingml/chart/converterbase.hxx b/oox/inc/oox/drawingml/chart/converterbase.hxx
index 8ee81d40a678..21a03441e803 100644
--- a/oox/inc/oox/drawingml/chart/converterbase.hxx
+++ b/oox/inc/oox/drawingml/chart/converterbase.hxx
@@ -67,7 +67,7 @@ public:
/** Creates an instance for the passed service name, using the process service factory. */
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- createInstance( const ::rtl::OUString& rServiceName ) const;
+ createInstance( const OUString& rServiceName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
getComponentContext() const;
diff --git a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx b/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
index 948096f5f6a7..163b99c868e4 100644
--- a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
+++ b/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
@@ -43,7 +43,7 @@ public:
virtual ~DoubleSequenceContext();
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:
sal_Int32 mnPtIndex; /// Current data point index.
@@ -61,7 +61,7 @@ public:
virtual ~StringSequenceContext();
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:
sal_Int32 mnPtIndex; /// Current data point index.
diff --git a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx b/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
index 27c63ef7e1f5..e8b5649e1bef 100644
--- a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
@@ -42,7 +42,7 @@ public:
/** Creates a data sequence object from the contained formula link. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
- createDataSequence( const ::rtl::OUString& rRole );
+ createDataSequence( const OUString& rRole );
};
// ============================================================================
@@ -57,7 +57,7 @@ public:
/** Creates a data sequence object from the contained series data. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
- createDataSequence( const ::rtl::OUString& rRole );
+ createDataSequence( const OUString& rRole );
};
// ============================================================================
diff --git a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx b/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
index 807d96b75de1..d43048ef071c 100644
--- a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
+++ b/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
@@ -34,8 +34,8 @@ struct DataSequenceModel
typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > AnyMap;
AnyMap maData; /// Map of values, indexed by point identifier.
- ::rtl::OUString maFormula; /// Formula reference, e.g. into a spreadsheet.
- ::rtl::OUString maFormatCode; /// Number format for double values.
+ OUString maFormula; /// Formula reference, e.g. into a spreadsheet.
+ OUString maFormatCode; /// Number format for double values.
sal_Int32 mnPointCount; /// Number of points in this series source.
explicit DataSequenceModel();
diff --git a/oox/inc/oox/drawingml/chart/modelbase.hxx b/oox/inc/oox/drawingml/chart/modelbase.hxx
index 52762621968c..985221ec394b 100644
--- a/oox/inc/oox/drawingml/chart/modelbase.hxx
+++ b/oox/inc/oox/drawingml/chart/modelbase.hxx
@@ -96,7 +96,7 @@ private:
struct NumberFormat
{
- ::rtl::OUString maFormatCode; /// Number format code.
+ OUString maFormatCode; /// Number format code.
bool mbSourceLinked; /// True = number format linked to source data.
explicit NumberFormat();
diff --git a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx b/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
index bdc10808f54a..6796ffbd6a1c 100644
--- a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
@@ -79,14 +79,14 @@ public:
void convertPositionFromModel();
/** Returns the automatic chart title if the chart contains only one series. */
- inline const ::rtl::OUString& getAutomaticTitle() const { return maAutoTitle; }
+ inline const OUString& getAutomaticTitle() const { return maAutoTitle; }
/** Returns true, if the chart is three-dimensional. */
inline bool is3dChart() const { return mb3dChart; }
/** Returns true, if chart type supports wall and floor format in 3D mode. */
inline bool isWall3dChart() const { return mbWall3dChart; }
private:
- ::rtl::OUString maAutoTitle;
+ OUString maAutoTitle;
bool mb3dChart;
bool mbWall3dChart;
bool mbPieChart;
diff --git a/oox/inc/oox/drawingml/chart/seriescontext.hxx b/oox/inc/oox/drawingml/chart/seriescontext.hxx
index 79395b0fe420..e31156dd2796 100644
--- a/oox/inc/oox/drawingml/chart/seriescontext.hxx
+++ b/oox/inc/oox/drawingml/chart/seriescontext.hxx
@@ -39,7 +39,7 @@ public:
virtual ~DataLabelContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onCharacters( const ::rtl::OUString& rChars );
+ virtual void onCharacters( const OUString& rChars );
};
// ============================================================================
@@ -55,7 +55,7 @@ public:
virtual ~DataLabelsContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onCharacters( const ::rtl::OUString& rChars );
+ virtual void onCharacters( const OUString& rChars );
};
// ============================================================================
@@ -116,7 +116,7 @@ public:
virtual ~TrendlineContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onCharacters( const ::rtl::OUString& rChars );
+ virtual void onCharacters( const OUString& rChars );
};
// ============================================================================
diff --git a/oox/inc/oox/drawingml/chart/seriesconverter.hxx b/oox/inc/oox/drawingml/chart/seriesconverter.hxx
index 7b74400b950d..073073c5bbe7 100644
--- a/oox/inc/oox/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/seriesconverter.hxx
@@ -140,10 +140,10 @@ public:
/** Creates a labeled data sequence object from category data link. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
- createCategorySequence( const ::rtl::OUString& rRole );
+ createCategorySequence( const OUString& rRole );
/** Creates a labeled data sequence object from value data link. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
- createValueSequence( const ::rtl::OUString& rRole );
+ createValueSequence( const OUString& rRole );
/** Creates a data series object with initialized source links. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >
createDataSeries( const TypeGroupConverter& rTypeGroup, bool bVaryColorsByPoint );
@@ -152,7 +152,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
createLabeledDataSequence(
SeriesModel::SourceType eSourceType,
- const ::rtl::OUString& rRole,
+ const OUString& rRole,
bool bUseTextLabel );
};
diff --git a/oox/inc/oox/drawingml/chart/seriesmodel.hxx b/oox/inc/oox/drawingml/chart/seriesmodel.hxx
index 2a87f0b75361..998065f7f8ad 100644
--- a/oox/inc/oox/drawingml/chart/seriesmodel.hxx
+++ b/oox/inc/oox/drawingml/chart/seriesmodel.hxx
@@ -37,7 +37,7 @@ struct DataLabelModelBase
ShapeRef mxShapeProp; /// Data label frame formatting.
TextBodyRef mxTextProp; /// Data label text formatting.
NumberFormat maNumberFormat; /// Number format for numeric data labels.
- OptValue< ::rtl::OUString > moaSeparator;/// Separator between label components.
+ OptValue< OUString > moaSeparator;/// Separator between label components.
OptValue< sal_Int32 > monLabelPos; /// Data label position.
OptValue< bool > mobShowBubbleSize; /// True = show size of bubbles in bubble charts.
OptValue< bool > mobShowCatName; /// True = show category name of data points.
@@ -148,7 +148,7 @@ struct TrendlineModel
ShapeRef mxShapeProp; /// Trendline formatting.
TrendlineLabelRef mxLabel; /// Trendline label text object.
- ::rtl::OUString maName; /// User-defined name of the trendline.
+ OUString maName; /// User-defined name of the trendline.
OptValue< double > mfBackward; /// Size of trendline before first data point.
OptValue< double > mfForward; /// Size of trendline behind last data point.
OptValue< double > mfIntercept; /// Crossing point with Y axis.
diff --git a/oox/inc/oox/drawingml/chart/titlecontext.hxx b/oox/inc/oox/drawingml/chart/titlecontext.hxx
index 78e3b77c4307..b00a9ed45b6d 100644
--- a/oox/inc/oox/drawingml/chart/titlecontext.hxx
+++ b/oox/inc/oox/drawingml/chart/titlecontext.hxx
@@ -39,7 +39,7 @@ public:
virtual ~TextContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onCharacters( const ::rtl::OUString& rChars );
+ virtual void onCharacters( const OUString& rChars );
};
// ============================================================================
diff --git a/oox/inc/oox/drawingml/chart/titleconverter.hxx b/oox/inc/oox/drawingml/chart/titleconverter.hxx
index 7fb72c455087..ad3694568efe 100644
--- a/oox/inc/oox/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/titleconverter.hxx
@@ -47,11 +47,11 @@ public:
/** Creates a data sequence object from the contained text data. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
- createDataSequence( const ::rtl::OUString& rRole );
+ createDataSequence( const OUString& rRole );
/** Creates a sequence of formatted string objects. */
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >
createStringSequence(
- const ::rtl::OUString& rDefaultText,
+ const OUString& rDefaultText,
const ModelRef< TextBody >& rxTextProp,
ObjectType eObjType );
@@ -59,7 +59,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString >
appendFormattedString(
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& orStringVec,
- const ::rtl::OUString& rString,
+ const OUString& rString,
bool bAddNewLine ) const;
};
@@ -76,7 +76,7 @@ public:
/** Creates a title text object and attaches it at the passed interface. */
void convertFromModel(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitled >& rxTitled,
- const ::rtl::OUString& rAutoTitle, ObjectType eObjType,
+ const OUString& rAutoTitle, ObjectType eObjType,
sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 );
};
diff --git a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx b/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
index e870c20ce790..dfce05065c18 100644
--- a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
@@ -149,7 +149,7 @@ public:
/** Returns true, if this chart type has to reverse its series order. */
bool isReverseSeries() const;
/** Returns series title, if the chart type group contains only one single series. */
- ::rtl::OUString getSingleSeriesTitle() const;
+ OUString getSingleSeriesTitle() const;
/** Creates a coordinate system according to the contained chart type. */
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index ec41bb1b4c01..e44f20db95e2 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -50,8 +50,8 @@ typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
struct CustomShapeGuide
{
- rtl::OUString maName;
- rtl::OUString maFormula;
+ OUString maName;
+ OUString maFormula;
};
struct AdjustHandle
@@ -61,12 +61,12 @@ struct AdjustHandle
pos;
// depending to the type (polar or not):
- OptValue< rtl::OUString > gdRef1; // gdRefX or gdRefR
+ OptValue< OUString > gdRef1; // gdRefX or gdRefR
OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
min1; // minX or minR
OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
max1; // maxX or maxR
- OptValue< rtl::OUString > gdRef2; // gdRefY or gdRefAng
+ OptValue< OUString > gdRef2; // gdRefY or gdRefAng
OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
min2; // minX or minAng
OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter >
@@ -133,7 +133,7 @@ public:
const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape);
sal_Int32 getShapePresetType() const { return mnShapePresetType; }
- ::rtl::OUString getShapePresetTypeName() const;
+ OUString getShapePresetTypeName() const;
void setShapePresetType( sal_Int32 nShapePresetType ){ mnShapePresetType = nShapePresetType; };
std::vector< CustomShapeGuide >& getAdjustmentGuideList(){ return maAdjustmentGuideList; };
@@ -148,7 +148,7 @@ public:
void setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; };
static sal_Int32 SetCustomShapeGuideValue( std::vector< CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide );
- static sal_Int32 GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const rtl::OUString& rFormulaName );
+ static sal_Int32 GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const OUString& rFormulaName );
sal_Int32 getArcNum() { return mnArcNum++; }
diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx b/oox/inc/oox/drawingml/diagram/diagram.hxx
index f8a4b39bf4b6..e37c1a44e42f 100644
--- a/oox/inc/oox/drawingml/diagram/diagram.hxx
+++ b/oox/inc/oox/drawingml/diagram/diagram.hxx
@@ -36,10 +36,10 @@ namespace oox { namespace drawingml {
*/
void loadDiagram( ShapePtr& pShape,
core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rDataModelPath,
- const ::rtl::OUString& rLayoutPath,
- const ::rtl::OUString& rQStylePath,
- const ::rtl::OUString& rColorStylePath );
+ const OUString& rDataModelPath,
+ const OUString& rLayoutPath,
+ const OUString& rQStylePath,
+ const OUString& rColorStylePath );
void loadDiagram( const ShapePtr& pShape,
core::XmlFilterBase& rFilter,
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/oox/inc/oox/drawingml/drawingmltypes.hxx
index d7e0ac610c22..5df664ee66a4 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/oox/inc/oox/drawingml/drawingmltypes.hxx
@@ -97,19 +97,19 @@ com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::
sal_Int32 GetCoordinate( sal_Int32 nValue );
/** converts an emu string into 1/100th mmm */
-sal_Int32 GetCoordinate( const ::rtl::OUString& sValue );
+sal_Int32 GetCoordinate( const OUString& sValue );
/** converts a ST_Percentage % string into 1/1000th of % */
-sal_Int32 GetPercent( const ::rtl::OUString& sValue );
+sal_Int32 GetPercent( const OUString& sValue );
/** Converts a ST_PositiveFixedPercentage to a float. 1.0 == 100% */
-double GetPositiveFixedPercentage( const ::rtl::OUString& sValue );
+double GetPositiveFixedPercentage( const OUString& sValue );
/** converts the ST_TextFontSize to point */
-float GetTextSize( const ::rtl::OUString& rValue );
+float GetTextSize( const OUString& rValue );
/** converts the ST_TextSpacingPoint to 1/100mm */
-sal_Int32 GetTextSpacingPoint( const ::rtl::OUString& sValue );
+sal_Int32 GetTextSpacingPoint( const OUString& sValue );
sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue );
/** */
diff --git a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx b/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx
index 5b0f285cd11e..97cebd54947b 100644
--- a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx
+++ b/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx
@@ -34,8 +34,8 @@ namespace oox { namespace drawingml {
{
}
bool mbBuiltIn;
- ::rtl::OUString msName;
- ::rtl::OUString msEmbed;
+ OUString msName;
+ OUString msEmbed;
};
void getEmbeddedWAVAudioFile(
diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/oox/inc/oox/drawingml/graphicshapecontext.hxx
index 95e79a107d46..c5984d503363 100644
--- a/oox/inc/oox/drawingml/graphicshapecontext.hxx
+++ b/oox/inc/oox/drawingml/graphicshapecontext.hxx
@@ -76,10 +76,10 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
private:
- ::rtl::OUString msDm;
- ::rtl::OUString msLo;
- ::rtl::OUString msQs;
- ::rtl::OUString msCs;
+ OUString msDm;
+ OUString msLo;
+ OUString msQs;
+ OUString msCs;
};
// ====================================================================
diff --git a/oox/inc/oox/drawingml/guidcontext.hxx b/oox/inc/oox/drawingml/guidcontext.hxx
index 0ad3bd135e80..8a60bf20ab5c 100644
--- a/oox/inc/oox/drawingml/guidcontext.hxx
+++ b/oox/inc/oox/drawingml/guidcontext.hxx
@@ -28,12 +28,12 @@ namespace oox { namespace drawingml {
{
public:
- GuidContext( ::oox::core::ContextHandler& rParent, rtl::OUString& rGuidId );
- virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ GuidContext( ::oox::core::ContextHandler& rParent, OUString& rGuidId );
+ virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
private:
- rtl::OUString& mrGuidId;
+ OUString& mrGuidId;
};
} }
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index 88d37b3df25a..f8a58ec5340b 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -44,7 +44,7 @@ namespace oox { namespace drawingml {
class CustomShapeProperties;
typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
-typedef ::std::map< ::rtl::OUString, ShapePtr > ShapeIdMap;
+typedef ::std::map< OUString, ShapePtr > ShapeIdMap;
struct ShapeStyleRef
{
@@ -59,7 +59,7 @@ typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap;
/** Additional information for a chart embedded in a drawing shape. */
struct ChartShapeInfo
{
- ::rtl::OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts.
+ OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts.
bool mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage.
inline explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {}
@@ -76,7 +76,7 @@ public:
explicit Shape( const ShapePtr& pSourceShape );
virtual ~Shape();
- rtl::OUString& getServiceName(){ return msServiceName; }
+ OUString& getServiceName(){ return msServiceName; }
void setServiceName( const sal_Char* pServiceName );
PropertyMap& getShapeProperties(){ return maShapeProperties; }
@@ -114,10 +114,10 @@ public:
void addChild( const ShapePtr pChildPtr ) { maChildren.push_back( pChildPtr ); }
std::vector< ShapePtr >& getChildren() { return maChildren; }
- void setName( const rtl::OUString& rName ) { msName = rName; }
- ::rtl::OUString getName( ) { return msName; }
- void setId( const rtl::OUString& rId ) { msId = rId; }
- ::rtl::OUString getId() { return msId; }
+ void setName( const OUString& rName ) { msName = rName; }
+ OUString getName( ) { return msName; }
+ void setId( const OUString& rId ) { msId = rId; }
+ OUString getId() { return msId; }
void setHidden( sal_Bool bHidden ) { mbHidden = bHidden; }
sal_Bool getHidden() const { return mbHidden; };
void setHiddenMasterShape( sal_Bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; }
@@ -169,16 +169,16 @@ public:
getXShape() const { return mxShape; }
virtual void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true );
- const ::std::vector<rtl::OUString>&
+ const ::std::vector<OUString>&
getExtDrawings() { return maExtDrawings; }
- void addExtDrawingRelId( const ::rtl::OUString &rRelId ) { maExtDrawings.push_back( rRelId ); }
+ void addExtDrawingRelId( const OUString &rRelId ) { maExtDrawings.push_back( rRelId ); }
protected:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
createAndInsert(
::oox::core::XmlFilterBase& rFilterBase,
- const ::rtl::OUString& rServiceName,
+ const OUString& rServiceName,
const Theme* pTheme,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle* pShapeRect,
@@ -197,9 +197,9 @@ protected:
ShapeIdMap* pShapeMap,
basegfx::B2DHomMatrix& aTransformation );
- virtual ::rtl::OUString finalizeServiceName(
+ virtual OUString finalizeServiceName(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rServiceName,
+ const OUString& rServiceName,
const ::com::sun::star::awt::Rectangle& rShapeRect );
virtual void finalizeXShape(
@@ -226,9 +226,9 @@ protected:
TextListStylePtr mpMasterTextListStyle;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
- rtl::OUString msServiceName;
- rtl::OUString msName;
- rtl::OUString msId;
+ OUString msServiceName;
+ OUString msName;
+ OUString msId;
sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder
OptValue< sal_Int32 > moSubTypeIndex;
@@ -236,7 +236,7 @@ protected:
com::sun::star::awt::Size maSize;
com::sun::star::awt::Point maPosition;
- ::std::vector<rtl::OUString> maExtDrawings;
+ ::std::vector<OUString> maExtDrawings;
private:
enum FrameType
diff --git a/oox/inc/oox/drawingml/shape3dproperties.hxx b/oox/inc/oox/drawingml/shape3dproperties.hxx
index e01f6659b727..d1891402757c 100644
--- a/oox/inc/oox/drawingml/shape3dproperties.hxx
+++ b/oox/inc/oox/drawingml/shape3dproperties.hxx
@@ -38,20 +38,20 @@ namespace drawingml {
struct Shape3DPropertyNames
{
- ::rtl::OUString maFillStyle;
- ::rtl::OUString maFillColor;
- ::rtl::OUString maFillTransparence;
- ::rtl::OUString maFillGradient;
- ::rtl::OUString maFillBitmap;
- ::rtl::OUString maFillBitmapMode;
- ::rtl::OUString maFillBitmapTile;
- ::rtl::OUString maFillBitmapStretch;
- ::rtl::OUString maFillBitmapLogicalSize;
- ::rtl::OUString maFillBitmapSizeX;
- ::rtl::OUString maFillBitmapSizeY;
- ::rtl::OUString maFillBitmapOffsetX;
- ::rtl::OUString maFillBitmapOffsetY;
- ::rtl::OUString maFillBitmapRectanglePoint;
+ OUString maFillStyle;
+ OUString maFillColor;
+ OUString maFillTransparence;
+ OUString maFillGradient;
+ OUString maFillBitmap;
+ OUString maFillBitmapMode;
+ OUString maFillBitmapTile;
+ OUString maFillBitmapStretch;
+ OUString maFillBitmapLogicalSize;
+ OUString maFillBitmapSizeX;
+ OUString maFillBitmapSizeY;
+ OUString maFillBitmapOffsetX;
+ OUString maFillBitmapOffsetY;
+ OUString maFillBitmapRectanglePoint;
bool mbNamedFillGradient;
bool mbNamedFillBitmap;
bool mbTransformGraphic;
diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/oox/inc/oox/drawingml/shapepropertymap.hxx
index 994c0326139c..a5cc12f5484c 100644
--- a/oox/inc/oox/drawingml/shapepropertymap.hxx
+++ b/oox/inc/oox/drawingml/shapepropertymap.hxx
@@ -102,7 +102,7 @@ public:
/** Returns true, if named line markers are supported, and the specified
line marker has already been inserted into the marker table. */
- bool hasNamedLineMarkerInTable( const ::rtl::OUString& rMarkerName ) const;
+ bool hasNamedLineMarkerInTable( const OUString& rMarkerName ) const;
/** Sets the specified shape property to the passed value. */
bool setAnyProperty( ShapePropertyId ePropId, const ::com::sun::star::uno::Any& rValue );
diff --git a/oox/inc/oox/drawingml/table/tableproperties.hxx b/oox/inc/oox/drawingml/table/tableproperties.hxx
index e1479c07fc7f..8c584b1f8959 100644
--- a/oox/inc/oox/drawingml/table/tableproperties.hxx
+++ b/oox/inc/oox/drawingml/table/tableproperties.hxx
@@ -42,7 +42,7 @@ public:
std::vector< sal_Int32 >& getTableGrid() { return mvTableGrid; };
std::vector< TableRow >& getTableRows() { return mvTableRows; };
- rtl::OUString& getStyleId(){ return maStyleId; };
+ OUString& getStyleId(){ return maStyleId; };
boost::shared_ptr< TableStyle >& getTableStyle(){ return mpTableStyle; };
sal_Bool& isRtl(){ return mbRtl; };
sal_Bool& isFirstRow(){ return mbFirstRow; };
@@ -59,7 +59,7 @@ private:
const TableStyle& getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase );
- rtl::OUString maStyleId; // either StyleId is available
+ OUString maStyleId; // either StyleId is available
boost::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle
std::vector< sal_Int32 > mvTableGrid;
std::vector< TableRow > mvTableRows;
diff --git a/oox/inc/oox/drawingml/table/tablestyle.hxx b/oox/inc/oox/drawingml/table/tablestyle.hxx
index 66bbf0c7a1f3..b31b5891a32b 100644
--- a/oox/inc/oox/drawingml/table/tablestyle.hxx
+++ b/oox/inc/oox/drawingml/table/tablestyle.hxx
@@ -33,8 +33,8 @@ public:
TableStyle();
~TableStyle();
- rtl::OUString& getStyleId(){ return maStyleId; }
- rtl::OUString& getStyleName() { return maStyleName; }
+ OUString& getStyleId(){ return maStyleId; }
+ OUString& getStyleName() { return maStyleName; }
::oox::drawingml::ShapeStyleRef& getBackgroundFillStyleRef(){ return maFillStyleRef; }
@@ -56,8 +56,8 @@ public:
private:
- rtl::OUString maStyleId;
- rtl::OUString maStyleName;
+ OUString maStyleId;
+ OUString maStyleName;
::oox::drawingml::ShapeStyleRef maFillStyleRef;
diff --git a/oox/inc/oox/drawingml/table/tablestylelist.hxx b/oox/inc/oox/drawingml/table/tablestylelist.hxx
index 16d95a3e61eb..320609d064d9 100644
--- a/oox/inc/oox/drawingml/table/tablestylelist.hxx
+++ b/oox/inc/oox/drawingml/table/tablestylelist.hxx
@@ -35,12 +35,12 @@ public:
TableStyleList();
~TableStyleList();
- rtl::OUString& getDefaultStyleId() { return maDefaultStyleId; };
+ OUString& getDefaultStyleId() { return maDefaultStyleId; };
std::vector< TableStyle >& getTableStyles(){ return maTableStyles; };
private:
- rtl::OUString maDefaultStyleId;
+ OUString maDefaultStyleId;
std::vector< TableStyle > maTableStyles;
};
diff --git a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx
index b26439d5e334..d6ef77f8614c 100644
--- a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx
@@ -34,7 +34,7 @@ class TableStyleListFragmentHandler : public ::oox::core::FragmentHandler2
public:
explicit TableStyleListFragmentHandler(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
TableStyleList& rTableStyleList );
virtual ~TableStyleListFragmentHandler();
diff --git a/oox/inc/oox/drawingml/textbodycontext.hxx b/oox/inc/oox/drawingml/textbodycontext.hxx
index 7b21718d72a4..d46272e853a6 100644
--- a/oox/inc/oox/drawingml/textbodycontext.hxx
+++ b/oox/inc/oox/drawingml/textbodycontext.hxx
@@ -49,7 +49,7 @@ public:
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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 characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
protected:
TextRunPtr mpRunPtr;
diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx b/oox/inc/oox/drawingml/textcharacterproperties.hxx
index 3dc40621695a..99792fe7725d 100644
--- a/oox/inc/oox/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/oox/drawingml/textcharacterproperties.hxx
@@ -42,7 +42,7 @@ struct TextCharacterProperties
Color maCharColor;
Color maUnderlineColor;
Color maHighlightColor;
- OptValue< ::rtl::OUString > moLang;
+ OptValue< OUString > moLang;
OptValue< sal_Int32 > moHeight;
OptValue< sal_Int32 > moSpacing;
OptValue< sal_Int32 > moUnderline;
diff --git a/oox/inc/oox/drawingml/textfield.hxx b/oox/inc/oox/drawingml/textfield.hxx
index dc1c4f938966..df98b0302560 100644
--- a/oox/inc/oox/drawingml/textfield.hxx
+++ b/oox/inc/oox/drawingml/textfield.hxx
@@ -38,8 +38,8 @@ public:
inline TextParagraphProperties& getTextParagraphProperties() { return maTextParagraphProperties; }
inline const TextParagraphProperties& getTextParagraphProperties() const { return maTextParagraphProperties; }
- inline void setType( const ::rtl::OUString& sType ) { msType = sType; }
- inline void setUuid( const ::rtl::OUString & sUuid ) { msUuid = sUuid; }
+ inline void setType( const OUString& sType ) { msType = sType; }
+ inline void setUuid( const OUString & sUuid ) { msUuid = sUuid; }
virtual sal_Int32 insertAt(
const ::oox::core::XmlFilterBase& rFilterBase,
@@ -49,8 +49,8 @@ public:
private:
TextParagraphProperties maTextParagraphProperties;
- ::rtl::OUString msType;
- ::rtl::OUString msUuid;
+ OUString msType;
+ OUString msUuid;
};
typedef boost::shared_ptr< TextField > TextFieldPtr;
diff --git a/oox/inc/oox/drawingml/textfieldcontext.hxx b/oox/inc/oox/drawingml/textfieldcontext.hxx
index 8b64b420be66..3a50ea93620f 100644
--- a/oox/inc/oox/drawingml/textfieldcontext.hxx
+++ b/oox/inc/oox/drawingml/textfieldcontext.hxx
@@ -34,7 +34,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rXAttributes,
TextField& rTextField);
virtual void SAL_CALL endFastElement( sal_Int32 aElementToken ) 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 characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
sal_Int32 aElementToken, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rXAttributes )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
diff --git a/oox/inc/oox/drawingml/textfont.hxx b/oox/inc/oox/drawingml/textfont.hxx
index 74adff2015d3..95a7a1716a0d 100644
--- a/oox/inc/oox/drawingml/textfont.hxx
+++ b/oox/inc/oox/drawingml/textfont.hxx
@@ -45,20 +45,20 @@ public:
/** Returns the font name, pitch, and family; tries to resolve theme
placeholder names, e.g. '+mj-lt' for the major latin theme font. */
bool getFontData(
- ::rtl::OUString& rFontName,
+ OUString& rFontName,
sal_Int16& rnFontPitch,
sal_Int16& rnFontFamily,
const ::oox::core::XmlFilterBase& rFilter ) const;
private:
bool implGetFontData(
- ::rtl::OUString& rFontName,
+ OUString& rFontName,
sal_Int16& rnFontPitch,
sal_Int16& rnFontFamily ) const;
private:
- ::rtl::OUString maTypeface;
- ::rtl::OUString maPanose;
+ OUString maTypeface;
+ OUString maPanose;
sal_Int32 mnPitch;
sal_Int32 mnCharset;
};
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx
index 3dacd86831ad..1cb8215a3fc1 100644
--- a/oox/inc/oox/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx
@@ -45,7 +45,7 @@ public:
bool is() const;
void apply( const BulletList& );
void pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, PropertyMap& xPropMap ) const;
- void setBulletChar( const ::rtl::OUString & sChar );
+ void setBulletChar( const OUString & sChar );
void setStartAt( sal_Int32 nStartAt ){ mnStartAt <<= static_cast< sal_Int16 >( nStartAt ); }
void setType( sal_Int32 nType );
void setNone( );
@@ -56,7 +56,7 @@ public:
void setSuffixMinusRight();
void setBulletSize(sal_Int16 nSize);
void setFontSize(sal_Int16 nSize);
- void setStyleName( const rtl::OUString& rStyleName ) { maStyleName <<= rStyleName; }
+ void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; }
void setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic );
::oox::drawingml::ColorPtr maBulletColorPtr;
diff --git a/oox/inc/oox/drawingml/textrun.hxx b/oox/inc/oox/drawingml/textrun.hxx
index 4d14a17d485e..0e215bf68973 100644
--- a/oox/inc/oox/drawingml/textrun.hxx
+++ b/oox/inc/oox/drawingml/textrun.hxx
@@ -33,8 +33,8 @@ public:
TextRun();
virtual ~TextRun();
- inline ::rtl::OUString& getText() { return msText; }
- inline const ::rtl::OUString& getText() const { return msText; }
+ inline OUString& getText() { return msText; }
+ inline const OUString& getText() const { return msText; }
inline TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; }
inline const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; }
@@ -48,7 +48,7 @@ public:
const TextCharacterProperties& rTextCharacterStyle ) const;
private:
- ::rtl::OUString msText;
+ OUString msText;
TextCharacterProperties maTextCharacterProperties;
bool mbIsLineBreak;
};
diff --git a/oox/inc/oox/drawingml/theme.hxx b/oox/inc/oox/drawingml/theme.hxx
index 12bb62be476c..f167c43a4fd4 100644
--- a/oox/inc/oox/drawingml/theme.hxx
+++ b/oox/inc/oox/drawingml/theme.hxx
@@ -48,8 +48,8 @@ public:
explicit Theme();
~Theme();
- inline void setStyleName( const ::rtl::OUString& rStyleName ) { maStyleName = rStyleName; }
- inline const ::rtl::OUString& getStyleName() const { return maStyleName; }
+ inline void setStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; }
+ inline const OUString& getStyleName() const { return maStyleName; }
inline ClrScheme& getClrScheme() { return maClrScheme; }
inline const ClrScheme& getClrScheme() const { return maClrScheme; }
@@ -75,7 +75,7 @@ public:
/** Returns theme font properties by scheme type (major/minor). */
const TextCharacterProperties* getFontStyle( sal_Int32 nSchemeType ) const;
/** Returns theme font by placeholder name, e.g. the major latin theme font for the font name '+mj-lt'. */
- const TextFont* resolveFont( const ::rtl::OUString& rName ) const;
+ const TextFont* resolveFont( const OUString& rName ) const;
inline Shape& getSpDef() { return maSpDef; }
inline const Shape& getSpDef() const { return maSpDef; }
@@ -92,7 +92,7 @@ public:
::com::sun::star::xml::dom::XDocument>& getFragment() const { return mxFragment; }
private:
- ::rtl::OUString maStyleName;
+ OUString maStyleName;
ClrScheme maClrScheme;
FillStyleList maFillStyleList;
FillStyleList maBgFillStyleList;
diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/oox/inc/oox/drawingml/themefragmenthandler.hxx
index a8de3b4ba07e..61062775fa37 100644
--- a/oox/inc/oox/drawingml/themefragmenthandler.hxx
+++ b/oox/inc/oox/drawingml/themefragmenthandler.hxx
@@ -35,7 +35,7 @@ class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2
public:
explicit ThemeFragmentHandler(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
Theme& rTheme );
virtual ~ThemeFragmentHandler();
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 6ba5ab7d4e5c..043bb73ecfa8 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -91,10 +91,10 @@ const sal_Unicode OOX_DUMP_EMPTYVALUE = '~';
const sal_Unicode OOX_DUMP_CMDPROMPT = '?';
const sal_Unicode OOX_DUMP_PLACEHOLDER = '\x01';
-typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > OUStringPair;
+typedef ::std::pair< OUString, OUString > OUStringPair;
typedef ::std::pair< sal_Int64, sal_Int64 > Int64Pair;
-typedef ::std::vector< ::rtl::OUString > OUStringVector;
+typedef ::std::vector< OUString > OUStringVector;
typedef ::std::vector< sal_Int64 > Int64Vector;
// ============================================================================
@@ -106,23 +106,23 @@ class InputOutputHelper
public:
// file names -------------------------------------------------------------
- static ::rtl::OUString convertFileNameToUrl( const ::rtl::OUString& rFileName );
- static sal_Int32 getFileNamePos( const ::rtl::OUString& rFileUrl );
- static ::rtl::OUString getFileNameExtension( const ::rtl::OUString& rFileUrl );
+ static OUString convertFileNameToUrl( const OUString& rFileName );
+ static sal_Int32 getFileNamePos( const OUString& rFileUrl );
+ static OUString getFileNameExtension( const OUString& rFileUrl );
// input streams ----------------------------------------------------------
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
openInputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& rFileName );
+ const OUString& rFileName );
// output streams ---------------------------------------------------------
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
openOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& rFileName );
+ const OUString& rFileName );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
openTextOutputStream(
@@ -133,7 +133,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 >
openTextOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& rFileName,
+ const OUString& rFileName,
rtl_TextEncoding eTextEnc );
};
@@ -214,12 +214,12 @@ struct ItemFormat
{
DataType meDataType; ///< Data type of the item.
FormatType meFmtType; ///< Output format for the value.
- ::rtl::OUString maItemName; ///< Name of the item.
- ::rtl::OUString maListName; ///< Name of a name list to be used for this item.
+ OUString maItemName; ///< Name of the item.
+ OUString maListName; ///< Name of a name list to be used for this item.
explicit ItemFormat();
- void set( DataType eDataType, FormatType eFmtType, const ::rtl::OUString& rItemName );
+ void set( DataType eDataType, FormatType eFmtType, const OUString& rItemName );
/** Initializes the struct from a vector of strings containing the item format.
@@ -246,7 +246,7 @@ struct ItemFormat
@return List containing remaining unhandled format strings.
*/
- OUStringVector parse( const ::rtl::OUString& rFormatStr );
+ OUStringVector parse( const OUString& rFormatStr );
};
// ============================================================================
@@ -300,120 +300,120 @@ class StringHelper
public:
// append string to string ------------------------------------------------
- static void appendChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1 );
- static void appendString( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1 );
+ static void appendString( OUStringBuffer& rStr, const OUString& rData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
// append decimal ---------------------------------------------------------
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
- static void appendDec( ::rtl::OUStringBuffer& rStr, double fData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_uInt8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_Int8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_uInt16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_Int16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, sal_Int64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
+ static void appendDec( OUStringBuffer& rStr, double fData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' );
// append hexadecimal -----------------------------------------------------
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true );
- static void appendHex( ::rtl::OUStringBuffer& rStr, double fData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true );
+ static void appendHex( OUStringBuffer& rStr, double fData, bool bPrefix = true );
// append shortened hexadecimal -------------------------------------------
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true );
- static void appendShortHex( ::rtl::OUStringBuffer& rStr, double fData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true );
+ static void appendShortHex( OUStringBuffer& rStr, double fData, bool bPrefix = true );
// append binary ----------------------------------------------------------
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, bool bDots = true );
- static void appendBin( ::rtl::OUStringBuffer& rStr, double fData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_uInt8 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_Int8 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_uInt16 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_Int16 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_uInt32 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_Int32 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_uInt64 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, sal_Int64 nData, bool bDots = true );
+ static void appendBin( OUStringBuffer& rStr, double fData, bool bDots = true );
// append fixed-point decimal ---------------------------------------------
template< typename Type >
- static void appendFix( ::rtl::OUStringBuffer& rStr, Type nData, sal_Int32 nWidth = 0 );
+ static void appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth = 0 );
// append formatted value -------------------------------------------------
- static void appendBool( ::rtl::OUStringBuffer& rStr, bool bData );
+ static void appendBool( OUStringBuffer& rStr, bool bData );
template< typename Type >
- static void appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatType eFmtType );
+ static void appendValue( OUStringBuffer& rStr, Type nData, FormatType eFmtType );
// encoded text output ----------------------------------------------------
- static void appendCChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix = true );
- static void appendEncChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1, bool bPrefix = true );
- static void appendEncString( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rData, bool bPrefix = true );
+ static void appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix = true );
+ static void appendEncChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1, bool bPrefix = true );
+ static void appendEncString( OUStringBuffer& rStr, const OUString& rData, bool bPrefix = true );
// token list -------------------------------------------------------------
- static void appendToken( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
+ static void appendToken( OUStringBuffer& rStr, const OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
- static void appendIndex( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rIdx );
- static void appendIndex( ::rtl::OUStringBuffer& rStr, sal_Int64 nIdx );
+ static void appendIndex( OUStringBuffer& rStr, const OUString& rIdx );
+ static void appendIndex( OUStringBuffer& rStr, sal_Int64 nIdx );
- static ::rtl::OUString getToken( const ::rtl::OUString& rData, sal_Int32& rnPos, sal_Unicode cSep = OOX_DUMP_LISTSEP );
+ static OUString getToken( const OUString& rData, sal_Int32& rnPos, sal_Unicode cSep = OOX_DUMP_LISTSEP );
/** Encloses the passed string with the passed characters. Uses cOpen, if cClose is NUL. */
- static void enclose( ::rtl::OUStringBuffer& rStr, sal_Unicode cOpen, sal_Unicode cClose = '\0' );
+ static void enclose( OUStringBuffer& rStr, sal_Unicode cOpen, sal_Unicode cClose = '\0' );
// string conversion ------------------------------------------------------
- static ::rtl::OUString trimSpaces( const ::rtl::OUString& rStr );
- static ::rtl::OUString trimTrailingNul( const ::rtl::OUString& rStr );
+ static OUString trimSpaces( const OUString& rStr );
+ static OUString trimTrailingNul( const OUString& rStr );
- static ::rtl::OString convertToUtf8( const ::rtl::OUString& rStr );
- static DataType convertToDataType( const ::rtl::OUString& rStr );
- static FormatType convertToFormatType( const ::rtl::OUString& rStr );
+ static OString convertToUtf8( const OUString& rStr );
+ static DataType convertToDataType( const OUString& rStr );
+ static FormatType convertToFormatType( const OUString& rStr );
- static bool convertFromDec( sal_Int64& ornData, const ::rtl::OUString& rData );
- static bool convertFromHex( sal_Int64& ornData, const ::rtl::OUString& rData );
+ static bool convertFromDec( sal_Int64& ornData, const OUString& rData );
+ static bool convertFromHex( sal_Int64& ornData, const OUString& rData );
- static bool convertStringToInt( sal_Int64& ornData, const ::rtl::OUString& rData );
- static bool convertStringToDouble( double& orfData, const ::rtl::OUString& rData );
- static bool convertStringToBool( const ::rtl::OUString& rData );
+ static bool convertStringToInt( sal_Int64& ornData, const OUString& rData );
+ static bool convertStringToDouble( double& orfData, const OUString& rData );
+ static bool convertStringToBool( const OUString& rData );
- static OUStringPair convertStringToPair( const ::rtl::OUString& rString, sal_Unicode cSep = '=' );
+ static OUStringPair convertStringToPair( const OUString& rString, sal_Unicode cSep = '=' );
// string to list conversion ----------------------------------------------
- static void convertStringToStringList( OUStringVector& orVec, const ::rtl::OUString& rData, bool bIgnoreEmpty );
- static void convertStringToIntList( Int64Vector& orVec, const ::rtl::OUString& rData, bool bIgnoreEmpty );
+ static void convertStringToStringList( OUStringVector& orVec, const OUString& rData, bool bIgnoreEmpty );
+ static void convertStringToIntList( Int64Vector& orVec, const OUString& rData, bool bIgnoreEmpty );
};
// ----------------------------------------------------------------------------
template< typename Type >
-void StringHelper::appendFix( ::rtl::OUStringBuffer& rStr, Type nData, sal_Int32 nWidth )
+void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth )
{
appendDec( rStr, static_cast< double >( nData ) / pow( 2.0, 4.0 * sizeof( Type ) ), nWidth );
}
template< typename Type >
-void StringHelper::appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatType eFmtType )
+void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFmtType )
{
switch( eFmtType )
{
@@ -429,16 +429,16 @@ void StringHelper::appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatT
// ============================================================================
-class String : public ::rtl::OUString
+class String : public OUString
{
public:
inline String() {}
- inline /*implicit*/ String( const ::rtl::OUString& rStr ) : ::rtl::OUString( rStr ) {}
- inline /*implicit*/ String( const sal_Char* pcStr ) : ::rtl::OUString( ::rtl::OUString::createFromAscii( pcStr ? pcStr : "" ) ) {}
- inline /*implicit*/ String( sal_Unicode cChar ) : ::rtl::OUString( cChar ) {}
+ inline /*implicit*/ String( const OUString& rStr ) : OUString( rStr ) {}
+ inline /*implicit*/ String( const sal_Char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {}
+ inline /*implicit*/ String( sal_Unicode cChar ) : OUString( cChar ) {}
inline bool has() const { return getLength() > 0; }
- inline ::rtl::OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); }
+ inline OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); }
};
static const String EMPTY_STRING;
@@ -526,13 +526,13 @@ protected:
virtual void implProcessConfigItemStr(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
virtual void implProcessConfigItemInt(
TextInputStream& rStrm,
sal_Int64 nKey,
- const ::rtl::OUString& rData );
+ const OUString& rData );
void readConfigBlockContents(
TextInputStream& rStrm );
@@ -542,13 +542,13 @@ private:
LineType readConfigLine(
TextInputStream& rStrm,
- ::rtl::OUString& orKey,
- ::rtl::OUString& orData ) const;
+ OUString& orKey,
+ OUString& orData ) const;
void processConfigItem(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
};
// ============================================================================
@@ -570,7 +570,7 @@ typedef ::boost::shared_ptr< NameListBase > NameListRef;
class NameListBase : public Base, public ConfigItemBase
{
public:
- typedef ::std::map< sal_Int64, ::rtl::OUString > OUStringMap;
+ typedef ::std::map< sal_Int64, OUString > OUStringMap;
typedef OUStringMap::const_iterator const_iterator;
public:
@@ -589,11 +589,11 @@ public:
/** Returns the name for the passed key. */
template< typename Type >
- inline ::rtl::OUString getName( const Config& rCfg, Type nKey ) const
+ inline OUString getName( const Config& rCfg, Type nKey ) const
{ return implGetName( rCfg, static_cast< sal_Int64 >( nKey ) ); }
/** Returns a display name for the passed double value. */
- inline ::rtl::OUString getName( const Config& rCfg, double fValue ) const
+ inline OUString getName( const Config& rCfg, double fValue ) const
{ return implGetNameDbl( rCfg, fValue ); }
/** Returns a map iterator pointing to the first contained name. */
@@ -608,33 +608,33 @@ protected:
virtual void implProcessConfigItemStr(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
virtual void implProcessConfigItemInt(
TextInputStream& rStrm,
sal_Int64 nKey,
- const ::rtl::OUString& rData );
+ const OUString& rData );
/** Derived classes set the name for the passed key. */
- virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ) = 0;
+ virtual void implSetName( sal_Int64 nKey, const OUString& rName ) = 0;
/** Derived classes generate and return the name for the passed key. */
- virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const = 0;
+ virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const = 0;
/** Derived classes generate and return the name for the passed double value. */
- virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const = 0;
+ virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const = 0;
/** Derived classes insert all names and other settings from the passed list. */
virtual void implIncludeList( const NameListBase& rList ) = 0;
/** Inserts the passed name into the internal map. */
- void insertRawName( sal_Int64 nKey, const ::rtl::OUString& rName );
+ void insertRawName( sal_Int64 nKey, const OUString& rName );
/** Returns the name for the passed key, or 0, if nothing found. */
- const ::rtl::OUString* findRawName( sal_Int64 nKey ) const;
+ const OUString* findRawName( sal_Int64 nKey ) const;
private:
/** Includes name lists, given in a comma separated list of names of the lists. */
- void include( const ::rtl::OUString& rListKeys );
+ void include( const OUString& rListKeys );
/** Excludes names from the list, given in a comma separated list of their keys. */
- void exclude( const ::rtl::OUString& rKeys );
+ void exclude( const OUString& rKeys );
private:
OUStringMap maMap;
@@ -656,20 +656,20 @@ public:
protected:
virtual void implProcessConfigItemStr(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
/** Sets the name for the passed key. */
- virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName );
+ virtual void implSetName( sal_Int64 nKey, const OUString& rName );
/** Returns the name for the passed key, or the default name, if key is not contained. */
- virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
+ virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
/** Returns the name for the passed double value. */
- virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const;
+ virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const;
/** Inserts all names from the passed list. */
virtual void implIncludeList( const NameListBase& rList );
private:
- ::rtl::OUString maDefName;
+ OUString maDefName;
bool mbQuoteNames;
};
@@ -685,13 +685,13 @@ public:
protected:
virtual void implProcessConfigItemStr(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
- virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName );
+ virtual void implSetName( sal_Int64 nKey, const OUString& rName );
private:
- void insertNames( sal_Int64 nStartKey, const ::rtl::OUString& rData );
+ void insertNames( sal_Int64 nStartKey, const OUString& rData );
private:
bool mbIgnoreEmpty;
@@ -712,15 +712,15 @@ public:
protected:
virtual void implProcessConfigItemStr(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
/** Sets the name for the passed key. */
- virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName );
+ virtual void implSetName( sal_Int64 nKey, const OUString& rName );
/** Returns the name for the passed key. */
- virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
+ virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
/** Returns the name for the passed double value. */
- virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const;
+ virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const;
/** Inserts all flags from the passed list. */
virtual void implIncludeList( const NameListBase& rList );
@@ -737,9 +737,9 @@ public:
protected:
/** Sets the name for the passed key. */
- virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName );
+ virtual void implSetName( sal_Int64 nKey, const OUString& rName );
/** Returns the name for the passed key. */
- virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
+ virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
/** Inserts all flags from the passed list. */
virtual void implIncludeList( const NameListBase& rList );
@@ -773,16 +773,16 @@ public:
protected:
/** Sets the name for the passed key. */
- virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName );
+ virtual void implSetName( sal_Int64 nKey, const OUString& rName );
/** Returns the converted value with appended unit name. */
- virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
+ virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const;
/** Returns the converted value with appended unit name. */
- virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const;
+ virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const;
/** Empty implementation. */
virtual void implIncludeList( const NameListBase& rList );
private:
- ::rtl::OUString maUnitName;
+ OUString maUnitName;
double mfFactor;
};
@@ -792,7 +792,7 @@ class NameListWrapper
{
public:
inline NameListWrapper() {}
- inline /*implicit*/ NameListWrapper( const ::rtl::OUString& rListName ) : maName( rListName ) {}
+ inline /*implicit*/ NameListWrapper( const OUString& rListName ) : maName( rListName ) {}
inline /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maName( pcListName ) {}
inline /*implicit*/ NameListWrapper( const NameListRef& rxList ) : mxList( rxList ) {}
@@ -824,25 +824,25 @@ class SharedConfigData : public Base, public ConfigItemBase
{
public:
explicit SharedConfigData(
- const ::rtl::OUString& rFileName,
+ const OUString& rFileName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
virtual ~SharedConfigData();
inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; }
inline const StorageRef& getRootStorage() const { return mxRootStrg; }
- inline const ::rtl::OUString& getSysFileName() const { return maSysFileName; }
+ inline const OUString& getSysFileName() const { return maSysFileName; }
- void setOption( const ::rtl::OUString& rKey, const ::rtl::OUString& rData );
- const ::rtl::OUString* getOption( const ::rtl::OUString& rKey ) const;
+ void setOption( const OUString& rKey, const OUString& rData );
+ const OUString* getOption( const OUString& rKey ) const;
template< typename ListType >
- ::boost::shared_ptr< ListType > createNameList( const ::rtl::OUString& rListName );
- void setNameList( const ::rtl::OUString& rListName, const NameListRef& rxList );
- void eraseNameList( const ::rtl::OUString& rListName );
- NameListRef getNameList( const ::rtl::OUString& rListName ) const;
+ ::boost::shared_ptr< ListType > createNameList( const OUString& rListName );
+ void setNameList( const OUString& rListName, const NameListRef& rxList );
+ void eraseNameList( const OUString& rListName );
+ NameListRef getNameList( const OUString& rListName ) const;
inline bool isPasswordCancelled() const { return mbPwCancelled; }
@@ -850,28 +850,28 @@ protected:
virtual bool implIsValid() const;
virtual void implProcessConfigItemStr(
TextInputStream& rStrm,
- const ::rtl::OUString& rKey,
- const ::rtl::OUString& rData );
+ const OUString& rKey,
+ const OUString& rData );
private:
- bool readConfigFile( const ::rtl::OUString& rFileUrl );
+ bool readConfigFile( const OUString& rFileUrl );
template< typename ListType >
- void readNameList( TextInputStream& rStrm, const ::rtl::OUString& rListName );
- void createShortList( const ::rtl::OUString& rData );
- void createUnitConverter( const ::rtl::OUString& rData );
+ void readNameList( TextInputStream& rStrm, const OUString& rListName );
+ void createShortList( const OUString& rData );
+ void createUnitConverter( const OUString& rData );
private:
- typedef ::std::set< ::rtl::OUString > ConfigFileSet;
- typedef ::std::map< ::rtl::OUString, ::rtl::OUString > ConfigDataMap;
- typedef ::std::map< ::rtl::OUString, NameListRef > NameListMap;
+ typedef ::std::set< OUString > ConfigFileSet;
+ typedef ::std::map< OUString, OUString > ConfigDataMap;
+ typedef ::std::map< OUString, NameListRef > NameListMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
StorageRef mxRootStrg;
- ::rtl::OUString maSysFileName;
+ OUString maSysFileName;
ConfigFileSet maConfigFiles;
ConfigDataMap maConfigData;
NameListMap maNameLists;
- ::rtl::OUString maConfigPath;
+ OUString maConfigPath;
bool mbLoaded;
bool mbPwCancelled;
};
@@ -879,7 +879,7 @@ private:
// ----------------------------------------------------------------------------
template< typename ListType >
-::boost::shared_ptr< ListType > SharedConfigData::createNameList( const ::rtl::OUString& rListName )
+::boost::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName )
{
::boost::shared_ptr< ListType > xList;
if( !rListName.isEmpty() )
@@ -891,7 +891,7 @@ template< typename ListType >
}
template< typename ListType >
-void SharedConfigData::readNameList( TextInputStream& rStrm, const ::rtl::OUString& rListName )
+void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rListName )
{
NameListRef xList = createNameList< ListType >( rListName );
if( xList.get() )
@@ -911,15 +911,15 @@ public:
const sal_Char* pcEnvVar,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
virtual ~Config();
inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); }
inline const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); }
- inline const ::rtl::OUString& getSysFileName() const { return mxCfgData->getSysFileName(); }
+ inline const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); }
- const ::rtl::OUString& getStringOption( const String& rKey, const ::rtl::OUString& rDefault ) const;
+ const OUString& getStringOption( const String& rKey, const OUString& rDefault ) const;
bool getBoolOption( const String& rKey, bool bDefault ) const;
template< typename Type >
Type getIntOption( const String& rKey, Type nDefault ) const;
@@ -934,7 +934,7 @@ public:
/** Returns the name for the passed key from the passed name list. */
template< typename Type >
- ::rtl::OUString getName( const NameListWrapper& rListWrp, Type nKey ) const;
+ OUString getName( const NameListWrapper& rListWrp, Type nKey ) const;
/** Returns true, if the passed name list contains an entry for the passed key. */
template< typename Type >
bool hasName( const NameListWrapper& rListWrp, Type nKey ) const;
@@ -951,11 +951,11 @@ protected:
const sal_Char* pcEnvVar,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const StorageRef& rxRootStrg,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
virtual bool implIsValid() const;
- virtual const ::rtl::OUString* implGetOption( const ::rtl::OUString& rKey ) const;
- virtual NameListRef implGetNameList( const ::rtl::OUString& rListName ) const;
+ virtual const OUString* implGetOption( const OUString& rKey ) const;
+ virtual NameListRef implGetNameList( const OUString& rListName ) const;
private:
typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef;
@@ -970,7 +970,7 @@ template< typename Type >
Type Config::getIntOption( const String& rKey, Type nDefault ) const
{
sal_Int64 nRawData;
- const ::rtl::OUString* pData = implGetOption( rKey );
+ const OUString* pData = implGetOption( rKey );
return (pData && StringHelper::convertStringToInt( nRawData, *pData )) ?
static_cast< Type >( nRawData ) : nDefault;
}
@@ -982,7 +982,7 @@ template< typename ListType >
}
template< typename Type >
-::rtl::OUString Config::getName( const NameListWrapper& rListWrp, Type nKey ) const
+OUString Config::getName( const NameListWrapper& rListWrp, Type nKey ) const
{
NameListRef xList = rListWrp.getNameList( *this );
return xList.get() ? xList->getName( *this, nKey ) : OOX_DUMP_ERR_NOMAP;
@@ -1003,13 +1003,13 @@ class Output : public Base
public:
explicit Output(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& rFileName );
+ const OUString& rFileName );
// ------------------------------------------------------------------------
void newLine();
void emptyLine( size_t nCount = 1 );
- inline ::rtl::OUStringBuffer& getLine() { return maLine; }
+ inline OUStringBuffer& getLine() { return maLine; }
void incIndent();
void decIndent();
@@ -1026,7 +1026,7 @@ public:
void startItem( const String& rItemName );
void contItem();
void endItem();
- inline const ::rtl::OUString& getLastItemValue() const { return maLastItem; }
+ inline const OUString& getLastItemValue() const { return maLastItem; }
void startMultiItems();
void endMultiItems();
@@ -1035,7 +1035,7 @@ public:
void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 );
void writeAscii( const sal_Char* pcStr );
- void writeString( const ::rtl::OUString& rStr );
+ void writeString( const OUString& rStr );
void writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
void writeBool( bool bData );
void writeDateTime( const ::com::sun::star::util::DateTime& rDateTime );
@@ -1073,9 +1073,9 @@ private:
typedef ::std::vector< sal_Int32 > StringLenVec;
::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > mxStrm;
- ::rtl::OUString maIndent;
- ::rtl::OUStringBuffer maLine;
- ::rtl::OUString maLastItem;
+ OUString maIndent;
+ OUStringBuffer maLine;
+ OUString maLastItem;
StringLenVec maColPos;
size_t mnCol;
size_t mnItemLevel;
@@ -1164,7 +1164,7 @@ public:
StorageIterator& operator++();
- ::rtl::OUString getName() const;
+ OUString getName() const;
bool isStream() const;
bool isStorage() const;
@@ -1220,7 +1220,7 @@ protected:
protected:
using ObjectBase::construct;
- void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath );
+ void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath );
void construct( const ObjectBase& rParent );
virtual bool implIsValid() const;
@@ -1228,57 +1228,57 @@ protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
virtual void implDumpStorage(
const StorageRef& rxStrg,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rSysPath );
+ const OUString& rStrgPath,
+ const OUString& rSysPath );
virtual void implDumpBaseStream(
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
void addPreferredStream( const String& rStrmName );
void addPreferredStorage( const String& rStrgPath );
private:
- ::rtl::OUString getSysFileName(
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysOutPath );
+ OUString getSysFileName(
+ const OUString& rStrmName,
+ const OUString& rSysOutPath );
void extractStream(
StorageBase& rStrg,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
void extractStorage(
const StorageRef& rxStrg,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rSysPath );
+ const OUString& rStrgPath,
+ const OUString& rSysPath );
void extractItem(
const StorageRef& rxStrg,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rItemName,
- const ::rtl::OUString& rSysPath,
+ const OUString& rStrgPath,
+ const OUString& rItemName,
+ const OUString& rSysPath,
bool bIsStrg, bool bIsStrm );
private:
struct PreferredItem
{
- ::rtl::OUString maName;
+ OUString maName;
bool mbStorage;
- inline explicit PreferredItem( const ::rtl::OUString rName, bool bStorage ) :
+ inline explicit PreferredItem( const OUString rName, bool bStorage ) :
maName( rName ), mbStorage( bStorage ) {}
};
typedef ::std::vector< PreferredItem > PreferredItemVector;
StorageRef mxStrg;
- ::rtl::OUString maSysPath;
+ OUString maSysPath;
PreferredItemVector maPreferred;
};
@@ -1297,7 +1297,7 @@ protected:
inline explicit OutputObjectBase() {}
using ObjectBase::construct;
- void construct( const ObjectBase& rParent, const ::rtl::OUString& rSysFileName );
+ void construct( const ObjectBase& rParent, const OUString& rSysFileName );
void construct( const OutputObjectBase& rParent );
virtual bool implIsValid() const;
@@ -1307,10 +1307,10 @@ protected:
void writeEmptyItem( const String& rName );
void writeInfoItem( const String& rName, const String& rData );
void writeCharItem( const String& rName, sal_Unicode cData );
- void writeStringItem( const String& rName, const ::rtl::OUString& rData );
+ void writeStringItem( const String& rName, const OUString& rData );
void writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
void writeDateTimeItem( const String& rName, const ::com::sun::star::util::DateTime& rDateTime );
- void writeGuidItem( const String& rName, const ::rtl::OUString& rGuid );
+ void writeGuidItem( const String& rName, const OUString& rGuid );
template< typename Type >
void addNameToItem( Type nData, const NameListWrapper& rListWrp );
@@ -1342,7 +1342,7 @@ protected:
protected:
OutputRef mxOut;
- ::rtl::OUString maSysFileName;
+ OUString maSysFileName;
};
typedef ::boost::shared_ptr< OutputObjectBase > OutputObjectRef;
@@ -1432,7 +1432,7 @@ void OutputObjectBase::writeValueItem( const String& rName, Type nData, FormatTy
template< typename Type >
void OutputObjectBase::writeValueItem( const ItemFormat& rItemFmt, Type nData )
{
- ::rtl::OString aNameUtf8 = StringHelper::convertToUtf8( rItemFmt.maItemName );
+ OString aNameUtf8 = StringHelper::convertToUtf8( rItemFmt.maItemName );
writeValueItem( aNameUtf8.getStr(), nData, rItemFmt.meFmtType, rItemFmt.maListName );
}
@@ -1467,7 +1467,7 @@ protected:
inline explicit InputObjectBase() {}
using OutputObjectBase::construct;
- void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
+ void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName );
void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm );
void construct( const InputObjectBase& rParent );
@@ -1494,11 +1494,11 @@ protected:
sal_Unicode dumpUnicode( const String& rName );
- ::rtl::OUString dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false );
- ::rtl::OUString dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false );
+ OUString dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false );
+ OUString dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false );
::com::sun::star::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING );
- ::rtl::OUString dumpGuid( const String& rName = EMPTY_STRING );
+ OUString dumpGuid( const String& rName = EMPTY_STRING );
void dumpItem( const ItemFormat& rItemFmt );
@@ -1675,7 +1675,7 @@ public:
explicit BinaryStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
protected:
void dumpBinaryStream( bool bShowOffset = true );
@@ -1696,7 +1696,7 @@ protected:
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
rtl_TextEncoding eTextEnc,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
void construct(
const OutputObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
@@ -1723,7 +1723,7 @@ public:
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
rtl_TextEncoding eTextEnc,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
explicit TextLineStreamObject(
const OutputObjectBase& rParent,
@@ -1732,7 +1732,7 @@ public:
protected:
virtual void implDumpText( TextInputStream& rTextStrm );
- virtual void implDumpLine( const ::rtl::OUString& rLine, sal_uInt32 nLine );
+ virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine );
};
// ============================================================================
@@ -1743,7 +1743,7 @@ public:
explicit XmlStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
protected:
virtual void implDumpText( TextInputStream& rTextStrm );
@@ -1761,7 +1761,7 @@ protected:
void construct(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxBaseStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
const BinaryInputStreamRef& rxRecStrm,
const String& rRecNames,
const String& rSimpleRecs = EMPTY_STRING );
@@ -1813,7 +1813,7 @@ protected:
void construct(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxBaseStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
const String& rRecNames,
const String& rSimpleRecs = EMPTY_STRING );
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 8020cf058242..b58500ef8f3c 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -40,12 +40,12 @@ class OleInputObjectBase : public InputObjectBase
protected:
inline explicit OleInputObjectBase() {}
- ::rtl::OUString dumpAnsiString32( const String& rName );
- ::rtl::OUString dumpUniString32( const String& rName );
+ OUString dumpAnsiString32( const String& rName );
+ OUString dumpUniString32( const String& rName );
sal_Int32 dumpStdClipboardFormat( const String& rName = EMPTY_STRING );
- ::rtl::OUString dumpAnsiString32OrStdClip( const String& rName );
- ::rtl::OUString dumpUniString32OrStdClip( const String& rName );
+ OUString dumpAnsiString32OrStdClip( const String& rName );
+ OUString dumpUniString32OrStdClip( const String& rName );
void writeOleColorItem( const String& rName, sal_uInt32 nColor );
sal_uInt32 dumpOleColor( const String& rName );
@@ -80,7 +80,7 @@ protected:
class OleStreamObject : public OleInputObjectBase
{
public:
- explicit OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
+ explicit OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName );
};
// ============================================================================
@@ -88,7 +88,7 @@ public:
class OleCompObjObject : public OleStreamObject
{
public:
- explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
+ explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName );
protected:
virtual void implDump();
@@ -100,13 +100,13 @@ protected:
class OlePropertyStreamObject : public InputObjectBase
{
public:
- explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
+ explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName );
protected:
virtual void implDump();
private:
- void dumpSection( const ::rtl::OUString& rGuid, sal_uInt32 nStartPos );
+ void dumpSection( const OUString& rGuid, sal_uInt32 nStartPos );
void dumpProperty( sal_Int32 nPropId, sal_uInt32 nStartPos );
void dumpCodePageProperty( sal_uInt32 nStartPos );
@@ -119,15 +119,15 @@ private:
sal_uInt16 dumpPropertyType();
void dumpBlob( sal_Int32 nPropId, const String& rName );
- ::rtl::OUString dumpString8( const String& rName );
- ::rtl::OUString dumpCharArray8( const String& rName, sal_Int32 nLen );
- ::rtl::OUString dumpString16( const String& rName );
- ::rtl::OUString dumpCharArray16( const String& rName, sal_Int32 nLen );
+ OUString dumpString8( const String& rName );
+ OUString dumpCharArray8( const String& rName, sal_Int32 nLen );
+ OUString dumpString16( const String& rName );
+ OUString dumpCharArray16( const String& rName, sal_Int32 nLen );
bool dumpTypedProperty( const String& rName, sal_uInt16 nExpectedType );
void dumpHlinks( sal_Int32 nSize );
bool startElement( sal_uInt32 nStartPos );
- void writeSectionHeader( const ::rtl::OUString& rGuid, sal_uInt32 nStartPos );
+ void writeSectionHeader( const OUString& rGuid, sal_uInt32 nStartPos );
void writePropertyHeader( sal_Int32 nPropId, sal_uInt32 nStartPos );
private:
@@ -141,19 +141,19 @@ private:
class OleStorageObject : public StorageObjectBase
{
public:
- explicit OleStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath );
+ explicit OleStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath );
protected:
inline explicit OleStorageObject() {}
using StorageObjectBase::construct;
- void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath );
+ void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath );
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
};
// ============================================================================
@@ -296,7 +296,7 @@ protected:
void construct(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
const String& rPropNameList,
bool b64BitPropFlags = false );
void construct(
@@ -317,7 +317,7 @@ protected:
void setAlignAnchor();
bool startNextProperty();
- ::rtl::OUString getPropertyName() const;
+ OUString getPropertyName() const;
template< typename Type >
Type dumpDecProperty( Type nDefault, const NameListWrapper& rListWrp = NO_LIST );
@@ -345,8 +345,8 @@ protected:
void dumpPosProperty();
void dumpSizeProperty();
- void dumpGuidProperty( ::rtl::OUString* pValue = 0 );
- void dumpStringProperty( ::rtl::OUString* pValue = 0 );
+ void dumpGuidProperty( OUString* pValue = 0 );
+ void dumpStringProperty( OUString* pValue = 0 );
void dumpStringArrayProperty();
void dumpStreamProperty();
@@ -357,7 +357,7 @@ private:
void constructAxPropObj( const String& rPropNameList, bool b64BitPropFlags );
void dumpVersion();
- ::rtl::OUString dumpString( const String& rName, sal_uInt32 nSize, bool bArray );
+ OUString dumpString( const String& rName, sal_uInt32 nSize, bool bArray );
void dumpShortProperties();
void dumpLargeProperties();
@@ -367,17 +367,17 @@ private:
enum LargePropertyType { PROPTYPE_POS, PROPTYPE_SIZE, PROPTYPE_GUID, PROPTYPE_STRING, PROPTYPE_STRINGARRAY };
LargePropertyType mePropType;
- ::rtl::OUString maItemName;
+ OUString maItemName;
sal_uInt32 mnDataSize;
- ::rtl::OUString* mpItemValue;
- inline explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, ::rtl::OUString* pItemValue = 0 ) :
+ OUString* mpItemValue;
+ inline explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = 0 ) :
mePropType( ePropType ), maItemName( rItemName ), mnDataSize( nDataSize ), mpItemValue( pItemValue ) {}
};
typedef ::std::vector< LargeProperty > LargePropertyVector;
struct StreamProperty
{
- ::rtl::OUString maItemName;
+ OUString maItemName;
sal_uInt16 mnData;
inline explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) :
maItemName( rItemName ), mnData( nData ) {}
@@ -547,21 +547,21 @@ public:
explicit FormControlStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
- const ::rtl::OUString* pProgId = 0 );
+ const OUString& rSysFileName,
+ const OUString* pProgId = 0 );
explicit FormControlStreamObject(
const OutputObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString* pProgId = 0 );
+ const OUString* pProgId = 0 );
protected:
virtual void implDump();
private:
- void constructFormCtrlStrmObj( const ::rtl::OUString* pProgId );
+ void constructFormCtrlStrmObj( const OUString* pProgId );
private:
- ::rtl::OUString maProgId;
+ OUString maProgId;
bool mbReadGuid;
};
@@ -570,7 +570,7 @@ private:
struct VbaFormSiteInfo
{
- ::rtl::OUString maProgId;
+ OUString maProgId;
sal_Int32 mnId;
sal_uInt32 mnLength;
bool mbInStream;
@@ -635,7 +635,7 @@ public:
explicit VbaFStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
VbaFormSharedData& rFormData );
protected:
@@ -661,7 +661,7 @@ public:
explicit VbaOStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
VbaFormSharedData& rFormData );
protected:
@@ -705,7 +705,7 @@ public:
explicit VbaXStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
VbaFormSharedData& rFormData );
protected:
@@ -723,22 +723,22 @@ public:
explicit VbaContainerStorageObject(
const ObjectBase& rParent,
const StorageRef& rxStrg,
- const ::rtl::OUString& rSysPath );
+ const OUString& rSysPath );
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
virtual void implDumpStorage(
const StorageRef& rxStrg,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rSysPath );
+ const OUString& rStrgPath,
+ const OUString& rSysPath );
private:
- bool isFormStorage( const ::rtl::OUString& rStrgPath ) const;
+ bool isFormStorage( const OUString& rStrgPath ) const;
private:
VbaFormSharedData maFormData;
@@ -749,15 +749,15 @@ private:
struct VbaSharedData
{
- typedef ::std::map< ::rtl::OUString, sal_Int32 > StreamOffsetMap;
+ typedef ::std::map< OUString, sal_Int32 > StreamOffsetMap;
StreamOffsetMap maStrmOffsets;
rtl_TextEncoding meTextEnc;
explicit VbaSharedData();
- bool isModuleStream( const ::rtl::OUString& rStrmName ) const;
- sal_Int32 getStreamOffset( const ::rtl::OUString& rStrmName ) const;
+ bool isModuleStream( const OUString& rStrmName ) const;
+ sal_Int32 getStreamOffset( const OUString& rStrmName ) const;
};
// ============================================================================
@@ -768,7 +768,7 @@ public:
explicit VbaDirStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
VbaSharedData& rVbaData );
protected:
@@ -777,15 +777,15 @@ protected:
virtual void implDumpRecordBody();
private:
- ::rtl::OUString dumpByteString( const String& rName = EMPTY_STRING );
- ::rtl::OUString dumpUniString( const String& rName = EMPTY_STRING );
+ OUString dumpByteString( const String& rName = EMPTY_STRING );
+ OUString dumpUniString( const String& rName = EMPTY_STRING );
- ::rtl::OUString dumpByteStringWithLength( const String& rName = EMPTY_STRING );
+ OUString dumpByteStringWithLength( const String& rName = EMPTY_STRING );
private:
VbaSharedData& mrVbaData;
BinaryInputStreamRef mxInStrm;
- ::rtl::OUString maCurrStream;
+ OUString maCurrStream;
sal_Int32 mnCurrOffset;
};
@@ -797,7 +797,7 @@ public:
explicit VbaModuleStreamObject(
const ObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName,
+ const OUString& rSysFileName,
VbaSharedData& rVbaData,
sal_Int32 nStrmOffset );
@@ -817,15 +817,15 @@ public:
explicit VbaStorageObject(
const ObjectBase& rParent,
const StorageRef& rxStrg,
- const ::rtl::OUString& rSysPath,
+ const OUString& rSysPath,
VbaSharedData& rVbaData );
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
private:
VbaSharedData& mrVbaData;
@@ -839,15 +839,15 @@ public:
explicit VbaFormStorageObject(
const ObjectBase& rParent,
const StorageRef& rxStrg,
- const ::rtl::OUString& rSysPath,
+ const OUString& rSysPath,
VbaSharedData& rVbaData );
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
private:
VbaSharedData& mrVbaData;
@@ -858,19 +858,19 @@ private:
class VbaProjectStorageObject : public OleStorageObject
{
public:
- explicit VbaProjectStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath );
+ explicit VbaProjectStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath );
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
virtual void implDumpStorage(
const StorageRef& rxStrg,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rSysPath );
+ const OUString& rStrgPath,
+ const OUString& rSysPath );
private:
VbaSharedData maVbaData;
@@ -885,12 +885,12 @@ public:
explicit ActiveXStorageObject(
const ObjectBase& rParent,
const StorageRef& rxStrg,
- const ::rtl::OUString& rSysPath );
+ const OUString& rSysPath );
protected:
virtual void implDumpBaseStream(
const BinaryInputStreamRef& rxStrm,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
};
// ============================================================================
diff --git a/oox/inc/oox/dump/pptxdumper.hxx b/oox/inc/oox/dump/pptxdumper.hxx
index 0b032c38cc78..43f39002059b 100644
--- a/oox/inc/oox/dump/pptxdumper.hxx
+++ b/oox/inc/oox/dump/pptxdumper.hxx
@@ -38,9 +38,9 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
};
// ============================================================================
@@ -53,7 +53,7 @@ public:
explicit Dumper(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
protected:
virtual void implDump();
diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/oox/inc/oox/dump/xlsbdumper.hxx
index 71e14b8d2a9e..ffd24d4de808 100644
--- a/oox/inc/oox/dump/xlsbdumper.hxx
+++ b/oox/inc/oox/dump/xlsbdumper.hxx
@@ -44,12 +44,12 @@ protected:
virtual ~RecordObjectBase();
using SequenceRecordObjectBase::construct;
- void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName );
+ void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName );
void construct( const RecordObjectBase& rParent );
virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize );
- ::rtl::OUString getErrorName( sal_uInt8 nErrCode ) const;
+ OUString getErrorName( sal_uInt8 nErrCode ) const;
// ------------------------------------------------------------------------
@@ -69,7 +69,7 @@ protected:
sal_uInt8 dumpBoolean( const String& rName = EMPTY_STRING );
sal_uInt8 dumpErrorCode( const String& rName = EMPTY_STRING );
- ::rtl::OUString dumpString( const String& rName = EMPTY_STRING, bool bRich = false, bool b32BitLen = true );
+ OUString dumpString( const String& rName = EMPTY_STRING, bool bRich = false, bool b32BitLen = true );
void dumpColor( const String& rName = EMPTY_STRING );
::com::sun::star::util::DateTime dumpPivotDateTime( const String& rName = EMPTY_STRING );
@@ -103,9 +103,9 @@ public:
protected:
virtual void implDumpStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm,
- const ::rtl::OUString& rStrgPath,
- const ::rtl::OUString& rStrmName,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rStrgPath,
+ const OUString& rStrmName,
+ const OUString& rSysFileName );
};
// ============================================================================
@@ -118,7 +118,7 @@ public:
explicit Dumper(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
- const ::rtl::OUString& rSysFileName );
+ const OUString& rSysFileName );
protected:
virtual void implDump();
diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx
index 83b2ef196a2f..10fc8922dc4a 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/oox/inc/oox/export/chartexport.hxx
@@ -88,16 +88,16 @@ private:
com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram;
com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > mxNewDiagram;
- 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;
//::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes;
@@ -116,7 +116,7 @@ private:
sal_Int32 getChartType(
);
- rtl::OUString parseFormula( const rtl::OUString& rRange );
+ OUString parseFormula( const OUString& rRange );
void InitPlotArea();
void _ExportContent();
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 09da104d84e3..fa13a49ea090 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -82,7 +82,7 @@ protected:
String aName, ::com::sun::star::beans::PropertyState& eState );
const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField );
- rtl::OUString WriteImage( const rtl::OUString& rURL );
+ OUString WriteImage( const OUString& rURL );
const char* GetComponentDir();
const char* GetRelationCompPrefix();
@@ -94,7 +94,7 @@ public:
::oox::core::XmlFilterBase* GetFB() { return mpFB; }
DocumentType GetDocumentType() { return meDocumentType; }
- rtl::OUString WriteImage( const Graphic &rGraphic );
+ OUString WriteImage( const Graphic &rGraphic );
void WriteColor( sal_uInt32 nColor );
void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
@@ -111,7 +111,7 @@ public:
void WriteStretch();
void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
- ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL, const Graphic *pGraphic=NULL );
+ OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString& rURL, const Graphic *pGraphic=NULL );
void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
@@ -134,7 +134,7 @@ public:
static void ResetCounters();
- void GetUUID( ::rtl::OStringBuffer& rBuffer );
+ void GetUUID( OStringBuffer& rBuffer );
static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc );
@@ -143,12 +143,12 @@ public:
static const char* GetAlignment( sal_Int32 nAlignment );
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 );
};
diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx
index b4915048cefe..04c3b3375742 100644
--- a/oox/inc/oox/export/utils.hxx
+++ b/oox/inc/oox/export/utils.hxx
@@ -20,10 +20,10 @@
#ifndef _OOX_EXPORT_UTILS_HXX_
#define _OOX_EXPORT_UTILS_HXX_
-#define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr()
-#define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr()
-#define IS(x) rtl::OString::valueOf( x ).getStr()
-#define USS(x) rtl::OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
+#define I32S(x) OString::valueOf( (sal_Int32) x ).getStr()
+#define I64S(x) OString::valueOf( (sal_Int64) x ).getStr()
+#define IS(x) OString::valueOf( x ).getStr()
+#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
#ifndef DBG
# if OSL_DEBUG_LEVEL > 0
diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx
index 29ccdab1dbcb..01fb85760d05 100644
--- a/oox/inc/oox/export/vmlexport.hxx
+++ b/oox/inc/oox/export/vmlexport.hxx
@@ -67,7 +67,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
sal_uInt32 m_nShapeFlags;
/// Remember style, the most important shape attribute ;-)
- rtl::OStringBuffer *m_pShapeStyle;
+ OStringBuffer *m_pShapeStyle;
/// Remember which shape types we had already written.
bool *m_pShapeTypeWritten;
@@ -89,7 +89,7 @@ protected:
///
/// This should be called from within StartShape() to ensure that the
/// added attribute is preserved.
- void AddShapeAttribute( sal_Int32 nAttribute, const rtl::OString& sValue );
+ void AddShapeAttribute( sal_Int32 nAttribute, const OString& sValue );
using EscherEx::StartShape;
using EscherEx::EndShape;
@@ -118,13 +118,13 @@ private:
private:
/// Create an OString representing the id from a numerical id.
- static rtl::OString ShapeIdString( sal_uInt32 nId );
+ static OString ShapeIdString( sal_uInt32 nId );
/// Add starting and ending point of a line to the m_pShapeAttrList.
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 );
};
} // namespace vml
diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx
index a709a9f74662..55f41cf0a3b3 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -38,26 +38,26 @@ class OOX_DLLPUBLIC AttributeConversion
{
public:
/** Returns the XML token identifier from the passed string. */
- static sal_Int32 decodeToken( const ::rtl::OUString& rValue );
+ static sal_Int32 decodeToken( const OUString& rValue );
/** Returns the decoded string value. All characters in the format
'_xHHHH_' (H being a hexadecimal digit), will be decoded. */
- static ::rtl::OUString decodeXString( const ::rtl::OUString& rValue );
+ static OUString decodeXString( const OUString& rValue );
/** Returns the double value from the passed string. */
- static double decodeDouble( const ::rtl::OUString& rValue );
+ static double decodeDouble( const OUString& rValue );
/** Returns the 32-bit signed integer value from the passed string (decimal). */
- static sal_Int32 decodeInteger( const ::rtl::OUString& rValue );
+ static sal_Int32 decodeInteger( const OUString& rValue );
/** Returns the 32-bit unsigned integer value from the passed string (decimal). */
- static sal_uInt32 decodeUnsigned( const ::rtl::OUString& rValue );
+ static sal_uInt32 decodeUnsigned( const OUString& rValue );
/** Returns the 64-bit signed integer value from the passed string (decimal). */
- static sal_Int64 decodeHyper( const ::rtl::OUString& rValue );
+ static sal_Int64 decodeHyper( const OUString& rValue );
/** Returns the 32-bit signed integer value from the passed string (hexadecimal). */
- static sal_Int32 decodeIntegerHex( const ::rtl::OUString& rValue );
+ static sal_Int32 decodeIntegerHex( const OUString& rValue );
};
// ============================================================================
@@ -87,11 +87,11 @@ public:
OptValue< sal_Int32 > getToken( sal_Int32 nAttrToken ) const;
/** Returns the string value of the specified attribute. */
- OptValue< ::rtl::OUString > getString( sal_Int32 nAttrToken ) const;
+ OptValue< OUString > getString( sal_Int32 nAttrToken ) const;
/** Returns the string value of the specified attribute. All characters in
the format '_xHHHH_' (H being a hexadecimal digit), will be decoded. */
- OptValue< ::rtl::OUString > getXString( sal_Int32 nAttrToken ) const;
+ OptValue< OUString > getXString( sal_Int32 nAttrToken ) const;
/** Returns the double value of the specified attribute. */
OptValue< double > getDouble( sal_Int32 nAttrToken ) const;
@@ -122,11 +122,11 @@ public:
/** Returns the string value of the specified attribute, or the passed
default string if the attribute is missing. */
- ::rtl::OUString getString( sal_Int32 nAttrToken, const ::rtl::OUString& rDefault ) const;
+ OUString getString( sal_Int32 nAttrToken, const OUString& rDefault ) const;
/** Returns the decoded string value of the specified attribute, or the
passed default string if the attribute is missing. */
- ::rtl::OUString getXString( sal_Int32 nAttrToken, const ::rtl::OUString& rDefault ) const;
+ OUString getXString( sal_Int32 nAttrToken, const OUString& rDefault ) const;
/** Returns the double value of the specified attribute, or the passed
default value if the attribute is missing or not convertible to a double. */
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index aeadb4fac4bb..64d85357c2e8 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -157,7 +157,7 @@ public:
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
- ::rtl::OUString readNulUnicodeArray();
+ OUString readNulUnicodeArray();
/** Reads a byte character array and returns the string.
@@ -168,7 +168,7 @@ public:
True = NUL characters are inserted into the imported string.
False = NUL characters are replaced by question marks (default).
*/
- ::rtl::OString readCharArray( sal_Int32 nChars, bool bAllowNulChars = false );
+ OString readCharArray( sal_Int32 nChars, bool bAllowNulChars = false );
/** Reads a byte character array and returns a Unicode string.
@@ -182,7 +182,7 @@ public:
True = NUL characters are inserted into the imported string.
False = NUL characters are replaced by question marks (default).
*/
- ::rtl::OUString readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
+ OUString readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
/** Reads a Unicode character array and returns the string.
@@ -193,7 +193,7 @@ public:
True = NUL characters are inserted into the imported string.
False = NUL characters are replaced by question marks (default).
*/
- ::rtl::OUString readUnicodeArray( sal_Int32 nChars, bool bAllowNulChars = false );
+ OUString readUnicodeArray( sal_Int32 nChars, bool bAllowNulChars = false );
/** Reads a Unicode character array (may be compressed) and returns the
string.
@@ -209,7 +209,7 @@ public:
True = NUL characters are inserted into the imported string.
False = NUL characters are replaced by question marks (default).
*/
- ::rtl::OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false );
+ OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false );
/** Copies nBytes bytes from the current position to the passed output stream.
*/
diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx
index 687008a6ffd1..0882821e9834 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -68,11 +68,11 @@ public:
template< typename Type >
inline BinaryOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; }
- void writeCompressedUnicodeArray( const ::rtl::OUString& rString, bool bCompressed, bool bAllowNulChars = false );
+ void writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars = false );
- void writeCharArrayUC( const ::rtl::OUString& rString, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
+ void writeCharArrayUC( const OUString& rString, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
- void writeUnicodeArray( const ::rtl::OUString& rString, bool bAllowNulChars = false );
+ void writeUnicodeArray( const OUString& rString, bool bAllowNulChars = false );
protected:
/** This dummy default c'tor will never call the c'tor of the virtual base
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index 48432268780f..667de0d21866 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -168,9 +168,9 @@ public:
@return An unused name. Will be equal to the suggested name, if not
contained, otherwise a numerical index will be appended.
*/
- static ::rtl::OUString getUnusedName(
+ static OUString getUnusedName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxNameAccess,
- const ::rtl::OUString& rSuggestedName,
+ const OUString& rSuggestedName,
sal_Unicode cSeparator,
sal_Int32 nFirstIndexToAppend = 1 );
@@ -187,7 +187,7 @@ public:
*/
static bool insertByName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer,
- const ::rtl::OUString& rName,
+ const OUString& rName,
const ::com::sun::star::uno::Any& rObject,
bool bReplaceOldExisting = true );
@@ -217,9 +217,9 @@ public:
equal to the suggested name, if parameter bRenameOldExisting is
true.
*/
- static ::rtl::OUString insertByUnusedName(
+ static OUString insertByUnusedName(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer,
- const ::rtl::OUString& rSuggestedName,
+ const OUString& rSuggestedName,
sal_Unicode cSeparator,
const ::com::sun::star::uno::Any& rObject,
bool bRenameOldExisting = false );
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index 2c75a3e5084e..0681716bc84f 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -115,26 +115,26 @@ public:
/** Imports a graphic from the storage stream with the passed path and name. */
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
- importEmbeddedGraphic( const ::rtl::OUString& rStreamName ) const;
+ importEmbeddedGraphic( const OUString& rStreamName ) const;
/** Creates a persistent graphic object from the passed graphic.
@return The URL of the created and internally cached graphic object. */
- ::rtl::OUString createGraphicObject(
+ OUString createGraphicObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const;
/** Creates a persistent graphic object from the passed input stream.
@return The URL of the created and internally cached graphic object. */
- ::rtl::OUString importGraphicObject(
+ OUString importGraphicObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm,
const WMF_EXTERNALHEADER* pExtHeader = NULL ) const;
/** Creates a persistent graphic object from the passed binary memory block.
@return The URL of the created and internally cached graphic object. */
- ::rtl::OUString importGraphicObject( const StreamDataSequence& rGraphicData ) const;
+ OUString importGraphicObject( const StreamDataSequence& rGraphicData ) const;
/** Imports a graphic object from the storage stream with the passed path and name.
@return The URL of the created and internally cached graphic object. */
- ::rtl::OUString importEmbeddedGraphicObject( const ::rtl::OUString& rStreamName ) const;
+ OUString importEmbeddedGraphicObject( const OUString& rStreamName ) const;
/** calculates the orignal size of a graphic which is necessary to be able to calculate cropping values
@return The original Graphic size in 100thmm */
@@ -144,7 +144,7 @@ public:
private:
typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette;
typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque;
- typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap;
+ typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > mxGraphicProvider;
@@ -154,7 +154,7 @@ private:
StorageRef mxStorage; ///< Storage containing embedded graphics.
mutable GraphicObjectDeque maGraphicObjects; ///< Caches all created graphic objects to keep them alive.
mutable EmbeddedGraphicMap maEmbeddedGraphics; ///< Maps all embedded graphics by their storage path.
- const ::rtl::OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects.
+ const OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects.
double mfPixelPerHmmX; ///< Number of screen pixels per 1/100 mm in X direction.
double mfPixelPerHmmY; ///< Number of screen pixels per 1/100 mm in Y direction.
};
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index e82cea772d2b..4f8e738354d4 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/oox/inc/oox/helper/helper.hxx
@@ -47,14 +47,14 @@ namespace oox {
#define STATIC_ARRAY_SELECT( array, index, def ) \
((static_cast<size_t>(index) < STATIC_ARRAY_SIZE(array)) ? ((array)[static_cast<size_t>(index)]) : (def))
-/** Expands to a temporary ::rtl::OString, created from a literal(!) character
+/** Expands to a temporary OString, created from a literal(!) character
array. */
#define CREATE_OSTRING( ascii ) \
- ::rtl::OString( RTL_CONSTASCII_STRINGPARAM( ascii ) )
+ OString( RTL_CONSTASCII_STRINGPARAM( ascii ) )
/** Convert an OUString to an ASCII C string. Use for debug purposes only. */
#define OUSTRING_TO_CSTR( str ) \
- ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()
+ OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()
// Common constants ===========================================================
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/oox/inc/oox/helper/modelobjecthelper.hxx
index aa6e980d27b1..98b34aa1f4d2 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -41,15 +41,15 @@ class ObjectContainer
public:
explicit ObjectContainer(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
- const ::rtl::OUString& rServiceName );
+ const OUString& rServiceName );
~ObjectContainer();
/** Returns true, if the object with the passed name exists in the container. */
- bool hasObject( const ::rtl::OUString& rObjName ) const;
+ bool hasObject( const OUString& rObjName ) const;
/** Inserts the passed object into the container, returns its final name. */
- ::rtl::OUString insertObject(
- const ::rtl::OUString& rObjName,
+ OUString insertObject(
+ const OUString& rObjName,
const ::com::sun::star::uno::Any& rObj,
bool bInsertByUnusedName );
@@ -61,7 +61,7 @@ private:
mxModelFactory; ///< Factory to create the container.
mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
mxContainer; ///< Container for the objects.
- ::rtl::OUString maServiceName; ///< Service name to create the container.
+ OUString maServiceName; ///< Service name to create the container.
sal_Int32 mnIndex; ///< Index to create unique identifiers.
};
@@ -81,27 +81,27 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory );
/** Returns true, if the model contains a line marker with the passed name. */
- bool hasLineMarker( const ::rtl::OUString& rMarkerName ) const;
+ bool hasLineMarker( const OUString& rMarkerName ) const;
/** Inserts a new named line marker, overwrites an existing line marker
with the same name. Returns true, if the marker could be inserted. */
bool insertLineMarker(
- const ::rtl::OUString& rMarkerName,
+ const OUString& rMarkerName,
const ::com::sun::star::drawing::PolyPolygonBezierCoords& rMarker );
/** Inserts a new named line dash, returns the line dash name, based on an
internal constant name with a new unused index appended. */
- ::rtl::OUString insertLineDash( const ::com::sun::star::drawing::LineDash& rDash );
+ OUString insertLineDash( const ::com::sun::star::drawing::LineDash& rDash );
/** Inserts a new named fill gradient, returns the gradient name, based on
an internal constant name with a new unused index appended. */
- ::rtl::OUString insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient );
+ OUString insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient );
- ::rtl::OUString insertTransGrandient( const ::com::sun::star::awt::Gradient& rGradient );
+ OUString insertTransGrandient( const ::com::sun::star::awt::Gradient& rGradient );
/** Inserts a new named fill bitmap URL, returns the bitmap name, based on
an internal constant name with a new unused index appended. */
- ::rtl::OUString insertFillBitmapUrl( const ::rtl::OUString& rGraphicUrl );
+ OUString insertFillBitmapUrl( const OUString& rGraphicUrl );
private:
ObjectContainer maMarkerContainer; ///< Contains all named line markers (line end polygons).
@@ -109,10 +109,10 @@ private:
ObjectContainer maGradientContainer; ///< Contains all named fill gradients.
ObjectContainer maTransGradContainer; ///< Contains all named transparency Gradients.
ObjectContainer maBitmapUrlContainer; ///< Contains all named fill bitmap URLs.
- const ::rtl::OUString maDashNameBase; ///< Base name for all named line dashes.
- const ::rtl::OUString maGradientNameBase; ///< Base name for all named fill gradients.
- const ::rtl::OUString maTransGradNameBase; ///< Base name for all named fill gradients.
- const ::rtl::OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs.
+ const OUString maDashNameBase; ///< Base name for all named line dashes.
+ const OUString maGradientNameBase; ///< Base name for all named fill gradients.
+ const OUString maTransGradNameBase; ///< Base name for all named fill gradients.
+ const OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs.
};
// ============================================================================
diff --git a/oox/inc/oox/helper/progressbar.hxx b/oox/inc/oox/helper/progressbar.hxx
index 3c316b3d4d73..bb8540262750 100644
--- a/oox/inc/oox/helper/progressbar.hxx
+++ b/oox/inc/oox/helper/progressbar.hxx
@@ -89,7 +89,7 @@ class OOX_DLLPUBLIC ProgressBar : public IProgressBar
public:
explicit ProgressBar(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator,
- const ::rtl::OUString& rText );
+ const OUString& rText );
virtual ~ProgressBar();
@@ -113,7 +113,7 @@ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar
public:
explicit SegmentProgressBar(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator,
- const ::rtl::OUString& rText );
+ const OUString& rText );
/** Returns the current position of the progress bar segment. */
virtual double getPosition() const;
diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx
index a7c14b55b06e..d03d891d93b5 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -54,7 +54,7 @@ public:
explicit PropertyMap();
/** Returns the name of the passed property identifier. */
- static const ::rtl::OUString& getPropertyName( sal_Int32 nPropId );
+ static const OUString& getPropertyName( sal_Int32 nPropId );
/** Returns true, if the map contains a property with the passed identifier. */
inline bool hasProperty( sal_Int32 nPropId ) const
@@ -84,7 +84,7 @@ public:
/** Fills the passed sequences of names and anys with all contained properties. */
void fillSequences(
- ::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 ) const;
/** Creates a property set supporting the XPropertySet interface and inserts all properties. */
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index 75035e6fb744..2c97b29677fa 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -108,7 +108,7 @@ public:
@param rPropNames The property names. MUST be ordered alphabetically.
@param rValues The related property values. */
void setProperties(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropNames,
+ const ::com::sun::star::uno::Sequence< OUString >& rPropNames,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues );
/** Puts the passed property map into the property set. Tries to use the XMultiPropertySet interface.
@@ -123,10 +123,10 @@ public:
private:
/** Gets the specified property from the property set.
@return true, if the any could be filled with the property value. */
- bool implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const ::rtl::OUString& rPropName ) const;
+ bool implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const OUString& rPropName ) const;
/** Puts the passed any into the property set. */
- bool implSetPropertyValue( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
+ bool implSetPropertyValue( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
private:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
diff --git a/oox/inc/oox/helper/storagebase.hxx b/oox/inc/oox/helper/storagebase.hxx
index f22e0acda7e7..f318f01b4768 100644
--- a/oox/inc/oox/helper/storagebase.hxx
+++ b/oox/inc/oox/helper/storagebase.hxx
@@ -73,14 +73,14 @@ public:
getXStorage() const;
/** Returns the element name of this storage. */
- const ::rtl::OUString& getName() const;
+ const OUString& getName() const;
/** Returns the full path of this storage. */
- ::rtl::OUString getPath() const;
+ OUString getPath() const;
/** Fills the passed vector with the names of all direct elements of this
storage. */
- void getElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const;
+ void getElementNames( ::std::vector< OUString >& orElementNames ) const;
/** Opens and returns the specified sub storage from the storage.
@@ -91,7 +91,7 @@ public:
True = create missing sub storages (for export filters). Must be
false for storages based on input streams.
*/
- StorageRef openSubStorage( const ::rtl::OUString& rStorageName, bool bCreateMissing );
+ StorageRef openSubStorage( const OUString& rStorageName, bool bCreateMissing );
/** Opens and returns the specified input stream from the storage.
@@ -102,7 +102,7 @@ public:
accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- openInputStream( const ::rtl::OUString& rStreamName );
+ openInputStream( const OUString& rStreamName );
/** Opens and returns the specified output stream from the storage.
@@ -113,7 +113,7 @@ public:
can be accessed by passing an empty string as stream name.
*/
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- openOutputStream( const ::rtl::OUString& rStreamName );
+ openOutputStream( const OUString& rStreamName );
/** Copies the specified element from this storage to the passed
destination storage.
@@ -124,7 +124,7 @@ public:
case, the element will be copied to the same substorage in the
destination storage.
*/
- void copyToStorage( StorageBase& rDestStrg, const ::rtl::OUString& rElementName );
+ void copyToStorage( StorageBase& rDestStrg, const OUString& rElementName );
/** Copies all streams of this storage and of all substorages to the passed
destination. */
@@ -135,7 +135,7 @@ public:
protected:
/** Special constructor for sub storage objects. */
- explicit StorageBase( const StorageBase& rParentStorage, const ::rtl::OUString& rStorageName, bool bReadOnly );
+ explicit StorageBase( const StorageBase& rParentStorage, const OUString& rStorageName, bool bReadOnly );
private:
StorageBase( const StorageBase& );
@@ -149,35 +149,35 @@ private:
implGetXStorage() const = 0;
/** Returns the names of all elements of this storage. */
- virtual void implGetElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const = 0;
+ virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const = 0;
/** Implementation of opening a storage element. */
- virtual StorageRef implOpenSubStorage( const ::rtl::OUString& rElementName, bool bCreate ) = 0;
+ virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreate ) = 0;
/** Implementation of opening an input stream element. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- implOpenInputStream( const ::rtl::OUString& rElementName ) = 0;
+ implOpenInputStream( const OUString& rElementName ) = 0;
/** Implementation of opening an output stream element. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- implOpenOutputStream( const ::rtl::OUString& rElementName ) = 0;
+ implOpenOutputStream( const OUString& rElementName ) = 0;
/** Commits the current storage. */
virtual void implCommit() const = 0;
/** Helper that opens and caches the specified direct substorage. */
- StorageRef getSubStorage( const ::rtl::OUString& rElementName, bool bCreateMissing );
+ StorageRef getSubStorage( const OUString& rElementName, bool bCreateMissing );
private:
- typedef RefMap< ::rtl::OUString, StorageBase > SubStorageMap;
+ typedef RefMap< OUString, StorageBase > SubStorageMap;
SubStorageMap maSubStorages; ///< Map of direct sub storages.
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
mxInStream; ///< Cached base input stream (to keep it alive).
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
mxOutStream; ///< Cached base output stream (to keep it alive).
- ::rtl::OUString maParentPath; ///< Full path of parent storage.
- ::rtl::OUString maStorageName; ///< Name of this storage, if it is a substorage.
+ OUString maParentPath; ///< Full path of parent storage.
+ OUString maStorageName; ///< Name of this storage, if it is a substorage.
bool mbBaseStreamAccess; ///< True = access base streams with empty stream name.
bool mbReadOnly; ///< True = storage opened read-only (based on input stream).
};
diff --git a/oox/inc/oox/helper/textinputstream.hxx b/oox/inc/oox/helper/textinputstream.hxx
index 944f32950f4b..16a2d5145e9d 100644
--- a/oox/inc/oox/helper/textinputstream.hxx
+++ b/oox/inc/oox/helper/textinputstream.hxx
@@ -62,7 +62,7 @@ public:
line-end character, the next call to this function will turn the stream
into EOF state and return an empty string.
*/
- ::rtl::OUString readLine();
+ OUString readLine();
/** Reads a text portion from the stream until the specified character is
found.
@@ -85,7 +85,7 @@ public:
returned as first character in the next call of this function
or readLine().
*/
- ::rtl::OUString readToChar( sal_Unicode cChar, bool bIncludeChar );
+ OUString readToChar( sal_Unicode cChar, bool bIncludeChar );
// ------------------------------------------------------------------------
@@ -105,7 +105,7 @@ private:
rtl_TextEncoding eTextEnc );
/** Adds the pending character in front of the passed string, if existing. */
- ::rtl::OUString createFinalString( const ::rtl::OUString& rString );
+ OUString createFinalString( const OUString& rString );
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
diff --git a/oox/inc/oox/helper/zipstorage.hxx b/oox/inc/oox/helper/zipstorage.hxx
index 94049eb144e5..e46df41387d7 100644
--- a/oox/inc/oox/helper/zipstorage.hxx
+++ b/oox/inc/oox/helper/zipstorage.hxx
@@ -48,7 +48,7 @@ private:
explicit ZipStorage(
const ZipStorage& rParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage,
- const ::rtl::OUString& rElementName );
+ const OUString& rElementName );
/** Returns true, if the object represents a valid storage. */
virtual bool implIsStorage() const;
@@ -58,18 +58,18 @@ private:
implGetXStorage() const;
/** Returns the names of all elements of this storage. */
- virtual void implGetElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const;
+ virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const;
/** Opens and returns the specified sub storage from the storage. */
- virtual StorageRef implOpenSubStorage( const ::rtl::OUString& rElementName, bool bCreateMissing );
+ virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing );
/** Opens and returns the specified input stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- implOpenInputStream( const ::rtl::OUString& rElementName );
+ implOpenInputStream( const OUString& rElementName );
/** Opens and returns the specified output stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- implOpenOutputStream( const ::rtl::OUString& rElementName );
+ implOpenOutputStream( const OUString& rElementName );
/** Commits the current storage. */
virtual void implCommit() const;
diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx
index 771851562996..7b3cca66473f 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
@@ -134,12 +134,12 @@ public:
{
bool hasAttribute( int token ) const;
OUString& operator[] (int token);
- rtl::OUString attribute( int token, const rtl::OUString& def = rtl::OUString()) const;
+ OUString attribute( int token, const OUString& def = OUString()) const;
bool attribute( int token, bool def ) const;
sal_Unicode attribute( int token, sal_Unicode def ) const;
// when adding more attribute() overloads, add also to XmlStream itself
protected:
- std::map< int, rtl::OUString > attrs;
+ std::map< int, OUString > attrs;
};
/**
Structure representing a tag, including its attributes and content text immediatelly following it.
@@ -148,17 +148,17 @@ public:
{
Tag( int token = XML_TOKEN_INVALID,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& attributes = com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >(),
- const rtl::OUString& text = rtl::OUString());
+ const OUString& text = OUString());
Tag( int token,
const AttributeList& attribs);
int token; ///< tag type, or XML_TOKEN_INVALID
AttributeList attributes;
- rtl::OUString text;
+ OUString text;
/**
This function returns value of the given attribute, or the passed default value if not found.
The type of the default value selects the return type (OUString here).
*/
- rtl::OUString attribute( int token, const rtl::OUString& def = rtl::OUString()) const;
+ OUString attribute( int token, const OUString& def = OUString()) const;
/**
@overload
*/
@@ -244,11 +244,11 @@ public:
const AttributeList& attribs );
void appendClosingTag( int token );
// appends the characters after the last appended token
- void appendCharacters( const rtl::OUString& characters );
+ void appendCharacters( const OUString& characters );
};
inline
-rtl::OUString XmlStream::Tag::attribute( int t, const rtl::OUString& def ) const
+OUString XmlStream::Tag::attribute( int t, const OUString& def ) const
{
return attributes.attribute( t, def );
}
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx
index 44003f56fcaf..f734a307d895 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -87,7 +87,7 @@ private:
typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
/** An array of string values as a property. */
-typedef ::std::vector< ::rtl::OUString > AxStringArray;
+typedef ::std::vector< OUString > AxStringArray;
// ============================================================================
@@ -111,10 +111,10 @@ public:
void readPairProperty( AxPairData& orPairData );
/** Reads the next string property from the stream, if the respective flag
in the property mask is set. */
- void readStringProperty( ::rtl::OUString& orValue );
+ void readStringProperty( OUString& orValue );
/** Reads the next GUID property from the stream, if the respective flag
in the property mask is set. The GUID will be enclosed in braces. */
- void readGuidProperty( ::rtl::OUString& orGuid );
+ void readGuidProperty( OUString& orGuid );
/** Reads the next font property from the stream, if the respective flag in
the property mask is set. */
void readFontProperty( AxFontData& orFontData );
@@ -176,10 +176,10 @@ private:
/** Complex property for a string value. */
struct StringProperty : public ComplexProperty
{
- ::rtl::OUString& mrValue;
+ OUString& mrValue;
sal_uInt32 mnSize;
- inline explicit StringProperty( ::rtl::OUString& rValue, sal_uInt32 nSize ) :
+ inline explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) :
mrValue( rValue ), mnSize( nSize ) {}
virtual bool readProperty( AxAlignedInputStream& rInStrm );
};
@@ -197,9 +197,9 @@ private:
/** Complex property for a GUID value. */
struct GuidProperty : public ComplexProperty
{
- ::rtl::OUString& mrGuid;
+ OUString& mrGuid;
- inline explicit GuidProperty( ::rtl::OUString& rGuid ) :
+ inline explicit GuidProperty( OUString& rGuid ) :
mrGuid( rGuid ) {}
virtual bool readProperty( AxAlignedInputStream& rInStrm );
};
@@ -233,7 +233,7 @@ private:
AxPairData maDummyPairData; ///< Dummy pair for unsupported properties.
AxFontData maDummyFontData; ///< Dummy font for unsupported properties.
StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties.
- ::rtl::OUString maDummyString; ///< Dummy string for unsupported properties.
+ OUString maDummyString; ///< Dummy string for unsupported properties.
AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties.
sal_Int64 mnPropFlags; ///< Flags specifying existing properties.
sal_Int64 mnNextProp; ///< Next property to read.
diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/oox/inc/oox/ole/axbinarywriter.hxx
index d9a940381f73..eb4aec532d1f 100644
--- a/oox/inc/oox/ole/axbinarywriter.hxx
+++ b/oox/inc/oox/ole/axbinarywriter.hxx
@@ -91,7 +91,7 @@ private:
typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
/** An array of string values as a property. */
-typedef ::std::vector< ::rtl::OUString > AxStringArray;
+typedef ::std::vector< OUString > AxStringArray;
// ============================================================================
@@ -115,7 +115,7 @@ public:
void writePairProperty( AxPairData& orPairData );
/** Write a string property to the stream, the respective flag
in the property mask is set. */
- void writeStringProperty( ::rtl::OUString& orValue, bool bCompressed = true );
+ void writeStringProperty( OUString& orValue, bool bCompressed = true );
/** Skips the next property clears the respective
flag in the property mask. */
@@ -149,10 +149,10 @@ private:
/** Complex property for a string value. */
struct StringProperty : public ComplexProperty
{
- ::rtl::OUString& mrValue;
+ OUString& mrValue;
sal_uInt32 mnSize;
- inline explicit StringProperty( ::rtl::OUString& rValue, sal_uInt32 nSize ) :
+ inline explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) :
mrValue( rValue ), mnSize( nSize ) {}
virtual bool writeProperty( AxAlignedOutputStream& rOutStrm );
};
@@ -175,7 +175,7 @@ private:
ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties.
AxPairData maDummyPairData; ///< Dummy pair for unsupported properties.
StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties.
- ::rtl::OUString maDummyString; ///< Dummy string for unsupported properties.
+ OUString maDummyString; ///< Dummy string for unsupported properties.
AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties.
sal_Int16 mnBlockSize;
sal_Int64 mnPropFlagsStart; ///< pos of Prop flags
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 337bac344fcc..6612ef3c497d 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -258,8 +258,8 @@ public:
implementation will check which source types are supported. */
void bindToSources(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
- const ::rtl::OUString& rCtrlSource,
- const ::rtl::OUString& rRowSource,
+ const OUString& rCtrlSource,
+ const OUString& rRowSource,
sal_Int32 nRefSheet = 0 ) const;
// ActiveX (Forms 2.0) specific conversion --------------------------------
@@ -313,14 +313,14 @@ public:
properties. */
void convertAxState(
PropertyMap& rPropMap,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
sal_Int32 nMultiSelect,
ApiDefaultStateMode eDefStateMode,
bool bAwtModel ) const;
void convertToAxState(
PropertySet& rPropSet,
- ::rtl::OUString& rValue,
+ OUString& rValue,
sal_Int32& nMultiSelect,
ApiDefaultStateMode eDefStateMode,
bool bAwtModel ) const;
@@ -360,10 +360,10 @@ public:
/** Returns the UNO service name used to construct the AWT control model,
or the control form component. */
- ::rtl::OUString getServiceName() const;
+ OUString getServiceName() const;
/** Derived classes set specific OOXML properties at the model structure. */
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
/** Derived classes set binary data (picture, mouse icon) at the model structure. */
virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm );
/** Derived classes import a form control model from the passed input stream. */
@@ -487,7 +487,7 @@ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase
public:
explicit AxControlModelBase();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
};
// ============================================================================
@@ -498,7 +498,7 @@ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase
public:
explicit AxFontDataModel( bool bSupportsAlign = true );
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
@@ -522,7 +522,7 @@ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel
public:
explicit AxCommandButtonModel();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
@@ -534,7 +534,7 @@ public:
public: // direct access needed for legacy VML drawing controls
StreamDataSequence maPictureData; ///< Binary picture stream.
- ::rtl::OUString maCaption; ///< Visible caption of the button.
+ OUString maCaption; ///< Visible caption of the button.
sal_uInt32 mnTextColor; ///< Text color.
sal_uInt32 mnBackColor; ///< Fill color.
sal_uInt32 mnFlags; ///< Various flags.
@@ -551,7 +551,7 @@ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel
public:
explicit AxLabelModel();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
virtual void exportCompObj( BinaryOutputStream& rOutStrm );
@@ -561,7 +561,7 @@ public:
virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv );
public: // direct access needed for legacy VML drawing controls
- ::rtl::OUString maCaption; ///< Visible caption of the button.
+ OUString maCaption; ///< Visible caption of the button.
sal_uInt32 mnTextColor; ///< Text color.
sal_uInt32 mnBackColor; ///< Fill color.
sal_uInt32 mnFlags; ///< Various flags.
@@ -579,7 +579,7 @@ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase
public:
explicit AxImageModel();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
@@ -608,7 +608,7 @@ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel
public:
explicit AxMorphDataModelBase();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
@@ -616,9 +616,9 @@ public:
public: // direct access needed for legacy VML drawing controls
StreamDataSequence maPictureData; ///< Binary picture stream.
- ::rtl::OUString maCaption; ///< Visible caption of the button.
- ::rtl::OUString maValue; ///< Current value of the control.
- ::rtl::OUString maGroupName; ///< Group name for option buttons.
+ OUString maCaption; ///< Visible caption of the button.
+ OUString maValue; ///< Current value of the control.
+ OUString maGroupName; ///< Group name for option buttons.
sal_uInt32 mnTextColor; ///< Text color.
sal_uInt32 mnBackColor; ///< Fill color.
sal_uInt32 mnFlags; ///< Various flags.
@@ -674,7 +674,7 @@ public:
explicit AxOptionButtonModel();
/** Returns the group name used to goup several option buttons gogether. */
- inline const ::rtl::OUString& getGroupName() const { return maGroupName; }
+ inline const OUString& getGroupName() const { return maGroupName; }
virtual ApiControlType getControlType() const;
virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
@@ -746,7 +746,7 @@ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase
public:
explicit AxSpinButtonModel();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
@@ -775,7 +775,7 @@ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase
public:
explicit AxScrollBarModel();
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
virtual void exportBinaryModel( BinaryOutputStream& rOutStrm );
virtual void exportCompObj( BinaryOutputStream& rOutStrm );
@@ -800,7 +800,7 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
-typedef ::std::vector< ::rtl::OUString > AxClassTable;
+typedef ::std::vector< OUString > AxClassTable;
/** Base class for ActiveX container controls. */
class OOX_DLLPUBLIC AxContainerModelBase : public AxFontDataModel
@@ -809,7 +809,7 @@ public:
explicit AxContainerModelBase( bool bFontSupport = false );
/** Allows to set single properties specified by XML token identifier. */
- virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ virtual void importProperty( sal_Int32 nPropId, const OUString& rValue );
/** Reads the leading structure in the 'f' stream containing the model for
this control. */
virtual bool importBinaryModel( BinaryInputStream& rInStrm );
@@ -822,7 +822,7 @@ public:
public: // direct access needed for legacy VML drawing controls
StreamDataSequence maPictureData; ///< Binary picture stream.
- ::rtl::OUString maCaption; ///< Visible caption of the form.
+ OUString maCaption; ///< Visible caption of the form.
AxPairData maLogicalSize; ///< Logical form size (scroll area).
AxPairData maScrollPos; ///< Scroll position.
sal_uInt32 mnBackColor; ///< Fill color.
@@ -868,7 +868,7 @@ public:
class HtmlSelectModel : public AxListBoxModel
{
- com::sun::star::uno::Sequence< rtl::OUString > msListData;
+ com::sun::star::uno::Sequence< OUString > msListData;
com::sun::star::uno::Sequence< sal_Int16 > msIndices;
public:
HtmlSelectModel();
@@ -889,7 +889,7 @@ public:
class OOX_DLLPUBLIC EmbeddedControl
{
public:
- explicit EmbeddedControl( const ::rtl::OUString& rName );
+ explicit EmbeddedControl( const OUString& rName );
virtual ~EmbeddedControl();
/** Creates and returns the internal control model of the specified type. */
@@ -902,7 +902,7 @@ public:
/** Creates and returns the internal control model according to the passed
MS class identifier. */
- ControlModelBase* createModelFromGuid( const ::rtl::OUString& rClassId );
+ ControlModelBase* createModelFromGuid( const OUString& rClassId );
/** Returns true, if the internal control model exists. */
inline bool hasModel() const { return mxModel.get() != 0; }
@@ -912,7 +912,7 @@ public:
inline ControlModelBase* getModel() { return mxModel.get(); }
/** Returns the UNO service name needed to construct the control model. */
- ::rtl::OUString getServiceName() const;
+ OUString getServiceName() const;
/** Converts all control properties and inserts them into the passed model. */
bool convertProperties(
@@ -925,7 +925,7 @@ public:
private:
ControlModelRef mxModel; ///< Control model containing the properties.
- ::rtl::OUString maName; ///< Name of the control.
+ OUString maName; ///< Name of the control.
};
// ----------------------------------------------------------------------------
diff --git a/oox/inc/oox/ole/axcontrolfragment.hxx b/oox/inc/oox/ole/axcontrolfragment.hxx
index 28ae526d8e08..653f23c30479 100644
--- a/oox/inc/oox/ole/axcontrolfragment.hxx
+++ b/oox/inc/oox/ole/axcontrolfragment.hxx
@@ -54,7 +54,7 @@ class AxControlFragment : public ::oox::core::FragmentHandler2
public:
explicit AxControlFragment(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
EmbeddedControl& rControl );
virtual ::oox::core::ContextHandlerRef
diff --git a/oox/inc/oox/ole/axfontdata.hxx b/oox/inc/oox/ole/axfontdata.hxx
index 2660f38e12a4..9dbec1786261 100644
--- a/oox/inc/oox/ole/axfontdata.hxx
+++ b/oox/inc/oox/ole/axfontdata.hxx
@@ -46,7 +46,7 @@ const sal_Int32 AX_FONTDATA_CENTER = 3;
/** All entries of a font property. */
struct OOX_DLLPUBLIC AxFontData
{
- ::rtl::OUString maFontName; ///< Name of the used font.
+ OUString maFontName; ///< Name of the used font.
sal_uInt32 mnFontEffects; ///< Font effect flags.
sal_Int32 mnFontHeight; ///< Height of the font (not really twips, see code).
sal_Int32 mnFontCharSet; ///< Windows character set of the font.
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 68d3133b7db6..e75a0cd07588 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -71,7 +71,7 @@ const sal_uInt8 OLE_STDFONT_STRIKE = 0x08;
/** Stores data about a StdFont font structure. */
struct StdFontInfo
{
- ::rtl::OUString maName; ///< Font name.
+ OUString maName; ///< Font name.
sal_uInt32 mnHeight; ///< Font height (1/10,000 points).
sal_uInt16 mnWeight; ///< Font weight (normal/bold).
sal_uInt16 mnCharSet; ///< Font charset.
@@ -79,7 +79,7 @@ struct StdFontInfo
explicit StdFontInfo();
explicit StdFontInfo(
- const ::rtl::OUString& rName,
+ const OUString& rName,
sal_uInt32 nHeight,
sal_uInt16 nWeight = OLE_STDFONT_NORMAL,
sal_uInt16 nCharSet = WINDOWS_CHARSET_ANSI,
@@ -91,10 +91,10 @@ struct StdFontInfo
/** Stores data about a StdHlink hyperlink. */
struct StdHlinkInfo
{
- ::rtl::OUString maTarget;
- ::rtl::OUString maLocation;
- ::rtl::OUString maDisplay;
- ::rtl::OUString maFrame;
+ OUString maTarget;
+ OUString maLocation;
+ OUString maDisplay;
+ OUString maFrame;
};
// ============================================================================
@@ -121,7 +121,7 @@ public:
/** Imports a GUID from the passed binary stream and returns its string
representation (in uppercase characters).
*/
- static ::rtl::OUString importGuid( BinaryInputStream& rInStrm );
+ static OUString importGuid( BinaryInputStream& rInStrm );
/** Imports an OLE StdFont font structure from the current position of the
passed binary stream.
@@ -163,10 +163,10 @@ protected:
bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
- const ::rtl::OUString& rGuidString );
+ const OUString& rGuidString );
bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
- const ::rtl::OUString& rGuidString,
+ const OUString& rGuidString,
sal_Int32 nSize );
public:
MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
@@ -174,7 +174,7 @@ public:
sal_Bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
sal_Bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
sal_Int32 nPos, sal_Int32 nSize );
- static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,rtl::OUString &rName);
+ static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
#ifdef SvxMSConvertOCXControlsRemoved
const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > & GetShapes();
diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/oox/inc/oox/ole/oleobjecthelper.hxx
index a07f0c3da683..9d97a8d95f71 100644
--- a/oox/inc/oox/ole/oleobjecthelper.hxx
+++ b/oox/inc/oox/ole/oleobjecthelper.hxx
@@ -39,8 +39,8 @@ namespace ole {
struct OleObjectInfo
{
StreamDataSequence maEmbeddedData; ///< Data of an embedded OLE object.
- ::rtl::OUString maTargetLink; ///< Path to external data for linked OLE object.
- ::rtl::OUString maProgId;
+ OUString maTargetLink; ///< Path to external data for linked OLE object.
+ OUString maProgId;
bool mbLinked; ///< True = linked OLE object, false = embedded OLE object.
bool mbShowAsIcon; ///< True = show as icon, false = show contents.
bool mbAutoUpdate;
@@ -65,7 +65,7 @@ public:
private:
::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxResolver;
- const ::rtl::OUString maEmbeddedObjScheme;
+ const OUString maEmbeddedObjScheme;
sal_Int32 mnObjectId;
};
diff --git a/oox/inc/oox/ole/olestorage.hxx b/oox/inc/oox/ole/olestorage.hxx
index ff5ab59b2c27..1b48eab8213d 100644
--- a/oox/inc/oox/ole/olestorage.hxx
+++ b/oox/inc/oox/ole/olestorage.hxx
@@ -52,12 +52,12 @@ private:
explicit OleStorage(
const OleStorage& rParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxStorage,
- const ::rtl::OUString& rElementName,
+ const OUString& rElementName,
bool bReadOnly );
explicit OleStorage(
const OleStorage& rParentStorage,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream,
- const ::rtl::OUString& rElementName );
+ const OUString& rElementName );
/** Initializes the API storage object for input. */
void initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream );
@@ -76,18 +76,18 @@ private:
implGetXStorage() const;
/** Returns the names of all elements of this storage. */
- virtual void implGetElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const;
+ virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const;
/** Opens and returns the specified sub storage from the storage. */
- virtual StorageRef implOpenSubStorage( const ::rtl::OUString& rElementName, bool bCreateMissing );
+ virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing );
/** Opens and returns the specified input stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
- implOpenInputStream( const ::rtl::OUString& rElementName );
+ implOpenInputStream( const OUString& rElementName );
/** Opens and returns the specified output stream from the storage. */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- implOpenOutputStream( const ::rtl::OUString& rElementName );
+ implOpenOutputStream( const OUString& rElementName );
/** Commits the current storage. */
virtual void implCommit() const;
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index b9f3975d5e37..0de80153baed 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -44,14 +44,14 @@ public:
virtual ~VbaSiteModel();
/** Allows to set single properties specified by XML token identifier. */
- void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
+ void importProperty( sal_Int32 nPropId, const OUString& rValue );
/** Imports the site model data from the passed input stream. */
bool importBinaryModel( BinaryInputStream& rInStrm );
/** Moves the control relative to its current position by the passed distance. */
void moveRelative( const AxPairData& rDistance );
/** Returns the programmatical name of the control. */
- inline const ::rtl::OUString& getName() const { return maName; }
+ inline const OUString& getName() const { return maName; }
/** Returns the position of the control in its parent. */
inline const AxPairData& getPosition() const { return maPos; }
/** Returns the unique identifier of this control. */
@@ -61,7 +61,7 @@ public:
/** Returns the length of the stream data for stream based controls. */
sal_uInt32 getStreamLength() const;
/** Returns the name of the substorage for the container control data. */
- ::rtl::OUString getSubStorageName() const;
+ OUString getSubStorageName() const;
/** Returns the tab index of the control. */
inline sal_Int16 getTabIndex() const { return mnTabIndex; }
@@ -75,11 +75,11 @@ public:
sal_Int32 nCtrlIndex ) const;
protected:
- ::rtl::OUString maName; ///< Name of the control.
- ::rtl::OUString maTag; ///< User defined tag.
- ::rtl::OUString maToolTip; ///< Tool tip for the control.
- ::rtl::OUString maControlSource; ///< Linked cell for the control value in a spreadsheet.
- ::rtl::OUString maRowSource; ///< Source data for the control in a spreadsheet.
+ OUString maName; ///< Name of the control.
+ OUString maTag; ///< User defined tag.
+ OUString maToolTip; ///< Tool tip for the control.
+ OUString maControlSource; ///< Linked cell for the control value in a spreadsheet.
+ OUString maRowSource; ///< Source data for the control in a spreadsheet.
AxPairData maPos; ///< Position in parent container.
sal_Int32 mnId; ///< Control identifier.
@@ -116,7 +116,7 @@ public:
const AxClassTable& rClassTable );
/** Returns the programmatical name of the control. */
- ::rtl::OUString getControlName() const;
+ OUString getControlName() const;
/** Creates the UNO control model, inserts it into the passed container,
and converts all control properties. */
@@ -186,7 +186,7 @@ public:
void importForm(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib,
StorageBase& rVbaFormStrg,
- const ::rtl::OUString& rModuleName,
+ const OUString& rModuleName,
rtl_TextEncoding eTextEnc );
private:
diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx
index dadfd8de66af..a8faee21ff6e 100644
--- a/oox/inc/oox/ole/vbahelper.hxx
+++ b/oox/inc/oox/ole/vbahelper.hxx
@@ -79,9 +79,9 @@ public:
value are not empty. False otherwise.
*/
static bool extractKeyValue(
- ::rtl::OUString& rKey,
- ::rtl::OUString& rValue,
- const ::rtl::OUString& rKeyValue );
+ OUString& rKey,
+ OUString& rValue,
+ const OUString& rKeyValue );
private:
VbaHelper();
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 91f5b62a54c7..70dcd3913b9a 100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -46,7 +46,7 @@ public:
explicit VbaModule(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
- const ::rtl::OUString& rName,
+ const OUString& rName,
rtl_TextEncoding eTextEnc,
bool bExecutable );
@@ -56,9 +56,9 @@ public:
inline void setType( sal_Int32 nType ) { mnType = nType; }
/** Returns the name of the module. */
- inline const ::rtl::OUString& getName() const { return maName; }
+ inline const OUString& getName() const { return maName; }
/** Returns the stream name of the module. */
- inline const ::rtl::OUString& getStreamName() const { return maStreamName; }
+ inline const OUString& getStreamName() const { return maStreamName; }
/** Imports all records for this module until the MODULEEND record. */
void importDirRecords( BinaryInputStream& rDirStrm );
@@ -75,11 +75,11 @@ public:
private:
/** Reads and returns the VBA source code from the passed storage. */
- ::rtl::OUString readSourceCode( StorageBase& rVbaStrg ) const;
+ OUString readSourceCode( StorageBase& rVbaStrg ) const;
/** Creates a new Basic module and inserts it into the passed Basic library. */
void createModule(
- const ::rtl::OUString& rVBASourceCode,
+ const OUString& rVBASourceCode,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
@@ -88,9 +88,9 @@ private:
mxContext; ///< Component context with service manager.
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
mxDocModel; ///< Document model used to import/export the VBA project.
- ::rtl::OUString maName;
- ::rtl::OUString maStreamName;
- ::rtl::OUString maDocString;
+ OUString maName;
+ OUString maStreamName;
+ OUString maDocString;
rtl_TextEncoding meTextEnc;
sal_Int32 mnType;
sal_uInt32 mnOffset;
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index 723d2ca0a562..f742138756b5 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -47,7 +47,7 @@ class OOX_DLLPUBLIC VbaFilterConfig
public:
explicit VbaFilterConfig(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& rConfigCompName );
+ const OUString& rConfigCompName );
~VbaFilterConfig();
/** Returns true, if the VBA source code and forms should be imported. */
@@ -84,7 +84,7 @@ private:
class OOX_DLLPUBLIC VbaMacroAttacherBase
{
public:
- explicit VbaMacroAttacherBase( const ::rtl::OUString& rMacroName );
+ explicit VbaMacroAttacherBase( const OUString& rMacroName );
virtual ~VbaMacroAttacherBase();
/** Resolves the internal macro name to the related macro URL, and attaches
@@ -95,10 +95,10 @@ public:
private:
/** Called after the VBA project has been imported. Derived classes will
attach the passed script to the object represented by this instance. */
- virtual void attachMacro( const ::rtl::OUString& rScriptUrl ) = 0;
+ virtual void attachMacro( const OUString& rScriptUrl ) = 0;
private:
- ::rtl::OUString maMacroName;
+ OUString maMacroName;
};
typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef;
@@ -111,7 +111,7 @@ public:
explicit VbaProject(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
- const ::rtl::OUString& rConfigCompName );
+ const OUString& rConfigCompName );
virtual ~VbaProject();
/** Imports the entire VBA project from the passed storage.
@@ -141,7 +141,7 @@ public:
protected:
/** Registers a dummy module that will be created when the VBA project is
imported. */
- void addDummyModule( const ::rtl::OUString& rName, sal_Int32 nType );
+ void addDummyModule( const OUString& rName, sal_Int32 nType );
/** Called when the import process of the VBA project has been started. */
virtual void prepareImport();
@@ -179,7 +179,7 @@ private:
private:
typedef RefVector< VbaMacroAttacherBase > MacroAttacherVector;
- typedef ::std::map< ::rtl::OUString, sal_Int32 > DummyModuleMap;
+ typedef ::std::map< OUString, sal_Int32 > DummyModuleMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
mxContext; ///< Component context with service manager.
@@ -191,7 +191,7 @@ private:
mxDialogLib; ///< The dialog library of the document used for import.
MacroAttacherVector maMacroAttachers; ///< Objects that want to attach a VBA macro to an action.
DummyModuleMap maDummyModules; ///< Additional empty modules created on import.
- ::rtl::OUString maPrjName; ///< Name of the VBA project.
+ OUString maPrjName; ///< Name of the VBA project.
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
mxOleOverridesSink;
};
diff --git a/oox/inc/oox/ppt/animationspersist.hxx b/oox/inc/oox/ppt/animationspersist.hxx
index 50908a7ffd7a..ba63991def2a 100644
--- a/oox/inc/oox/ppt/animationspersist.hxx
+++ b/oox/inc/oox/ppt/animationspersist.hxx
@@ -62,7 +62,7 @@ namespace oox { namespace ppt {
sal_Int32 mnType;
sal_Int32 mnRangeType;
drawingml::IndexRange maRange;
- ::rtl::OUString msSubShapeId;
+ OUString msSubShapeId;
};
@@ -76,7 +76,7 @@ namespace oox { namespace ppt {
::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
sal_Int32 mnType;
- ::rtl::OUString msValue;
+ OUString msValue;
ShapeTargetElement maShapeTarget;
};
@@ -108,8 +108,8 @@ namespace oox { namespace ppt {
struct TimeAnimationValue
{
- ::rtl::OUString msFormula;
- ::rtl::OUString msTime;
+ OUString msFormula;
+ OUString msTime;
::com::sun::star::uno::Any maValue;
};
diff --git a/oox/inc/oox/ppt/comments.hxx b/oox/inc/oox/ppt/comments.hxx
index fe718db36efa..1095cd0223db 100644
--- a/oox/inc/oox/ppt/comments.hxx
+++ b/oox/inc/oox/ppt/comments.hxx
@@ -18,11 +18,11 @@ namespace oox { namespace ppt {
struct CommentAuthor
{
- ::rtl::OUString clrIdx;
- ::rtl::OUString id;
- ::rtl::OUString initials;
- ::rtl::OUString lastIdx;
- ::rtl::OUString name;
+ OUString clrIdx;
+ OUString id;
+ OUString initials;
+ OUString lastIdx;
+ OUString name;
};
class CommentAuthorList
@@ -49,60 +49,60 @@ class CommentAuthorList
class Comment
{
private:
- ::rtl::OUString authorId;
- ::rtl::OUString dt;
- ::rtl::OUString idx;
- ::rtl::OUString x;
- ::rtl::OUString y;
- ::rtl::OUString text;
+ OUString authorId;
+ OUString dt;
+ OUString idx;
+ OUString x;
+ OUString y;
+ OUString text;
::com::sun::star::util::DateTime aDateTime;
- void setDateTime (::rtl::OUString datetime);
+ void setDateTime (OUString datetime);
public:
- void setAuthorId(const ::rtl::OUString& _aId)
+ void setAuthorId(const OUString& _aId)
{
authorId = _aId;
}
- void setdt(const ::rtl::OUString& _dt)
+ void setdt(const OUString& _dt)
{
dt=_dt;
setDateTime(_dt);
}
- void setidx(const ::rtl::OUString& _idx)
+ void setidx(const OUString& _idx)
{
idx=_idx;
}
- void setPoint(const ::rtl::OUString& _x, const ::rtl::OUString& _y)
+ void setPoint(const OUString& _x, const OUString& _y)
{
x=_x;
y=_y;
}
- void setText(const rtl::OUString& _text)
+ void setText(const OUString& _text)
{
text = _text;
}
- ::rtl::OUString getAuthorId()
+ OUString getAuthorId()
{
return authorId;
}
- ::rtl::OUString getdt()
+ OUString getdt()
{
return dt;
}
- ::rtl::OUString getidx()
+ OUString getidx()
{
return idx;
}
- ::rtl::OUString get_X()
+ OUString get_X()
{
return x;
}
- ::rtl::OUString get_Y()
+ OUString get_Y()
{
return y;
}
- ::rtl::OUString get_text()
+ OUString get_text()
{
return text;
}
@@ -118,7 +118,7 @@ class Comment
{
return y.toInt32();
}
- ::rtl::OUString getAuthor ( const CommentAuthorList& list );
+ OUString getAuthor ( const CommentAuthorList& list );
};
class CommentList
diff --git a/oox/inc/oox/ppt/customshowlistcontext.hxx b/oox/inc/oox/ppt/customshowlistcontext.hxx
index 5266c1ba8a45..ed913c8bbe2c 100644
--- a/oox/inc/oox/ppt/customshowlistcontext.hxx
+++ b/oox/inc/oox/ppt/customshowlistcontext.hxx
@@ -28,9 +28,9 @@ namespace oox { namespace ppt {
struct CustomShow
{
- ::rtl::OUString maName;
- ::rtl::OUString mnId;
- std::vector< rtl::OUString >maSldLst;
+ OUString maName;
+ OUString mnId;
+ std::vector< OUString >maSldLst;
};
/** CT_ */
diff --git a/oox/inc/oox/ppt/dgmimport.hxx b/oox/inc/oox/ppt/dgmimport.hxx
index 4881ca14db2f..f369c5e526b8 100644
--- a/oox/inc/oox/ppt/dgmimport.hxx
+++ b/oox/inc/oox/ppt/dgmimport.hxx
@@ -51,7 +51,7 @@ public:
virtual oox::drawingml::chart::ChartConverter* getChartConverter();
private:
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
};
diff --git a/oox/inc/oox/ppt/dgmlayout.hxx b/oox/inc/oox/ppt/dgmlayout.hxx
index 0657871925fd..bf964fe5d310 100644
--- a/oox/inc/oox/ppt/dgmlayout.hxx
+++ b/oox/inc/oox/ppt/dgmlayout.hxx
@@ -51,7 +51,7 @@ public:
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
private:
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
drawingml::ThemePtr mpThemePtr;
};
diff --git a/oox/inc/oox/ppt/layoutfragmenthandler.hxx b/oox/inc/oox/ppt/layoutfragmenthandler.hxx
index 8f1ca06677f8..80983182b73d 100644
--- a/oox/inc/oox/ppt/layoutfragmenthandler.hxx
+++ b/oox/inc/oox/ppt/layoutfragmenthandler.hxx
@@ -29,7 +29,7 @@ namespace oox { namespace ppt {
class LayoutFragmentHandler : public SlideFragmentHandler
{
public:
- LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw();
+ LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw();
virtual ~LayoutFragmentHandler() throw();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
diff --git a/oox/inc/oox/ppt/pptimport.hxx b/oox/inc/oox/ppt/pptimport.hxx
index 1a99b6eab046..035ea8cdc5c1 100644
--- a/oox/inc/oox/ppt/pptimport.hxx
+++ b/oox/inc/oox/ppt/pptimport.hxx
@@ -51,7 +51,7 @@ public:
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; };
- std::map< rtl::OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; };
+ std::map< OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; };
std::vector< SlidePersistPtr >& getDrawPages(){ return maDrawPages; };
std::vector< SlidePersistPtr >& getMasterPages(){ return maMasterPages; };
std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; };
@@ -68,14 +68,14 @@ public:
private:
virtual GraphicHelper* implCreateGraphicHelper() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
private:
- rtl::OUString maTableStyleListPath;
+ OUString maTableStyleListPath;
oox::drawingml::table::TableStyleListPtr mpTableStyleList;
SlidePersistPtr mpActualSlidePersist;
- std::map< rtl::OUString, oox::drawingml::ThemePtr > maThemes;
+ std::map< OUString, oox::drawingml::ThemePtr > maThemes;
std::vector< SlidePersistPtr > maDrawPages;
std::vector< SlidePersistPtr > maMasterPages;
diff --git a/oox/inc/oox/ppt/presentationfragmenthandler.hxx b/oox/inc/oox/ppt/presentationfragmenthandler.hxx
index f6d0feb0897e..ae26cb233e8c 100644
--- a/oox/inc/oox/ppt/presentationfragmenthandler.hxx
+++ b/oox/inc/oox/ppt/presentationfragmenthandler.hxx
@@ -38,7 +38,7 @@ namespace oox { namespace ppt {
class PresentationFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
- PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath ) throw();
+ PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw();
virtual ~PresentationFragmentHandler() throw();
virtual void finalizeImport();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
@@ -51,9 +51,9 @@ private:
void importSlide(sal_uInt32 nSlide, sal_Bool bFirstSlide, sal_Bool bImportNotes);
- std::vector< rtl::OUString > maSlideMasterVector;
- std::vector< rtl::OUString > maSlidesVector;
- std::vector< rtl::OUString > maNotesMasterVector;
+ std::vector< OUString > maSlideMasterVector;
+ std::vector< OUString > maSlidesVector;
+ std::vector< OUString > maNotesMasterVector;
::oox::drawingml::TextListStylePtr mpTextListStyle;
::com::sun::star::awt::Size maSlideSize;
diff --git a/oox/inc/oox/ppt/slidefragmenthandler.hxx b/oox/inc/oox/ppt/slidefragmenthandler.hxx
index b3a9c6745e87..045f6ff1ccda 100644
--- a/oox/inc/oox/ppt/slidefragmenthandler.hxx
+++ b/oox/inc/oox/ppt/slidefragmenthandler.hxx
@@ -34,23 +34,23 @@ namespace oox { namespace ppt {
class SlideFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
- SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw();
+ SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw();
virtual ~SlideFragmentHandler() throw();
virtual void finalizeImport();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
- virtual void onCharacters( const ::rtl::OUString& rChars );
+ virtual void onCharacters( const OUString& rChars );
- const ::std::vector< rtl::OUString>& getCharVector() { return maCharVector; }
+ const ::std::vector< OUString>& getCharVector() { return maCharVector; }
protected:
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
private:
- ::rtl::OUString maSlideName;
+ OUString maSlideName;
PropertyMap maSlideProperties;
- ::std::vector< rtl::OUString> maCharVector; // handle char in OnCharacters
+ ::std::vector< OUString> maCharVector; // handle char in OnCharacters
};
} }
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx
index 10274117b678..6f58d81813c3 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/oox/inc/oox/ppt/slidepersist.hxx
@@ -70,11 +70,11 @@ public:
void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
SlidePersistPtr getMasterPersist() const { return mpMasterPagePtr; }
- void setPath( const rtl::OUString& rPath ) { maPath = rPath; }
- const rtl::OUString getPath() const { return maPath; }
+ void setPath( const OUString& rPath ) { maPath = rPath; }
+ const OUString getPath() const { return maPath; }
- void setLayoutPath( const rtl::OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; }
- const rtl::OUString getLayoutPath() const { return maLayoutPath; }
+ void setLayoutPath( const OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; }
+ const OUString getLayoutPath() const { return maLayoutPath; }
void setTheme( const oox::drawingml::ThemePtr pThemePtr ){ mpThemePtr = pThemePtr; }
oox::drawingml::ThemePtr getTheme() const { return mpThemePtr; }
@@ -113,16 +113,16 @@ public:
void createBackground( const oox::core::XmlFilterBase& rFilterBase );
void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
- std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
- ::oox::drawingml::ShapePtr getShape( const ::rtl::OUString & id ) { return maShapeMap[ id ]; }
+ std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
+ ::oox::drawingml::ShapePtr getShape( const OUString & id ) { return maShapeMap[ id ]; }
::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; }
CommentList& getCommentsList() { return maCommentsList; }
CommentAuthorList& getCommentAuthors() { return maCommentAuthors; }
private:
- rtl::OUString maPath;
- rtl::OUString maLayoutPath;
+ OUString maPath;
+ OUString maLayoutPath;
::boost::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage;
oox::drawingml::ThemePtr mpThemePtr; // the theme that is used
@@ -146,8 +146,8 @@ private:
oox::drawingml::TextListStylePtr maNotesTextStylePtr;
oox::drawingml::TextListStylePtr maOtherTextStylePtr;
- std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
- std::map< ::rtl::OUString, ::oox::drawingml::ShapePtr > maShapeMap;
+ std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
+ std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
// slide comments
CommentList maCommentsList;
diff --git a/oox/inc/oox/ppt/slidetransition.hxx b/oox/inc/oox/ppt/slidetransition.hxx
index f940b39a68fa..01f701d63dfe 100644
--- a/oox/inc/oox/ppt/slidetransition.hxx
+++ b/oox/inc/oox/ppt/slidetransition.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace ppt {
{
public:
SlideTransition();
- explicit SlideTransition(const ::rtl::OUString & );
+ explicit SlideTransition(const OUString & );
void setSlideProperties( PropertyMap& props );
void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter );
diff --git a/oox/inc/oox/ppt/soundactioncontext.hxx b/oox/inc/oox/ppt/soundactioncontext.hxx
index a393e5857e04..d1f1040c75ba 100644
--- a/oox/inc/oox/ppt/soundactioncontext.hxx
+++ b/oox/inc/oox/ppt/soundactioncontext.hxx
@@ -41,9 +41,9 @@ private:
bool mbHasStartSound;
bool mbLoopSound;
bool mbStopSound;
- ::rtl::OUString msEmbedded;
- ::rtl::OUString msLink;
- ::rtl::OUString msSndName;
+ OUString msEmbedded;
+ OUString msLink;
+ OUString msSndName;
};
} }
diff --git a/oox/inc/oox/ppt/timenode.hxx b/oox/inc/oox/ppt/timenode.hxx
index cd66c234392f..769cc0e03943 100644
--- a/oox/inc/oox/ppt/timenode.hxx
+++ b/oox/inc/oox/ppt/timenode.hxx
@@ -45,7 +45,7 @@ namespace oox { namespace ppt {
class TimeNode
{
public:
- typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > UserDataMap;
+ typedef ::std::map< OUString, ::com::sun::star::uno::Any > UserDataMap;
TimeNode( sal_Int16 nNodeType );
virtual ~TimeNode();
@@ -59,7 +59,7 @@ namespace oox { namespace ppt {
{ return maChildren; }
void setId( sal_Int32 nId );
- const ::rtl::OUString & getId() const { return msId; }
+ const OUString & getId() const { return msId; }
void addNode(
const ::oox::core::XmlFilterBase& rFilter,
@@ -96,12 +96,12 @@ namespace oox { namespace ppt {
{ mbHasEndSyncValue = true; return maEndSyncValue; }
protected:
- static rtl::OUString getServiceName( sal_Int16 nNodeType );
+ static OUString getServiceName( sal_Int16 nNodeType );
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
createAndInsert(
const ::oox::core::XmlFilterBase& rFilter,
- const rtl::OUString& rServiceName,
+ const OUString& rServiceName,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode );
private:
@@ -109,7 +109,7 @@ namespace oox { namespace ppt {
TimeNodePtrList maChildren;
- rtl::OUString msId;
+ OUString msId;
NodePropertyMap maNodeProperties;
UserDataMap maUserData; // a sequence to be stored as "UserData" property
SlideTransition maTransitionFilter;
diff --git a/oox/inc/oox/token/namespacemap.hxx b/oox/inc/oox/token/namespacemap.hxx
index 7120675e3cf1..78eeaa93cc40 100644
--- a/oox/inc/oox/token/namespacemap.hxx
+++ b/oox/inc/oox/token/namespacemap.hxx
@@ -29,7 +29,7 @@ namespace oox {
// ============================================================================
/** A map that contains all XML namespace URLs used in the filters. */
-struct NamespaceMap : public ::std::map< sal_Int32, ::rtl::OUString > { NamespaceMap(); };
+struct NamespaceMap : public ::std::map< sal_Int32, OUString > { NamespaceMap(); };
/** Thread-save singleton of a map of all supported XML namespace URLs. */
struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {};
diff --git a/oox/inc/oox/token/propertynames.hxx b/oox/inc/oox/token/propertynames.hxx
index eb42611aae1f..931eaed0172b 100644
--- a/oox/inc/oox/token/propertynames.hxx
+++ b/oox/inc/oox/token/propertynames.hxx
@@ -29,7 +29,7 @@ namespace oox {
// ============================================================================
/** A vector that contains all predefined property names used in the filters. */
-struct PropertyNameVector : public ::std::vector< ::rtl::OUString > { PropertyNameVector(); };
+struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); };
/** Thread-save singleton of a vector of all supported property names. */
struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {};
diff --git a/oox/inc/oox/token/tokenmap.hxx b/oox/inc/oox/token/tokenmap.hxx
index cdeebecceac5..84dc70d03fac 100644
--- a/oox/inc/oox/token/tokenmap.hxx
+++ b/oox/inc/oox/token/tokenmap.hxx
@@ -36,10 +36,10 @@ public:
~TokenMap();
/** Returns the Unicode name of the passed token identifier. */
- ::rtl::OUString getUnicodeTokenName( sal_Int32 nToken ) const;
+ OUString getUnicodeTokenName( sal_Int32 nToken ) const;
/** Returns the token identifier for the passed Unicode token name. */
- sal_Int32 getTokenFromUnicode( const ::rtl::OUString& rUnicodeName ) const;
+ sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName ) const;
/** Returns the UTF8 name of the passed token identifier as byte sequence. */
::com::sun::star::uno::Sequence< sal_Int8 >
@@ -52,7 +52,7 @@ public:
private:
struct TokenName
{
- ::rtl::OUString maUniName;
+ OUString maUniName;
::com::sun::star::uno::Sequence< sal_Int8 > maUtf8Name;
};
typedef ::std::vector< TokenName > TokenNameVector;
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 64015b04c62c..ad7790962366 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -62,8 +62,8 @@ enum DrawingType
/** Contains information about an OLE object embedded in a draw page. */
struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo
{
- ::rtl::OUString maShapeId; ///< Shape identifier for shape lookup.
- ::rtl::OUString maName; ///< Programmatical name of the OLE object.
+ OUString maShapeId; ///< Shape identifier for shape lookup.
+ OUString maName; ///< Programmatical name of the OLE object.
bool mbAutoLoad;
const bool mbDmlShape; ///< True = DrawingML shape (PowerPoint), false = VML shape (Excel/Word).
@@ -78,9 +78,9 @@ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo
/** Contains information about a form control embedded in a draw page. */
struct OOX_DLLPUBLIC ControlInfo
{
- ::rtl::OUString maShapeId; ///< Shape identifier for shape lookup.
- ::rtl::OUString maFragmentPath; ///< Path to the fragment describing the form control properties.
- ::rtl::OUString maName; ///< Programmatical name of the form control.
+ OUString maShapeId; ///< Shape identifier for shape lookup.
+ OUString maFragmentPath; ///< Path to the fragment describing the form control properties.
+ OUString maName; ///< Programmatical name of the form control.
explicit ControlInfo();
@@ -130,17 +130,17 @@ public:
void convertAndInsert() const;
/** Returns the local shape index from the passed global shape identifier. */
- sal_Int32 getLocalShapeIndex( const ::rtl::OUString& rShapeId ) const;
+ sal_Int32 getLocalShapeIndex( const OUString& rShapeId ) const;
/** Returns the registered info structure for an OLE object, if extant. */
- const OleObjectInfo* getOleObjectInfo( const ::rtl::OUString& rShapeId ) const;
+ const OleObjectInfo* getOleObjectInfo( const OUString& rShapeId ) const;
/** Returns the registered info structure for a form control, if extant. */
- const ControlInfo* getControlInfo( const ::rtl::OUString& rShapeId ) const;
+ const ControlInfo* getControlInfo( const OUString& rShapeId ) const;
/** Creates a new UNO shape object, inserts it into the passed UNO shape
container, and sets the shape position and size. */
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
createAndInsertXShape(
- const ::rtl::OUString& rService,
+ const OUString& rService,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
@@ -158,13 +158,13 @@ public:
/** Derived classes may return additional base names for automatic shape
name creation. */
- virtual ::rtl::OUString getShapeBaseName( const ShapeBase& rShape ) const;
+ virtual OUString getShapeBaseName( const ShapeBase& rShape ) const;
/** Derived classes may calculate the shape rectangle from a non-standard
anchor information string. */
virtual bool convertClientAnchor(
::com::sun::star::awt::Rectangle& orShapeRect,
- const ::rtl::OUString& rShapeAnchor ) const;
+ const OUString& rShapeAnchor ) const;
/** Derived classes create a UNO shape according to the passed shape model.
Called for shape models that specify being under host control. */
@@ -189,8 +189,8 @@ private:
typedef ::std::auto_ptr< ::oox::ole::EmbeddedForm > EmbeddedFormPtr;
typedef ::std::auto_ptr< ShapeContainer > ShapeContainerPtr;
SAL_WNODEPRECATED_DECLARATIONS_POP
- typedef ::std::map< ::rtl::OUString, OleObjectInfo > OleObjectInfoMap;
- typedef ::std::map< ::rtl::OUString, ControlInfo > ControlInfoMap;
+ typedef ::std::map< OUString, OleObjectInfo > OleObjectInfoMap;
+ typedef ::std::map< OUString, ControlInfo > ControlInfoMap;
::oox::core::XmlFilterBase& mrFilter; ///< Filter object that imports/exports the VML drawing.
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/oox/inc/oox/vml/vmldrawingfragment.hxx
index 855a5683565b..f0947998a092 100644
--- a/oox/inc/oox/vml/vmldrawingfragment.hxx
+++ b/oox/inc/oox/vml/vmldrawingfragment.hxx
@@ -35,7 +35,7 @@ class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2
public:
explicit DrawingFragment(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
Drawing& rDrawing );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index d6752551e80b..91356e36bce2 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -49,13 +49,13 @@ public:
/** Returns two values contained in rValue separated by cSep.
*/
static bool separatePair(
- ::rtl::OUString& orValue1, ::rtl::OUString& orValue2,
- const ::rtl::OUString& rValue, sal_Unicode cSep );
+ OUString& orValue1, OUString& orValue2,
+ const OUString& rValue, sal_Unicode cSep );
/** Returns the boolean value from the passed string of a VML attribute.
Supported values: 'f', 't', 'false', 'true'. False for anything else.
*/
- static bool decodeBool( const ::rtl::OUString& rValue );
+ static bool decodeBool( const OUString& rValue );
/** Converts the passed VML percentage measure string to a normalized
floating-point value.
@@ -67,7 +67,7 @@ public:
the value will be divided by 65536.
*/
static double decodePercent(
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
double fDefValue );
/** Converts the passed VML measure string to EMU (English Metric Units).
@@ -90,7 +90,7 @@ public:
*/
static sal_Int64 decodeMeasureToEmu(
const GraphicHelper& rGraphicHelper,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
sal_Int32 nRefValue,
bool bPixelX,
bool bDefaultAsPixel );
@@ -105,7 +105,7 @@ public:
*/
static sal_Int32 decodeMeasureToHmm(
const GraphicHelper& rGraphicHelper,
- const ::rtl::OUString& rValue,
+ const OUString& rValue,
sal_Int32 nRefValue,
bool bPixelX,
bool bDefaultAsPixel );
@@ -134,7 +134,7 @@ public:
*/
static ::oox::drawingml::Color decodeColor(
const GraphicHelper& rGraphicHelper,
- const OptValue< ::rtl::OUString >& roVmlColor,
+ const OptValue< OUString >& roVmlColor,
const OptValue< double >& roVmlOpacity,
sal_Int32 nDefaultRgb,
sal_Int32 nPrimaryRgb = API_RGB_TRANSPARENT );
@@ -181,10 +181,10 @@ struct StrokeModel
OptValue< bool > moStroked; ///< Shape border line on/off.
StrokeArrowModel maStartArrow; ///< Start line arrow style.
StrokeArrowModel maEndArrow; ///< End line arrow style.
- OptValue< ::rtl::OUString > moColor; ///< Solid line color.
+ OptValue< OUString > moColor; ///< Solid line color.
OptValue< double > moOpacity; ///< Solid line color opacity.
- OptValue< ::rtl::OUString > moWeight; ///< Line width.
- OptValue< ::rtl::OUString > moDashStyle; ///< Line dash (predefined or manually).
+ OptValue< OUString > moWeight; ///< Line width.
+ OptValue< OUString > moDashStyle; ///< Line dash (predefined or manually).
OptValue< sal_Int32 > moLineStyle; ///< Line style (single, double, ...).
OptValue< sal_Int32 > moEndCap; ///< Type of line end cap.
OptValue< sal_Int32 > moJoinStyle; ///< Type of line join.
@@ -203,16 +203,16 @@ struct StrokeModel
struct FillModel
{
OptValue< bool > moFilled; ///< Shape fill on/off.
- OptValue< ::rtl::OUString > moColor; ///< Solid fill color.
+ OptValue< OUString > moColor; ///< Solid fill color.
OptValue< double > moOpacity; ///< Solid fill color opacity.
- OptValue< ::rtl::OUString > moColor2; ///< End color of gradient.
+ OptValue< OUString > moColor2; ///< End color of gradient.
OptValue< double > moOpacity2; ///< End color opacity of gradient.
OptValue< sal_Int32 > moType; ///< Fill type.
OptValue< sal_Int32 > moAngle; ///< Gradient rotation angle.
OptValue< double > moFocus; ///< Linear gradient focus of second color.
OptValue< DoublePair > moFocusPos; ///< Rectangular gradient focus position of second color.
OptValue< DoublePair > moFocusSize; ///< Rectangular gradient focus size of second color.
- OptValue< ::rtl::OUString > moBitmapPath; ///< Path to fill bitmap fragment.
+ OptValue< OUString > moBitmapPath; ///< Path to fill bitmap fragment.
OptValue< bool > moRotate; ///< True = rotate gradient/bitmap with shape.
void assignUsed( const FillModel& rSource );
diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/oox/inc/oox/vml/vmlinputstream.hxx
index 5c23af76971f..7c8e13160722 100644
--- a/oox/inc/oox/vml/vmlinputstream.hxx
+++ b/oox/inc/oox/vml/vmlinputstream.hxx
@@ -74,17 +74,17 @@ public:
private:
void updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- ::rtl::OString readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- ::rtl::OString readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ OString readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ OString readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 >
mxTextStrm;
::com::sun::star::uno::Sequence< sal_Unicode > maOpeningBracket;
::com::sun::star::uno::Sequence< sal_Unicode > maClosingBracket;
- const ::rtl::OString maOpeningCData;
- const ::rtl::OString maClosingCData;
- ::rtl::OString maBuffer;
+ const OString maOpeningCData;
+ const OString maClosingCData;
+ OString maBuffer;
sal_Int32 mnBufferPos;
};
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index f1a96523e9ce..7b6a4a9376c7 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -57,42 +57,42 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4;
/** The shape model structure contains all properties shared by all types of shapes. */
struct OOX_DLLPUBLIC ShapeTypeModel
{
- ::rtl::OUString maShapeId; ///< Unique identifier of the shape.
- ::rtl::OUString maShapeName; ///< Name of the shape, if present.
+ OUString maShapeId; ///< Unique identifier of the shape.
+ OUString maShapeName; ///< Name of the shape, if present.
OptValue< sal_Int32 > moShapeType; ///< Builtin shape type identifier.
OptValue< Int32Pair > moCoordPos; ///< Top-left position of coordinate system for children scaling.
OptValue< Int32Pair > moCoordSize; ///< Size of coordinate system for children scaling.
- ::rtl::OUString maPosition; ///< Position type of the shape.
- ::rtl::OUString maLeft; ///< X position of the shape bounding box (number with unit).
- ::rtl::OUString maTop; ///< Y position of the shape bounding box (number with unit).
- ::rtl::OUString maWidth; ///< Width of the shape bounding box (number with unit).
- ::rtl::OUString maHeight; ///< Height of the shape bounding box (number with unit).
- ::rtl::OUString maMarginLeft; ///< X position of the shape bounding box to shape anchor (number with unit).
- ::rtl::OUString maMarginTop; ///< Y position of the shape bounding box to shape anchor (number with unit).
- ::rtl::OUString maPositionHorizontalRelative; ///< The X position is relative to this.
- ::rtl::OUString maPositionVerticalRelative; ///< The Y position is relative to this.
- ::rtl::OUString maPositionHorizontal; ///< The X position orientation (default: absolute).
- ::rtl::OUString maPositionVertical; ///< The Y position orientation.
- ::rtl::OUString maWidthPercent; ///< The width in percents of the WidthRelative
- ::rtl::OUString maHeightPercent; ///< The height in percents of the HeightRelative
- ::rtl::OUString maWidthRelative; ///< To what the width is relative
- ::rtl::OUString maHeightRelative; ///< To what the height is relative
- ::rtl::OUString maRotation; ///< Rotation of the shape, in degrees.
- ::rtl::OUString maFlip; ///< Flip type of the shape (can be "x" or "y").
+ OUString maPosition; ///< Position type of the shape.
+ OUString maLeft; ///< X position of the shape bounding box (number with unit).
+ OUString maTop; ///< Y position of the shape bounding box (number with unit).
+ OUString maWidth; ///< Width of the shape bounding box (number with unit).
+ OUString maHeight; ///< Height of the shape bounding box (number with unit).
+ OUString maMarginLeft; ///< X position of the shape bounding box to shape anchor (number with unit).
+ OUString maMarginTop; ///< Y position of the shape bounding box to shape anchor (number with unit).
+ OUString maPositionHorizontalRelative; ///< The X position is relative to this.
+ OUString maPositionVerticalRelative; ///< The Y position is relative to this.
+ OUString maPositionHorizontal; ///< The X position orientation (default: absolute).
+ OUString maPositionVertical; ///< The Y position orientation.
+ OUString maWidthPercent; ///< The width in percents of the WidthRelative
+ OUString maHeightPercent; ///< The height in percents of the HeightRelative
+ OUString maWidthRelative; ///< To what the width is relative
+ OUString maHeightRelative; ///< To what the height is relative
+ OUString maRotation; ///< Rotation of the shape, in degrees.
+ OUString maFlip; ///< Flip type of the shape (can be "x" or "y").
sal_Bool mbAutoHeight; ///< If true, the height value is a minimum value (mostly used for textboxes)
sal_Bool mbVisible; ///< Visible or Hidden
- ::rtl::OUString maWrapStyle; ///< Wrapping mode for text.
- ::rtl::OUString maArcsize; ///< round rectangles arc size
+ OUString maWrapStyle; ///< Wrapping mode for text.
+ OUString maArcsize; ///< round rectangles arc size
StrokeModel maStrokeModel; ///< Border line formatting.
FillModel maFillModel; ///< Shape fill formatting.
ShadowModel maShadowModel; ///< Shape shadow formatting.
- OptValue< ::rtl::OUString > moGraphicPath; ///< Path to a graphic for this shape.
- OptValue< ::rtl::OUString > moGraphicTitle; ///< Title of the graphic.
- OptValue< ::rtl::OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated.
- OptValue< ::rtl::OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated.
+ OptValue< OUString > moGraphicPath; ///< Path to a graphic for this shape.
+ OptValue< OUString > moGraphicTitle; ///< Title of the graphic.
+ OptValue< OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated.
+ OptValue< OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated.
explicit ShapeTypeModel();
@@ -115,11 +115,11 @@ public:
inline const ShapeTypeModel& getTypeModel() const { return maTypeModel; }
/** Returns the shape identifier (which is unique through the containing drawing). */
- inline const ::rtl::OUString& getShapeId() const { return maTypeModel.maShapeId; }
+ inline const OUString& getShapeId() const { return maTypeModel.maShapeId; }
/** Returns the application defined shape type. */
sal_Int32 getShapeType() const;
/** Returns the fragment path to the embedded graphic used by this shape. */
- ::rtl::OUString getGraphicPath() const;
+ OUString getGraphicPath() const;
const Drawing& getDrawing() const { return mrDrawing; }
@@ -143,12 +143,12 @@ protected:
/** Excel specific shape client data (such as cell anchor). */
struct ClientData
{
- ::rtl::OUString maAnchor; ///< Cell anchor as comma-separated string.
- ::rtl::OUString maFmlaMacro; ///< Link to macro associated to the control.
- ::rtl::OUString maFmlaPict; ///< Target cell range of picture links.
- ::rtl::OUString maFmlaLink; ///< Link to value cell associated to the control.
- ::rtl::OUString maFmlaRange; ///< Link to cell range used as data source for the control.
- ::rtl::OUString maFmlaGroup; ///< Link to value cell associated to a group of option buttons.
+ OUString maAnchor; ///< Cell anchor as comma-separated string.
+ OUString maFmlaMacro; ///< Link to macro associated to the control.
+ OUString maFmlaPict; ///< Target cell range of picture links.
+ OUString maFmlaLink; ///< Link to value cell associated to the control.
+ OUString maFmlaRange; ///< Link to cell range used as data source for the control.
+ OUString maFmlaGroup; ///< Link to value cell associated to a group of option buttons.
sal_Int32 mnObjType; ///< Type of the shape.
sal_Int32 mnTextHAlign; ///< Horizontal text alignment.
sal_Int32 mnTextVAlign; ///< Vertical text alignment.
@@ -186,16 +186,16 @@ struct ShapeModel
typedef ::std::auto_ptr< ClientData > ClientDataPtr;
SAL_WNODEPRECATED_DECLARATIONS_POP
- ::rtl::OUString maType; ///< Shape template with default properties.
+ OUString maType; ///< Shape template with default properties.
PointVector maPoints; ///< Points for the polyline shape.
TextBoxPtr mxTextBox; ///< Text contents and properties.
ClientDataPtr mxClientData; ///< Excel specific client data.
- ::rtl::OUString maLegacyDiagramPath;///< Legacy Diagram Fragment Path
- ::rtl::OUString maFrom; ///< Start point for line shape.
- ::rtl::OUString maTo; ///< End point for line shape.
- ::rtl::OUString maControl1; ///< Bezier control point 1
- ::rtl::OUString maControl2; ///< Bezier control point 2
- ::rtl::OUString maVmlPath; ///< VML path for this shape
+ OUString maLegacyDiagramPath;///< Legacy Diagram Fragment Path
+ OUString maFrom; ///< Start point for line shape.
+ OUString maTo; ///< End point for line shape.
+ OUString maControl1; ///< Bezier control point 1
+ OUString maControl2; ///< Bezier control point 2
+ OUString maVmlPath; ///< VML path for this shape
explicit ShapeModel();
~ShapeModel();
@@ -227,12 +227,12 @@ public:
virtual void finalizeFragmentImport();
/** Returns the real shape name if existing, or a generated shape name. */
- ::rtl::OUString getShapeName() const;
+ OUString getShapeName() const;
/** Returns the shape template with the passed identifier from the child shapes. */
- virtual const ShapeType* getChildTypeById( const ::rtl::OUString& rShapeId ) const;
+ virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const;
/** Returns the shape with the passed identifier from the child shapes. */
- virtual const ShapeBase* getChildById( const ::rtl::OUString& rShapeId ) const;
+ virtual const ShapeBase* getChildById( const OUString& rShapeId ) const;
/** Creates the corresponding XShape and inserts it into the passed container. */
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
@@ -273,9 +273,9 @@ protected:
class SimpleShape : public ShapeBase
{
public:
- explicit SimpleShape( Drawing& rDrawing, const ::rtl::OUString& rService );
+ explicit SimpleShape( Drawing& rDrawing, const OUString& rService );
- void setService( rtl::OUString aService ) { maService = aService; }
+ void setService( OUString aService ) { maService = aService; }
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
@@ -289,7 +289,7 @@ protected:
const com::sun::star::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const;
private:
- ::rtl::OUString maService; ///< Name of the UNO shape service.
+ OUString maService; ///< Name of the UNO shape service.
};
// ============================================================================
@@ -411,9 +411,9 @@ public:
virtual void finalizeFragmentImport();
/** Returns the shape template with the passed identifier from the child shapes. */
- virtual const ShapeType* getChildTypeById( const ::rtl::OUString& rShapeId ) const;
+ virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const;
/** Returns the shape with the passed identifier from the child shapes. */
- virtual const ShapeBase* getChildById( const ::rtl::OUString& rShapeId ) const;
+ virtual const ShapeBase* getChildById( const OUString& rShapeId ) const;
protected:
/** Creates the corresponding XShape and inserts it into the passed container. */
diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/oox/inc/oox/vml/vmlshapecontainer.hxx
index f1b707bcbe2e..5e6a2c2a9d75 100644
--- a/oox/inc/oox/vml/vmlshapecontainer.hxx
+++ b/oox/inc/oox/vml/vmlshapecontainer.hxx
@@ -70,10 +70,10 @@ public:
/** Returns the shape template with the passed identifier.
@param bDeep True = searches in all group shapes too. */
- const ShapeType* getShapeTypeById( const ::rtl::OUString& rShapeId, bool bDeep ) const;
+ const ShapeType* getShapeTypeById( const OUString& rShapeId, bool bDeep ) const;
/** Returns the shape with the passed identifier.
@param bDeep True = searches in all group shapes too. */
- const ShapeBase* getShapeById( const ::rtl::OUString& rShapeId, bool bDeep ) const;
+ const ShapeBase* getShapeById( const OUString& rShapeId, bool bDeep ) const;
/** Searches for a shape type by using the passed functor that takes a
constant reference of a ShapeType object. */
@@ -110,8 +110,8 @@ public:
private:
typedef RefVector< ShapeType > ShapeTypeVector;
typedef RefVector< ShapeBase > ShapeVector;
- typedef RefMap< ::rtl::OUString, ShapeType > ShapeTypeMap;
- typedef RefMap< ::rtl::OUString, ShapeBase > ShapeMap;
+ typedef RefMap< OUString, ShapeType > ShapeTypeMap;
+ typedef RefMap< OUString, ShapeBase > ShapeMap;
Drawing& mrDrawing; ///< The VML drawing page that contains this shape.
ShapeTypeVector maTypes; ///< All shape templates.
diff --git a/oox/inc/oox/vml/vmlshapecontext.hxx b/oox/inc/oox/vml/vmlshapecontext.hxx
index e3d5d8963eb2..803674088e37 100644
--- a/oox/inc/oox/vml/vmlshapecontext.hxx
+++ b/oox/inc/oox/vml/vmlshapecontext.hxx
@@ -66,12 +66,12 @@ public:
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:
ClientData& mrClientData;
- ::rtl::OUString maElementText;
+ OUString maElementText;
};
// ============================================================================
@@ -105,10 +105,10 @@ public:
private:
/** Processes the 'style' attribute. */
- void setStyle( const ::rtl::OUString& rStyle );
+ void setStyle( const OUString& rStyle );
/** Resolve a relation identifier to a fragment path. */
- OptValue< ::rtl::OUString > decodeFragmentPath( const AttributeList& rAttribs, sal_Int32 nToken ) const;
+ OptValue< OUString > decodeFragmentPath( const AttributeList& rAttribs, sal_Int32 nToken ) const;
private:
ShapeTypeModel& mrTypeModel;
@@ -129,17 +129,17 @@ public:
private:
/** Processes the 'points' attribute. */
- void setPoints( const ::rtl::OUString& rPoints );
+ void setPoints( const OUString& rPoints );
/** Processes the 'from' attribute. */
- void setFrom( const ::rtl::OUString& rPoints );
+ void setFrom( const OUString& rPoints );
/** Processes the 'to' attribute. */
- void setTo( const ::rtl::OUString& rPoints );
+ void setTo( const OUString& rPoints );
/** Processes the 'control1' attribute. */
- void setControl1( const ::rtl::OUString& rPoints );
+ void setControl1( const OUString& rPoints );
/** Processes the 'control2' attribute. */
- void setControl2( const ::rtl::OUString& rPoints );
+ void setControl2( const OUString& rPoints );
/** Processes the 'path' attribute. */
- void setVmlPath( const ::rtl::OUString& rPath );
+ void setVmlPath( const OUString& rPath );
protected:
ShapeBase& mrShape;
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index f234b00b9665..4975e6bb26b6 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -40,8 +40,8 @@ struct ShapeTypeModel;
/** Font settings for a text portion in a textbox. */
struct OOX_DLLPUBLIC TextFontModel
{
- OptValue< ::rtl::OUString > moName; ///< Font name.
- OptValue< ::rtl::OUString > moColor; ///< Font color, HTML encoded, sort of.
+ OptValue< OUString > moName; ///< Font name.
+ OptValue< OUString > moColor; ///< Font color, HTML encoded, sort of.
OptValue< sal_Int32 > monSize; ///< Font size in twips.
OptValue< sal_Int32 > monUnderline; ///< Single or double underline.
OptValue< sal_Int32 > monEscapement; ///< Subscript or superscript.
@@ -58,9 +58,9 @@ struct OOX_DLLPUBLIC TextFontModel
struct TextPortionModel
{
TextFontModel maFont;
- ::rtl::OUString maText;
+ OUString maText;
- explicit TextPortionModel( const TextFontModel& rFont, const ::rtl::OUString& rText );
+ explicit TextPortionModel( const TextFontModel& rFont, const OUString& rText );
};
// ============================================================================
@@ -72,14 +72,14 @@ public:
explicit TextBox(ShapeTypeModel& rTypeModel);
/** Appends a new text portion to the textbox. */
- void appendPortion( const TextFontModel& rFont, const ::rtl::OUString& rText );
+ void appendPortion( const TextFontModel& rFont, const OUString& rText );
/** Returns the current number of text portions. */
inline size_t getPortionCount() const { return maPortions.size(); }
/** Returns the font settings of the first text portion. */
const TextFontModel* getFirstFont() const;
/** Returns the entire text of all text portions. */
- ::rtl::OUString getText() const;
+ OUString getText() const;
void convert(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape) const;
ShapeTypeModel& mrTypeModel;
diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx b/oox/inc/oox/vml/vmltextboxcontext.hxx
index a644026f7b4d..47d71ac41b41 100644
--- a/oox/inc/oox/vml/vmltextboxcontext.hxx
+++ b/oox/inc/oox/vml/vmltextboxcontext.hxx
@@ -40,7 +40,7 @@ public:
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 onStartElement(const AttributeList& rAttribs);
virtual void onEndElement();
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index 1a90ce48ccd2..2d41797631f6 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -29,7 +29,6 @@ namespace core {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 2a7442bdbcfe..560965a1543b 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -28,8 +28,6 @@ namespace core {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// ============================================================================
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index ffeb255df0a6..03fd60a7481e 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index 3791b950dc26..c71f966b587c 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -30,7 +30,6 @@ namespace core {
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 8643d2c75d74..4d31f0547787 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -56,7 +56,6 @@ using ::comphelper::MediaDescriptor;
using ::comphelper::SequenceAsHashMap;
using ::oox::ole::OleObjectHelper;
using ::oox::ole::VbaProject;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index a581d10c1d66..1bc095fd1395 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::xml::sax;
using ::comphelper::MediaDescriptor;
using ::comphelper::SequenceAsHashMap;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx
index 3c970bbff1a0..f390698be446 100644
--- a/oox/source/core/fragmenthandler.cxx
+++ b/oox/source/core/fragmenthandler.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx
index bfc68343a1b9..b94ff56a9641 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -28,7 +28,6 @@ namespace core {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
@@ -86,9 +85,9 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis
if( !str.isEmpty() )
{
Sequence< ::com::sun::star::xml::FastAttribute > attrs = rAttribs.getFastAttributeList()->getFastAttributes();
- // printf("MCE: %s\n", ::rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
+ // printf("MCE: %s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
// TODO: Check & Get the namespaces in "Ignorable"
- // printf("NS: %d : %s\n", attrs.getLength(), ::rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
+ // printf("NS: %d : %s\n", attrs.getLength(), OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
return false;
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 43018cd35233..0f302b840bec 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index c49fe6320bf4..ef4d0b139cfe 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -27,8 +27,6 @@ namespace core {
// ============================================================================
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// ============================================================================
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index 899a8d25efd5..73005eb216f8 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -30,8 +30,6 @@ namespace core {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// ============================================================================
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index aec65592db88..6873e4d194ce 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -19,7 +19,6 @@
#include <cppuhelper/implementationentry.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star::uno;
// Declare static functions providing service information =====================
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 2289e4d4be61..73d223eec1bc 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -72,9 +72,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using ::comphelper::MediaDescriptor;
-using ::rtl::OStringBuffer;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::sax_fastparser::FSHelperPtr;
using ::sax_fastparser::FastSerializerHelper;
@@ -496,7 +493,7 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const util::DateTime& rTi
}
static void
-writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, Sequence< rtl::OUString > aItems )
+writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, Sequence< OUString > aItems )
{
if( aItems.getLength() == 0 )
return;
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 51eccab59548..b3e79048eb67 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -50,7 +50,7 @@ class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xm
sal_Int32 m_nInBlock;
- ::rtl::OUString m_aCustomPropertyName;
+ OUString m_aCustomPropertyName;
public:
explicit OOXMLDocPropHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xDocProp );
@@ -60,10 +60,10 @@ public:
void InitNew();
void AddCustomProperty( const ::com::sun::star::uno::Any& aAny );
- ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const ::rtl::OUString& aChars );
- ::com::sun::star::uno::Sequence< ::rtl::OUString > GetKeywordsSet( const ::rtl::OUString& aChars );
- ::com::sun::star::lang::Locale GetLanguage( const ::rtl::OUString& aChars );
- void UpdateDocStatistic( const ::rtl::OUString& aChars );
+ ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars );
+ ::com::sun::star::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars );
+ ::com::sun::star::lang::Locale GetLanguage( const OUString& aChars );
+ void UpdateDocStatistic( const OUString& aChars );
// com.sun.star.xml.sax.XFastDocumentHandler
@@ -74,14 +74,14 @@ public:
// com.sun.star.xml.sax.XFastContextHandler
virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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 ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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);
};
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index ea91a6a2daa4..f4d3092e83ee 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index 25122942c20b..acbf15de00c2 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -41,9 +41,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
// 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);
// XOOXMLDocumentPropertiesImporter
virtual void SAL_CALL importProperties(
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index e42ddcf82967..5497be835933 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -62,7 +62,7 @@ class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2
public:
DiagramQStylesFragmentHandler(
oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
DiagramQStyleMap& rStylesMap );
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -75,7 +75,7 @@ private:
const AttributeList& rAttribs,
ShapeStyleRef& o_rStyle);
- ::rtl::OUString maStyleName;
+ OUString maStyleName;
DiagramStyle maStyleEntry;
DiagramQStyleMap& mrStylesMap;
};
@@ -85,7 +85,7 @@ class ColorFragmentHandler : public ::oox::core::FragmentHandler2
public:
ColorFragmentHandler(
::oox::core::XmlFilterBase& rFilter,
- const ::rtl::OUString& rFragmentPath,
+ const OUString& rFragmentPath,
DiagramColorMap& rColorMap );
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -94,7 +94,7 @@ public:
virtual void onEndElement();
private:
- ::rtl::OUString maColorName;
+ OUString maColorName;
DiagramColor maColorEntry;
DiagramColorMap& mrColorsMap;
};
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 000859d9ef70..07b5371fbf17 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2302,7 +2302,7 @@ void ChartExport::exportDataLabels(
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( "Exception caught during Export of data label: %s",
- rtl::OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
if( xPropSet.is() )
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index e72a90acd738..23f89aeaa299 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -111,7 +111,7 @@ BinaryOutputStream::writeCharArrayUC( const OUString& rString, rtl_TextEncoding
}
void
-BinaryOutputStream::writeUnicodeArray( const ::rtl::OUString& rString, bool bAllowNulChars )
+BinaryOutputStream::writeUnicodeArray( const OUString& rString, bool bAllowNulChars )
{
OUString sBuf( rString );
if( !bAllowNulChars )
@@ -127,7 +127,7 @@ BinaryOutputStream::writeUnicodeArray( const ::rtl::OUString& rString, bool bAll
}
void
-BinaryOutputStream::writeCompressedUnicodeArray( const rtl::OUString& rString, bool bCompressed, bool bAllowNulChars )
+BinaryOutputStream::writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars )
{
if ( bCompressed )
// ISO-8859-1 maps all byte values 0xHH to the same Unicode code point U+00HH
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 1cdf563dc956..af3e0b41a228 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -91,8 +91,6 @@ using namespace ::com::sun::star::uno;
using ::com::sun::star::drawing::TextHorizontalAdjust;
using ::com::sun::star::drawing::TextVerticalAdjust;
-using ::rtl::OString;
-using ::rtl::OUString;
// ============================================================================
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index 6d44cf07f000..2b51604fb467 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -114,7 +114,7 @@ OUString& XmlStream::AttributeList::operator[] (int token)
return attrs[token];
}
-rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString& def ) const
+OUString XmlStream::AttributeList::attribute( int token, const OUString& def ) const
{
std::map< int, OUString >::const_iterator find = attrs.find( token );
if( find != attrs.end())
@@ -158,7 +158,7 @@ sal_Unicode XmlStream::AttributeList::attribute( int token, sal_Unicode def ) co
return def;
}
-XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const rtl::OUString& txt )
+XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const OUString& txt )
: token( t )
, attributes( AttributeListBuilder( a ))
, text( txt )
@@ -353,7 +353,7 @@ void XmlStreamBuilder::appendClosingTag( int token )
tags.push_back( Tag( CLOSING( token )));
}
-void XmlStreamBuilder::appendCharacters( const rtl::OUString& chars )
+void XmlStreamBuilder::appendCharacters( const OUString& chars )
{
assert( !tags.empty());
tags.back().text += chars;
diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx
index 8ca11b9caca1..26725ffdf0f6 100644
--- a/oox/source/ppt/comments.cxx
+++ b/oox/source/ppt/comments.cxx
@@ -29,7 +29,7 @@ void CommentAuthorList::setValues(const CommentAuthorList& list)
}
//DateTime is saved as : 2013-01-10T15:53:26.000
-void Comment::setDateTime (::rtl::OUString datetime)
+void Comment::setDateTime (OUString datetime)
{
aDateTime.Year = datetime.getToken(0,'-').toInt32();
aDateTime.Month = datetime.getToken(1,'-').toInt32();
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index d38d815a8514..247b81b981a1 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -281,7 +281,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, sal_Bool bFirst
{
// Comments are present and commentAuthors.xml has still not been read
mbCommentAuthorsRead = true;
- rtl::OUString aCommentAuthorsFragmentPath = "ppt/commentAuthors.xml";
+ OUString aCommentAuthorsFragmentPath = "ppt/commentAuthors.xml";
Reference< XPresentationPage > xPresentationPage( xSlide, UNO_QUERY );
Reference< XDrawPage > xCommentAuthorsPage( xPresentationPage->getNotesPage() );
SlidePersistPtr pCommentAuthorsPersistPtr(
diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index 46361639a802..c6bfdd5f47f8 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -25,8 +25,8 @@
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;
}
@@ -37,19 +37,19 @@ namespace com { namespace sun { namespace star { namespace packages {
class ContentInfo;
} } } }
-typedef boost::unordered_map < rtl::OUString,
+typedef boost::unordered_map < OUString,
ZipPackageFolder *,
- ::rtl::OUStringHash,
+ OUStringHash,
eqFunc > FolderHash;
-typedef boost::unordered_map < rtl::OUString,
+typedef boost::unordered_map < OUString,
rtl::Reference < com::sun::star::packages::ContentInfo >,
- ::rtl::OUStringHash,
+ OUStringHash,
eqFunc > ContentHash;
-typedef boost::unordered_map < rtl::OUString,
+typedef boost::unordered_map < OUString,
ZipEntry,
- rtl::OUStringHash,
+ OUStringHash,
eqFunc > EntryHash;
#endif
diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx
index 98de664cce17..31b8ba67cde1 100644
--- a/package/inc/ZipEntry.hxx
+++ b/package/inc/ZipEntry.hxx
@@ -33,7 +33,7 @@ struct ZipEntry
sal_Int64 nOffset;
sal_Int16 nPathLen;
sal_Int16 nExtraLen;
- ::rtl::OUString sPath;
+ OUString sPath;
};
#endif
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 59a0027ff028..e17a0cfae6a6 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -57,7 +57,7 @@ class ZipFile
protected:
::osl::Mutex m_aMutex;
- ::rtl::OUString sComment; /* zip file comment */
+ OUString sComment; /* zip file comment */
EntryHash aEntries;
ByteGrabber aGrabber;
ZipUtils::Inflater aInflater;
@@ -87,7 +87,7 @@ protected:
const ::rtl::Reference < EncryptionData > &rData,
sal_Int8 nStreamMode,
sal_Bool bDecrypt,
- ::rtl::OUString aMediaType = ::rtl::OUString() );
+ OUString aMediaType = OUString() );
sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData );
@@ -137,7 +137,7 @@ public:
static void StaticFillHeader ( const ::rtl::Reference < EncryptionData > & rData,
sal_Int64 nSize,
- const ::rtl::OUString& aMediaType,
+ const OUString& aMediaType,
sal_Int8 * & pHeader );
static sal_Bool StaticFillData ( ::rtl::Reference < BaseEncryptionData > & rData,
@@ -146,7 +146,7 @@ public:
sal_Int32 &rDerivedKeySize,
sal_Int32 &rStartKeyGenID,
sal_Int32 &rSize,
- ::rtl::OUString& aMediaType,
+ OUString& aMediaType,
const ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream );
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > StaticGetDataFromRawStream(
@@ -183,7 +183,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getWrappedRawStream(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
- const ::rtl::OUString& aMediaType,
+ const OUString& aMediaType,
SotMutexHolderRef aMutexHolder )
throw ( ::com::sun::star::packages::NoEncryptionException,
::com::sun::star::io::IOException,
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 0f1970725632..d14d53eac6a4 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -48,7 +48,7 @@ protected:
::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer;
- ::rtl::OUString sComment;
+ OUString sComment;
ZipUtils::Deflater aDeflater;
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext;
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 7aeb32f159cd..3631799c59e9 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -81,7 +81,7 @@ protected:
::com::sun::star::uno::Sequence< sal_Int8 > m_aEncryptionKey;
FolderHash m_aRecent;
- ::rtl::OUString m_aURL;
+ OUString m_aURL;
sal_Int32 m_nStartKeyGenerationID;
sal_Int32 m_nChecksumDigestID;
@@ -142,9 +142,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);
// XHierarchicalNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& aName )
+ virtual ::com::sun::star::uno::Any SAL_CALL 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 )
+ virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
// XSingleServiceFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( )
@@ -166,32 +166,32 @@ 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);
// Uno componentiseralation
- static ::rtl::OUString static_getImplementationName();
- static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+ static OUString static_getImplementationName();
+ static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
- sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
+ sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
};
#endif
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index 5afe30eae113..6d3bf070a48b 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -40,19 +40,19 @@ class ZipPackageEntry : public cppu::WeakImplHelper5
>
{
protected:
- ::rtl::OUString msName;
+ OUString msName;
bool mbIsFolder:1;
bool mbAllowRemoveOnInsert:1;
// com::sun::star::uno::Reference < com::sun::star::container::XNameContainer > xParent;
- ::rtl::OUString sMediaType;
+ OUString sMediaType;
ZipPackageFolder * pParent;
public:
ZipEntry aEntry;
ZipPackageEntry ( bool bNewFolder = sal_False );
virtual ~ZipPackageEntry( void );
- ::rtl::OUString & GetMediaType () { return sMediaType; }
- void SetMediaType ( const ::rtl::OUString & sNewType) { sMediaType = sNewType; }
+ OUString & GetMediaType () { return sMediaType; }
+ void SetMediaType ( const OUString & sNewType) { sMediaType = sNewType; }
void doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bInsert );
bool IsFolder ( ) { return mbIsFolder; }
ZipPackageFolder* GetParent ( ) { return pParent; }
@@ -64,9 +64,9 @@ public:
pParent = NULL;
}
// 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& aName )
+ virtual void SAL_CALL setName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
// XChild
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( )
@@ -79,17 +79,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 )
+ 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 ::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) = 0;
- 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);
};
#endif
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index a99813c15b58..2a41e94d9dfd 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -52,7 +52,7 @@ class ZipPackageFolder : public cppu::ImplInheritanceHelper2
private:
ContentHash maContents;
sal_Int32 m_nFormat;
- ::rtl::OUString m_sVersion;
+ OUString m_sVersion;
public:
@@ -60,17 +60,17 @@ public:
sal_Bool bAllowRemoveOnInsert );
virtual ~ZipPackageFolder();
- ::rtl::OUString& GetVersion() { return m_sVersion; }
- void SetVersion( const ::rtl::OUString& aVersion ) { m_sVersion = aVersion; }
+ OUString& GetVersion() { return m_sVersion; }
+ void SetVersion( const OUString& aVersion ) { m_sVersion = aVersion; }
- sal_Bool LookForUnexpectedODF12Streams( const ::rtl::OUString& aPath );
+ sal_Bool LookForUnexpectedODF12Streams( const OUString& aPath );
void setChildStreamsTypeByExtension( const ::com::sun::star::beans::StringPair& aPair );
void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- com::sun::star::packages::ContentInfo & doGetByName( const ::rtl::OUString& aName )
+ com::sun::star::packages::ContentInfo & doGetByName( const OUString& aName )
throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
@@ -79,17 +79,17 @@ public:
void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; }
- bool saveChild(const rtl::OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool);
+ bool saveChild(const OUString &rShortName, const com::sun::star::packages::ContentInfo &rInfo, OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence < sal_Int8 >& rEncryptionKey, rtlRandomPool & rRandomPool);
// Recursive functions
- void saveContents(rtl::OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool)
+ void saveContents(OUString &rPath, std::vector < com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > > &rManList, ZipOutputStream & rZipOut, const com::sun::star::uno::Sequence< sal_Int8 > &rEncryptionKey, rtlRandomPool & rRandomPool)
throw(::com::sun::star::uno::RuntimeException);
void releaseUpwardRef();
// 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);
// XEnumerationAccess
@@ -103,21 +103,21 @@ 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, ::com::sun::star::uno::RuntimeException);
// XPropertySet
- 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);
// XUnoTunnel
@@ -125,11 +125,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);
};
#endif
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 70e8e13c03f8..a127dd8fd555 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -191,17 +191,17 @@ public:
throw(::com::sun::star::uno::RuntimeException);
// XPropertySet
- 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);
// 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);
};
#endif
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 0d87fe6a6de0..8b1fc0d962f7 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -58,15 +58,15 @@ public:
virtual ~OZipFileAccess();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPatternsFromString_Impl( const ::rtl::OUString& aString );
+ ::com::sun::star::uno::Sequence< OUString > GetPatternsFromString_Impl( const OUString& aString );
- sal_Bool StringGoodForPattern_Impl( const ::rtl::OUString& aString,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPattern );
+ sal_Bool StringGoodForPattern_Impl( const OUString& aString,
+ const ::com::sun::star::uno::Sequence< OUString >& aPattern );
- 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 >& rxMSF );
@@ -76,14 +76,14 @@ 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);
// 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);
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);
// XZipFileAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const ::rtl::OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
// XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException);
@@ -91,9 +91,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);
};
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 51afa9332d7b..1ecb093c3e2b 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -36,8 +36,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHandler, const uno::Sequence< uno::Sequence < beans::PropertyValue > >& rManList )
{
@@ -94,13 +92,13 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
const sal_uInt32 nManLength = rManList.getLength();
// find the mediatype of the document if any
- ::rtl::OUString aDocMediaType;
- ::rtl::OUString aDocVersion;
+ OUString aDocMediaType;
+ OUString aDocVersion;
for (sal_uInt32 nInd = 0; nInd < nManLength ; nInd++ )
{
- ::rtl::OUString aMediaType;
- ::rtl::OUString aPath;
- ::rtl::OUString aVersion;
+ OUString aMediaType;
+ OUString aPath;
+ OUString aVersion;
const beans::PropertyValue *pValue = pSequence[nInd].getConstArray();
for (sal_uInt32 j = 0, nNum = pSequence[nInd].getLength(); j < nNum; j++, pValue++)
@@ -192,7 +190,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
{
::comphelper::AttributeList *pAttrList = new ::comphelper::AttributeList;
const beans::PropertyValue *pValue = pSequence[i].getConstArray();
- ::rtl::OUString aString;
+ OUString aString;
const uno::Any *pVector = NULL, *pSalt = NULL, *pIterationCount = NULL, *pDigest = NULL, *pDigestAlg = NULL, *pEncryptAlg = NULL, *pStartKeyAlg = NULL, *pDerivedKeySize = NULL;
for (sal_uInt32 j = 0, nNum = pSequence[i].getLength(); j < nNum; j++, pValue++)
{
@@ -217,7 +215,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
{
sal_Int64 nSize = 0;
pValue->Value >>= nSize;
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
aBuffer.append ( nSize );
pAttrList->AddAttribute ( sSizeAttribute, sCdataAttribute, aBuffer.makeStringAndClear() );
}
@@ -247,13 +245,13 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
// ==== Encryption Data
::comphelper::AttributeList * pNewAttrList = new ::comphelper::AttributeList;
uno::Reference < xml::sax::XAttributeList > xNewAttrList (pNewAttrList);
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
uno::Sequence < sal_Int8 > aSequence;
xHandler->ignorableWhitespace ( sWhiteSpace );
// ==== Digest
- ::rtl::OUString sChecksumType;
+ OUString sChecksumType;
sal_Int32 nDigestAlgID = 0;
*pDigestAlg >>= nDigestAlgID;
if ( nDigestAlgID == xml::crypto::DigestID::SHA256_1K )
@@ -279,7 +277,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
*pEncryptAlg >>= nEncAlgID;
*pDerivedKeySize >>= nDerivedKeySize;
- ::rtl::OUString sEncAlgName;
+ OUString sEncAlgName;
if ( nEncAlgID == xml::crypto::CipherID::AES_CBC_W3C_PADDING )
{
OSL_ENSURE( nDerivedKeySize, "Unexpected key size is provided!" );
@@ -340,8 +338,8 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
pNewAttrList = new ::comphelper::AttributeList;
xNewAttrList = pNewAttrList;
- ::rtl::OUString sStartKeyAlg;
- ::rtl::OUString sStartKeySize;
+ OUString sStartKeyAlg;
+ OUString sStartKeySize;
sal_Int32 nStartKeyAlgID = 0;
*pStartKeyAlg >>= nStartKeyAlgID;
if ( nStartKeyAlgID == xml::crypto::DigestID::SHA256 )
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 0fe547569eed..970417a06476 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -31,7 +31,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star;
using namespace std;
-using ::rtl::OUString;
// ---------------------------------------------------
ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
@@ -279,7 +278,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
throw( xml::sax::SAXException, uno::RuntimeException )
{
StringHashMap aConvertedAttribs;
- ::rtl::OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs );
+ OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs );
size_t nLevel = aStack.size();
@@ -349,7 +348,7 @@ namespace
void SAL_CALL ManifestImport::endElement( const OUString& aName )
throw( xml::sax::SAXException, uno::RuntimeException )
{
- ::rtl::OUString aConvertedName = ConvertName( aName );
+ OUString aConvertedName = ConvertName( aName );
if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) )
{
if ( aConvertedName.equals( sFileEntryElement ) && aStack.back().m_bValid )
@@ -393,10 +392,10 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
}
// ---------------------------------------------------
-::rtl::OUString ManifestImport::PushNameAndNamespaces( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs )
+OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs )
{
StringHashMap aNamespaces;
- ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > aAttribsStrs;
+ ::std::vector< ::std::pair< OUString, OUString > > aAttribsStrs;
if ( xAttribs.is() )
{
@@ -405,25 +404,25 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
for( sal_Int16 nInd = 0; nInd < nAttrCount; nInd++ )
{
- ::rtl::OUString aAttrName = xAttribs->getNameByIndex( nInd );
- ::rtl::OUString aAttrValue = xAttribs->getValueByIndex( nInd );
+ OUString aAttrName = xAttribs->getNameByIndex( nInd );
+ OUString aAttrValue = xAttribs->getValueByIndex( nInd );
if ( aAttrName.getLength() >= 5
&& aAttrName.startsWith("xmlns")
&& ( aAttrName.getLength() == 5 || aAttrName.getStr()[5] == ( sal_Unicode )':' ) )
{
// this is a namespace declaration
- ::rtl::OUString aNsName( ( aAttrName.getLength() == 5 ) ? ::rtl::OUString() : aAttrName.copy( 6 ) );
+ OUString aNsName( ( aAttrName.getLength() == 5 ) ? OUString() : aAttrName.copy( 6 ) );
aNamespaces[aNsName] = aAttrValue;
}
else
{
// this is no namespace declaration
- aAttribsStrs.push_back( pair< ::rtl::OUString, ::rtl::OUString >( aAttrName, aAttrValue ) );
+ aAttribsStrs.push_back( pair< OUString, OUString >( aAttrName, aAttrValue ) );
}
}
}
- ::rtl::OUString aConvertedName = ConvertNameWithNamespace( aName, aNamespaces );
+ OUString aConvertedName = ConvertNameWithNamespace( aName, aNamespaces );
if ( !aConvertedName.getLength() )
aConvertedName = ConvertName( aName );
@@ -439,10 +438,10 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
}
// ---------------------------------------------------
-::rtl::OUString ManifestImport::ConvertNameWithNamespace( const ::rtl::OUString& aName, const StringHashMap& aNamespaces )
+OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces )
{
- ::rtl::OUString aNsAlias;
- ::rtl::OUString aPureName = aName;
+ OUString aNsAlias;
+ OUString aPureName = aName;
sal_Int32 nInd = aName.indexOf( ( sal_Unicode )':' );
if ( nInd != -1 && nInd < aName.getLength() )
@@ -451,7 +450,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
aPureName = aName.copy( nInd + 1 );
}
- ::rtl::OUString aResult;
+ OUString aResult;
StringHashMap::const_iterator aIter = aNamespaces.find( aNsAlias );
if ( aIter != aNamespaces.end()
@@ -466,9 +465,9 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
}
// ---------------------------------------------------
-::rtl::OUString ManifestImport::ConvertName( const ::rtl::OUString& aName )
+OUString ManifestImport::ConvertName( const OUString& aName )
{
- ::rtl::OUString aConvertedName;
+ OUString aConvertedName;
for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter )
{
if ( !aIter->m_aNamespaces.empty() )
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 51c5244f0697..73a1b58d52cd 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -32,15 +32,15 @@ namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
} } }
-typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap;
+typedef ::boost::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap;
struct ManifestScopeEntry
{
- ::rtl::OUString m_aConvertedName;
+ OUString m_aConvertedName;
StringHashMap m_aNamespaces;
bool m_bValid;
- ManifestScopeEntry( const ::rtl::OUString& aConvertedName, const StringHashMap& aNamespaces )
+ ManifestScopeEntry( const OUString& aConvertedName, const StringHashMap& aNamespaces )
: m_aConvertedName( aConvertedName )
, m_aNamespaces( aNamespaces )
, m_bValid( true )
@@ -61,66 +61,66 @@ protected:
sal_Int32 nDerivedKeySize;
::std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rManVector;
- const ::rtl::OUString sFileEntryElement;
- const ::rtl::OUString sManifestElement;
- const ::rtl::OUString sEncryptionDataElement;
- const ::rtl::OUString sAlgorithmElement;
- const ::rtl::OUString sStartKeyAlgElement;
- const ::rtl::OUString sKeyDerivationElement;
-
- const ::rtl::OUString sCdataAttribute;
- const ::rtl::OUString sMediaTypeAttribute;
- const ::rtl::OUString sVersionAttribute;
- const ::rtl::OUString sFullPathAttribute;
- const ::rtl::OUString sSizeAttribute;
- const ::rtl::OUString sSaltAttribute;
- const ::rtl::OUString sInitialisationVectorAttribute;
- const ::rtl::OUString sIterationCountAttribute;
- const ::rtl::OUString sKeySizeAttribute;
- const ::rtl::OUString sAlgorithmNameAttribute;
- const ::rtl::OUString sStartKeyAlgNameAttribute;
- const ::rtl::OUString sKeyDerivationNameAttribute;
- const ::rtl::OUString sChecksumAttribute;
- const ::rtl::OUString sChecksumTypeAttribute;
-
- const ::rtl::OUString sFullPathProperty;
- const ::rtl::OUString sMediaTypeProperty;
- const ::rtl::OUString sVersionProperty;
- const ::rtl::OUString sIterationCountProperty;
- const ::rtl::OUString sDerivedKeySizeProperty;
- const ::rtl::OUString sSaltProperty;
- const ::rtl::OUString sInitialisationVectorProperty;
- const ::rtl::OUString sSizeProperty;
- const ::rtl::OUString sDigestProperty;
- const ::rtl::OUString sEncryptionAlgProperty;
- const ::rtl::OUString sStartKeyAlgProperty;
- const ::rtl::OUString sDigestAlgProperty;
-
- const ::rtl::OUString sWhiteSpace;
-
- const ::rtl::OUString sSHA256_URL;
- const ::rtl::OUString sSHA1_Name;
- const ::rtl::OUString sSHA1_URL;
-
- const ::rtl::OUString sSHA256_1k_URL;
- const ::rtl::OUString sSHA1_1k_Name;
- const ::rtl::OUString sSHA1_1k_URL;
-
- const ::rtl::OUString sBlowfish_Name;
- const ::rtl::OUString sBlowfish_URL;
- const ::rtl::OUString sAES128_URL;
- const ::rtl::OUString sAES192_URL;
- const ::rtl::OUString sAES256_URL;
-
- const ::rtl::OUString sPBKDF2_Name;
- const ::rtl::OUString sPBKDF2_URL;
-
-
- ::rtl::OUString PushNameAndNamespaces( const ::rtl::OUString& aName,
+ const OUString sFileEntryElement;
+ const OUString sManifestElement;
+ const OUString sEncryptionDataElement;
+ const OUString sAlgorithmElement;
+ const OUString sStartKeyAlgElement;
+ const OUString sKeyDerivationElement;
+
+ const OUString sCdataAttribute;
+ const OUString sMediaTypeAttribute;
+ const OUString sVersionAttribute;
+ const OUString sFullPathAttribute;
+ const OUString sSizeAttribute;
+ const OUString sSaltAttribute;
+ const OUString sInitialisationVectorAttribute;
+ const OUString sIterationCountAttribute;
+ const OUString sKeySizeAttribute;
+ const OUString sAlgorithmNameAttribute;
+ const OUString sStartKeyAlgNameAttribute;
+ const OUString sKeyDerivationNameAttribute;
+ const OUString sChecksumAttribute;
+ const OUString sChecksumTypeAttribute;
+
+ const OUString sFullPathProperty;
+ const OUString sMediaTypeProperty;
+ const OUString sVersionProperty;
+ const OUString sIterationCountProperty;
+ const OUString sDerivedKeySizeProperty;
+ const OUString sSaltProperty;
+ const OUString sInitialisationVectorProperty;
+ const OUString sSizeProperty;
+ const OUString sDigestProperty;
+ const OUString sEncryptionAlgProperty;
+ const OUString sStartKeyAlgProperty;
+ const OUString sDigestAlgProperty;
+
+ const OUString sWhiteSpace;
+
+ const OUString sSHA256_URL;
+ const OUString sSHA1_Name;
+ const OUString sSHA1_URL;
+
+ const OUString sSHA256_1k_URL;
+ const OUString sSHA1_1k_Name;
+ const OUString sSHA1_1k_URL;
+
+ const OUString sBlowfish_Name;
+ const OUString sBlowfish_URL;
+ const OUString sAES128_URL;
+ const OUString sAES192_URL;
+ const OUString sAES256_URL;
+
+ const OUString sPBKDF2_Name;
+ const OUString sPBKDF2_URL;
+
+
+ OUString PushNameAndNamespaces( const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs,
StringHashMap& o_aConvertedAttribs );
- ::rtl::OUString ConvertNameWithNamespace( const ::rtl::OUString& aName, const StringHashMap& aNamespaces );
- ::rtl::OUString ConvertName( const ::rtl::OUString& aName );
+ OUString ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces );
+ OUString ConvertName( const OUString& aName );
public:
ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector );
@@ -129,15 +129,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);
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index feac40c72f8b..2e2b6a0922c0 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::packages;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::packages::manifest;
-using ::rtl::OUString;
ManifestReader::ManifestReader( const Reference < XComponentContext > & xContext )
: m_xContext ( xContext )
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index d422f9a7c29e..d050405ace15 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -46,17 +46,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( 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);
// Component constructor
- static ::rtl::OUString static_getImplementationName();
- static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
- sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
+ static OUString static_getImplementationName();
+ static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
+ sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
};
#endif
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index 8453d928cfc6..4b7e773c729b 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -46,18 +46,18 @@ 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);
// Component constructor
- static ::rtl::OUString static_getImplementationName();
- static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames();
+ static OUString static_getImplementationName();
+ static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames();
static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory );
- sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName);
+ sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
};
#endif
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 47f38270513d..e8078634b195 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::packages;
using namespace ::com::sun::star::packages::manifest;
-using rtl::OUString;
/**
* This function is called to get service factories for an implementation.
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 97c3eca22c7f..55a731281a43 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -335,7 +335,7 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang:
}
//-----------------------------------------------
-sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
+sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID )
throw ( io::IOException,
uno::RuntimeException )
{
@@ -362,7 +362,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL OInputCompStream::getTargetByID( const ::rtl::OUString& sID )
+OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -383,11 +383,11 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
if ( aSeq[nInd].First == "Target" )
return aSeq[nInd].Second;
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL OInputCompStream::getTypeByID( const ::rtl::OUString& sID )
+OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -408,11 +408,11 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
if ( aSeq[nInd].First == "Type" )
return aSeq[nInd].Second;
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID( const ::rtl::OUString& sID )
+uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -443,7 +443,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
}
//-----------------------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType( const ::rtl::OUString& sType )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType( const OUString& sType )
throw ( io::IOException,
uno::RuntimeException )
{
@@ -508,7 +508,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
}
//-----------------------------------------------
-void SAL_CALL OInputCompStream::insertRelationshipByID( const ::rtl::OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, ::sal_Bool /*bReplace*/ )
+void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, ::sal_Bool /*bReplace*/ )
throw ( container::ElementExistException,
io::IOException,
uno::RuntimeException )
@@ -528,7 +528,7 @@ void SAL_CALL OInputCompStream::insertRelationshipByID( const ::rtl::OUString&
}
//-----------------------------------------------
-void SAL_CALL OInputCompStream::removeRelationshipByID( const ::rtl::OUString& /*sID*/ )
+void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/ )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -603,7 +603,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty
}
//-----------------------------------------------
-void SAL_CALL OInputCompStream::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& /*aValue*/ )
+void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ )
throw ( beans::UnknownPropertyException,
beans::PropertyVetoException,
lang::IllegalArgumentException,
@@ -632,7 +632,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const ::rtl::OUString& aProper
//-----------------------------------------------
-uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aProp )
+uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -645,7 +645,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
throw lang::DisposedException();
}
- ::rtl::OUString aPropertyName;
+ OUString aPropertyName;
if ( aProp == "IsEncrypted" )
aPropertyName = "Encrypted";
else
@@ -669,7 +669,7 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
//-----------------------------------------------
void SAL_CALL OInputCompStream::addPropertyChangeListener(
- const ::rtl::OUString& /*aPropertyName*/,
+ const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -689,7 +689,7 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener(
//-----------------------------------------------
void SAL_CALL OInputCompStream::removePropertyChangeListener(
- const ::rtl::OUString& /*aPropertyName*/,
+ const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -709,7 +709,7 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener(
//-----------------------------------------------
void SAL_CALL OInputCompStream::addVetoableChangeListener(
- const ::rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -729,7 +729,7 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener(
//-----------------------------------------------
void SAL_CALL OInputCompStream::removeVetoableChangeListener(
- const ::rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 50628f588819..ba71dd80e491 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -94,25 +94,25 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
//XRelationshipAccess
- virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const ::rtl::OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertRelationshipByID( const ::rtl::OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clearRelationships( ) throw (::com::sun::star::io::IOException, ::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/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index a5fa77653c73..ae4eecdc9037 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -56,13 +56,13 @@ void OHierarchyHolder_Impl::RemoveStreamHierarchically( OStringList_Impl& aListP
//-----------------------------------------------
// static
-OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const ::rtl::OUString& aPath )
+OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const OUString& aPath )
{
OStringList_Impl aResult;
sal_Int32 nIndex = 0;
do
{
- ::rtl::OUString aName = aPath.getToken( 0, '/', nIndex );
+ OUString aName = aPath.getToken( 0, '/', nIndex );
if ( aName.isEmpty() )
throw lang::IllegalArgumentException();
@@ -88,7 +88,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
if ( !aListPath.size() )
throw uno::RuntimeException();
- ::rtl::OUString aNextName = *(aListPath.begin());
+ OUString aNextName = *(aListPath.begin());
aListPath.erase( aListPath.begin() );
uno::Reference< embed::XExtendedStorageStream > xResult;
@@ -172,7 +172,7 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList
if ( !aListPath.size() )
throw uno::RuntimeException();
- ::rtl::OUString aNextName = *(aListPath.begin());
+ OUString aNextName = *(aListPath.begin());
aListPath.erase( aListPath.begin() );
uno::Reference< embed::XExtendedStorageStream > xResult;
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 501d305071b0..993a4d267738 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -37,18 +37,18 @@ struct OHierarchyElement_Impl;
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,
::rtl::Reference< OHierarchyElement_Impl >,
- ::rtl::OUStringHash,
+ OUStringHash,
eqFunc > OHierarchyElementList_Impl;
-typedef ::std::vector< ::rtl::OUString > OStringList_Impl;
+typedef ::std::vector< OUString > OStringList_Impl;
typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XExtendedStorageStream > >
OWeakStorRefList_Impl;
@@ -118,7 +118,7 @@ public:
, m_xChild( new OHierarchyElement_Impl( ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XStorage >( xOwnStorage ) ) )
{}
- static OStringList_Impl GetListPathFromString( const ::rtl::OUString& aPath );
+ static OStringList_Impl GetListPathFromString( const OUString& aPath );
::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream >
GetStreamHierarchically( sal_Int32 nStorageMode,
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index fc9a5f306385..6b8d15fae768 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -82,7 +82,7 @@ bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1,
}
//-----------------------------------------------
-void StaticAddLog( const ::rtl::OUString& aMessage )
+void StaticAddLog( const OUString& aMessage )
{
try
{
@@ -203,7 +203,7 @@ bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const
}
//-----------------------------------------------
-sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
+sal_Bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
{
if ( !xContext.is() )
return sal_False;
@@ -229,9 +229,9 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< uno::XComp
const sal_Int32 n_ConstBufferSize = 32000;
//-----------------------------------------------
-::rtl::OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext )
+OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext )
{
- ::rtl::OUString aTempURL;
+ OUString aTempURL;
uno::Reference < beans::XPropertySet > xTempFile(
io::TempFile::create(xContext),
@@ -307,7 +307,7 @@ OWriteStream_Impl::~OWriteStream_Impl()
if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = ::rtl::OUString();
+ m_aTempURL = OUString();
}
CleanCacheStream();
@@ -342,7 +342,7 @@ void OWriteStream_Impl::CleanCacheStream()
}
//-----------------------------------------------
-void OWriteStream_Impl::AddLog( const ::rtl::OUString& aMessage )
+void OWriteStream_Impl::AddLog( const OUString& aMessage )
{
if ( !m_xLogRing.is() )
{
@@ -363,7 +363,7 @@ void OWriteStream_Impl::AddLog( const ::rtl::OUString& aMessage )
//-----------------------------------------------
-void OWriteStream_Impl::InsertIntoPackageFolder( const ::rtl::OUString& aName,
+void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName,
const uno::Reference< container::XNameContainer >& xParentPackageFolder )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -532,11 +532,11 @@ void OWriteStream_Impl::DisposeWrappers()
}
//-----------------------------------------------
-::rtl::OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream )
+OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream )
{
if ( !m_aTempURL.getLength() )
{
- ::rtl::OUString aTempURL = GetNewTempFileURL( m_xContext );
+ OUString aTempURL = GetNewTempFileURL( m_xContext );
try {
if ( !aTempURL.isEmpty() && xStream.is() )
@@ -582,7 +582,7 @@ void OWriteStream_Impl::DisposeWrappers()
}
//-----------------------------------------------
-::rtl::OUString OWriteStream_Impl::FillTempGetFileName()
+OUString OWriteStream_Impl::FillTempGetFileName()
{
// should try to create cache first, if the amount of contents is too big, the temp file should be taken
if ( !m_xCacheStream.is() && m_aTempURL.isEmpty() )
@@ -645,14 +645,14 @@ void OWriteStream_Impl::DisposeWrappers()
catch( const packages::WrongPasswordException& )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = ::rtl::OUString();
+ m_aTempURL = OUString();
throw;
}
catch( const uno::Exception& )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = ::rtl::OUString();
+ m_aTempURL = OUString();
}
}
}
@@ -880,7 +880,7 @@ void OWriteStream_Impl::Commit()
// TODO/NEW: Let the temporary file be removed after commit
xNewPackageStream->setDataStream( xInStream );
- m_aTempURL = ::rtl::OUString();
+ m_aTempURL = OUString();
}
else // if ( m_bHasInsertedStreamOptimization )
{
@@ -955,7 +955,7 @@ void OWriteStream_Impl::Revert()
if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = ::rtl::OUString();
+ m_aTempURL = OUString();
}
m_aProps.realloc( 0 );
@@ -1390,7 +1390,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, comphelper::getProcessComponentContext() );
- m_aTempURL = ::rtl::OUString();
+ m_aTempURL = OUString();
}
if ( m_xCacheStream.is() )
CleanCacheStream();
@@ -1635,7 +1635,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
}
//-----------------------------------------------
-void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStorage >& xRelStorage, const ::rtl::OUString& aOrigStreamName, const ::rtl::OUString& aNewStreamName )
+void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStorage >& xRelStorage, const OUString& aOrigStreamName, const OUString& aNewStreamName )
{
// at this point of time the old stream must be already cleaned
OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML, "The method should be used only with OFOPXML format!\n" );
@@ -1651,10 +1651,10 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
if ( m_nRelInfoStatus == RELINFO_BROKEN || m_nRelInfoStatus == RELINFO_CHANGED_BROKEN )
throw io::IOException(); // TODO:
- ::rtl::OUString aOrigRelStreamName = aOrigStreamName;
+ OUString aOrigRelStreamName = aOrigStreamName;
aOrigRelStreamName += ".rels";
- ::rtl::OUString aNewRelStreamName = aNewStreamName;
+ OUString aNewRelStreamName = aNewStreamName;
aNewRelStreamName += ".rels";
sal_Bool bRenamed = !aOrigRelStreamName.equals( aNewRelStreamName );
@@ -2623,7 +2623,7 @@ void SAL_CALL OWriteStream::removeEventListener(
}
//-----------------------------------------------
-void SAL_CALL OWriteStream::setEncryptionPassword( const ::rtl::OUString& aPass )
+void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
throw ( uno::RuntimeException,
io::IOException )
{
@@ -2705,7 +2705,7 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
}
//-----------------------------------------------
-sal_Bool SAL_CALL OWriteStream::hasByID( const ::rtl::OUString& sID )
+sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID )
throw ( io::IOException,
uno::RuntimeException )
{
@@ -2735,7 +2735,7 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const ::rtl::OUString& sID )
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL OWriteStream::getTargetByID( const ::rtl::OUString& sID )
+OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -2756,11 +2756,11 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const ::rtl::OUString& sID )
if ( aSeq[nInd].First == "Target" )
return aSeq[nInd].Second;
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL OWriteStream::getTypeByID( const ::rtl::OUString& sID )
+OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -2781,11 +2781,11 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const ::rtl::OUString& sID )
if ( aSeq[nInd].First == "Type" )
return aSeq[nInd].Second;
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID( const ::rtl::OUString& sID )
+uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -2816,7 +2816,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
}
//-----------------------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType( const ::rtl::OUString& sType )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType( const OUString& sType )
throw ( io::IOException,
uno::RuntimeException )
{
@@ -2870,7 +2870,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAl
}
//-----------------------------------------------
-void SAL_CALL OWriteStream::insertRelationshipByID( const ::rtl::OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace )
+void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace )
throw ( container::ElementExistException,
io::IOException,
uno::RuntimeException )
@@ -2935,7 +2935,7 @@ void SAL_CALL OWriteStream::insertRelationshipByID( const ::rtl::OUString& sID,
}
//-----------------------------------------------
-void SAL_CALL OWriteStream::removeRelationshipByID( const ::rtl::OUString& sID )
+void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -3091,7 +3091,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetI
}
//-----------------------------------------------
-void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw ( beans::UnknownPropertyException,
beans::PropertyVetoException,
lang::IllegalArgumentException,
@@ -3113,7 +3113,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
{
// if the "Compressed" property is not set explicitly, the MediaType can change the default value
sal_Bool bCompressedValueFromType = sal_True;
- ::rtl::OUString aType;
+ OUString aType;
aValue >>= aType;
if ( !m_pImpl->m_bCompressedSetExplicit )
@@ -3216,7 +3216,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
//-----------------------------------------------
-uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
+uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -3234,7 +3234,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
return uno::makeAny( m_pImpl->GetNewRelId() );
}
- ::rtl::OUString aPropertyName;
+ OUString aPropertyName;
if ( aProp == "IsEncrypted" )
aPropertyName = "Encrypted";
else
@@ -3272,7 +3272,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
//-----------------------------------------------
void SAL_CALL OWriteStream::addPropertyChangeListener(
- const ::rtl::OUString& /*aPropertyName*/,
+ const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -3292,7 +3292,7 @@ void SAL_CALL OWriteStream::addPropertyChangeListener(
//-----------------------------------------------
void SAL_CALL OWriteStream::removePropertyChangeListener(
- const ::rtl::OUString& /*aPropertyName*/,
+ const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -3312,7 +3312,7 @@ void SAL_CALL OWriteStream::removePropertyChangeListener(
//-----------------------------------------------
void SAL_CALL OWriteStream::addVetoableChangeListener(
- const ::rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -3332,7 +3332,7 @@ void SAL_CALL OWriteStream::addVetoableChangeListener(
//-----------------------------------------------
void SAL_CALL OWriteStream::removeVetoableChangeListener(
- const ::rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 896739a8c45e..12d6f78d1585 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -68,7 +68,7 @@ namespace cppu {
}
namespace package {
- void StaticAddLog( const ::rtl::OUString& aMessage );
+ void StaticAddLog( const OUString& aMessage );
bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1, const ::comphelper::SequenceAsHashMap& aHash2 );
}
@@ -100,7 +100,7 @@ struct OWriteStream_Impl : public PreCreationStruct
friend class OInputCompStream;
OWriteStream* m_pAntiImpl;
- ::rtl::OUString m_aTempURL;
+ OUString m_aTempURL;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCacheStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xCacheSeek;
@@ -145,8 +145,8 @@ struct OWriteStream_Impl : public PreCreationStruct
private:
- ::rtl::OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
- ::rtl::OUString FillTempGetFileName();
+ OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
+ OUString FillTempGetFileName();
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetTempFileAsStream();
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetTempFileAsInputStream();
@@ -176,7 +176,7 @@ public:
void CleanCacheStream();
- void AddLog( const ::rtl::OUString& aMessage );
+ void AddLog( const OUString& aMessage );
sal_Bool UsesCommonEncryption_Impl() { return m_bUseCommonEncryption; }
sal_Bool HasTempFile_Impl() const { return ( m_aTempURL.getLength() != 0 ); }
@@ -185,7 +185,7 @@ public:
sal_Bool HasWriteOwner_Impl() const { return ( m_pAntiImpl != NULL ); }
void InsertIntoPackageFolder(
- const ::rtl::OUString& aName,
+ const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder );
void SetToBeCommited() { m_bFlushed = sal_True; }
@@ -251,8 +251,8 @@ public:
void CommitStreamRelInfo(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xRelStorage,
- const ::rtl::OUString& aOrigStreamName,
- const ::rtl::OUString& aNewStreamName );
+ const OUString& aOrigStreamName,
+ const OUString& aNewStreamName );
void ReadRelInfoIfNecessary();
@@ -352,7 +352,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);
//XEncryptionProtectedSource
- virtual void SAL_CALL setEncryptionPassword( const ::rtl::OUString& aPass )
+ virtual void SAL_CALL setEncryptionPassword( const OUString& aPass )
throw ( ::com::sun::star::uno::RuntimeException,
::com::sun::star::io::IOException );
virtual void SAL_CALL removeEncryption()
@@ -364,25 +364,25 @@ public:
virtual sal_Bool SAL_CALL hasEncryptionData() throw (::com::sun::star::uno::RuntimeException);
//XRelationshipAccess
- virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const ::rtl::OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertRelationshipByID( const ::rtl::OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeRelationshipByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clearRelationships( ) throw (::com::sun::star::io::IOException, ::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 );
// XTransactedObject
virtual void SAL_CALL commit()
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index 9b0052dae03f..e542b3eaad36 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -32,7 +32,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xstor_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( OStorageFactory::impl_staticGetImplementationName() ) )
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
index 7f3cb233bec1..1617a9b9ed65 100644
--- a/package/source/xstor/selfterminatefilestream.cxx
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
//-----------------------------------------------
-OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< uno::XComponentContext > xContext, const ::rtl::OUString& aURL )
+OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< uno::XComponentContext > xContext, const OUString& aURL )
: m_aURL( aURL )
{
uno::Reference< uno::XComponentContext > xOwnContext = xContext;
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index ab4248bccff0..12e5f2ef0df7 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -33,13 +33,13 @@ class OSelfTerminateFileStream : public cppu::WeakImplHelper2< ::com::sun::star:
protected:
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > m_xFileAccess;
- ::rtl::OUString m_aURL;
+ OUString m_aURL;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable;
public:
- OSelfTerminateFileStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const ::rtl::OUString& aURL );
+ OSelfTerminateFileStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const OUString& aURL );
virtual ~OSelfTerminateFileStream();
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index cd88abd2d44f..8cf91ede9e21 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -56,9 +56,9 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x
}
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
{
- uno::Sequence< ::rtl::OUString > aRet(2);
+ uno::Sequence< OUString > aRet(2);
aRet[0] = "com.sun.star.embed.StorageFactory";
aRet[1] = "com.sun.star.comp.embed.StorageFactory";
return aRet;
@@ -134,7 +134,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
throw lang::IllegalArgumentException(); // TODO:
// retrieve storage source stream
- ::rtl::OUString aURL;
+ OUString aURL;
uno::Reference< io::XStream > xStream;
uno::Reference< io::XInputStream > xInputStream;
@@ -198,7 +198,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
}
else if ( aDescr[nInd].Name == "StorageFormat" )
{
- ::rtl::OUString aFormatName;
+ OUString aFormatName;
sal_Int32 nFormatID = 0;
if ( aDescr[nInd].Value >>= aFormatName )
{
@@ -281,17 +281,17 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
}
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OStorageFactory::getImplementationName()
+OUString SAL_CALL OStorageFactory::getImplementationName()
throw ( uno::RuntimeException )
{
return impl_staticGetImplementationName();
}
//-------------------------------------------------------------------------
-sal_Bool SAL_CALL OStorageFactory::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL OStorageFactory::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 )
@@ -301,7 +301,7 @@ sal_Bool SAL_CALL OStorageFactory::supportsService( const ::rtl::OUString& Servi
}
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OStorageFactory::getSupportedServiceNames()
throw ( uno::RuntimeException )
{
return impl_staticGetSupportedServiceNames();
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 457c37bffa32..1d3b1993e3e5 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -39,10 +39,10 @@ public:
OSL_ENSURE( xContext.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(
@@ -54,9 +54,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/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index dc1c51fef1c2..a0958e5ba3bf 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -92,7 +92,7 @@ struct StorInternalData_Impl
};
//=========================================================
-::rtl::OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext );
+OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext );
// static
void OStorage_Impl::completeStorageStreamCopy_Impl(
@@ -117,7 +117,7 @@ void OStorage_Impl::completeStorageStreamCopy_Impl(
// TODO: headers of encripted streams should be copied also
::comphelper::OStorageHelper::CopyInputToOutput( xSourceInStream, xDestOutStream );
- uno::Sequence< ::rtl::OUString > aPropNames( 1 );
+ uno::Sequence< OUString > aPropNames( 1 );
aPropNames[0] = "Compressed";
if ( nStorageType == embed::StorageFormats::PACKAGE )
@@ -164,7 +164,7 @@ StorInternalData_Impl::~StorInternalData_Impl()
}
-SotElement_Impl::SotElement_Impl( const ::rtl::OUString& rName, sal_Bool bStor, sal_Bool bNew )
+SotElement_Impl::SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew )
: m_aName( rName )
, m_aOriginalName( rName )
, m_bIsRemoved( sal_False )
@@ -360,7 +360,7 @@ OStorage_Impl::~OStorage_Impl()
m_xPackageFolder = uno::Reference< container::XNameContainer >();
m_xPackage = uno::Reference< lang::XSingleServiceFactory >();
- ::rtl::OUString aPropertyName = "URL";
+ OUString aPropertyName = "URL";
for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); ++aInd )
{
if ( m_xProperties[aInd].Name.equals( aPropertyName ) )
@@ -397,7 +397,7 @@ OStorage_Impl::~OStorage_Impl()
}
//-----------------------------------------------
-void OStorage_Impl::AddLog( const ::rtl::OUString& aMessage )
+void OStorage_Impl::AddLog( const OUString& aMessage )
{
if ( !m_xLogRing.is() )
{
@@ -587,7 +587,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary()
if ( m_nRelInfoStatus == RELINFO_NO_INIT )
{
// Init from original stream
- uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( ::rtl::OUString() );
+ uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( OUString() );
if ( xRelInfoStream.is() )
m_aRelInfo = ::comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(
xRelInfoStream,
@@ -649,7 +649,7 @@ void OStorage_Impl::ReadContents()
throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
}
- ::rtl::OUString aName = xNamed->getName();
+ OUString aName = xNamed->getName();
OSL_ENSURE( !aName.isEmpty(), "Empty name!\n" );
uno::Reference< container::XNameContainer > xNameContainer( xNamed, uno::UNO_QUERY );
@@ -725,8 +725,8 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
// move storage properties to the destination one ( means changeable properties )
if ( m_nStorageType == embed::StorageFormats::PACKAGE )
{
- ::rtl::OUString aMediaTypeString = "MediaType";
- ::rtl::OUString aVersionString = "Version";
+ OUString aMediaTypeString = "MediaType";
+ OUString aVersionString = "Version";
xPropSet->setPropertyValue( aMediaTypeString, uno::makeAny( m_aMediaType ) );
xPropSet->setPropertyValue( aVersionString, uno::makeAny( m_aVersion ) );
}
@@ -735,7 +735,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
{
// if this is a root storage, the common key from current one should be moved there
sal_Bool bIsRoot = sal_False;
- ::rtl::OUString aRootString = "IsRoot";
+ OUString aRootString = "IsRoot";
if ( ( xPropSet->getPropertyValue( aRootString ) >>= bIsRoot ) && bIsRoot )
{
try
@@ -763,13 +763,13 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
{
// TODO/LATER: currently the optimization is not active
- // uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( ::rtl::OUString() ); // own stream
+ // uno::Reference< io::XInputStream > xRelInfoStream = GetRelInfoStreamForName( OUString() ); // own stream
// if ( xRelInfoStream.is() )
// {
// // Relations info stream is a writeonly property, introduced only to optimyze copying
// // Should be used carefuly since no check for stream consistency is done, and the stream must not stay locked
//
- // ::rtl::OUString aRelInfoString = "RelationsInfoStream";
+ // OUString aRelInfoString = "RelationsInfoStream";
// xPropSet->setPropertyValue( aRelInfoString, uno::makeAny( GetSeekableTempCopy( xRelInfoStream, m_xFactory ) ) );
// }
@@ -789,7 +789,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
//-----------------------------------------------
void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
uno::Reference< embed::XStorage > xDest,
- ::rtl::OUString aName,
+ OUString aName,
sal_Bool bDirect )
{
OSL_ENSURE( xDest.is(), "No destination storage!\n" );
@@ -858,7 +858,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
{
// TODO/LATER: currently the optimization is not active
- // uno::Reference< io::XInputStream > xInStream = GetRelInfoStreamForName( ::rtl::OUString() ); // own rels stream
+ // uno::Reference< io::XInputStream > xInStream = GetRelInfoStreamForName( OUString() ); // own rels stream
// if ( xInStream.is() )
// {
// aStrProps.realloc( ++nNum );
@@ -1030,7 +1030,7 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x
}
//-----------------------------------------------
-void OStorage_Impl::InsertIntoPackageFolder( const ::rtl::OUString& aName,
+void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName,
const uno::Reference< container::XNameContainer >& xParentPackageFolder )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1386,7 +1386,7 @@ void OStorage_Impl::Revert()
}
//-----------------------------------------------
-SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName )
+SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName )
{
OSL_ENSURE( !rName.isEmpty(), "Name is empty!" );
@@ -1405,7 +1405,7 @@ SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName )
}
//-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertStream( ::rtl::OUString aName, sal_Bool bEncr )
+SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr )
{
OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
if ( !m_xPackage.is() )
@@ -1440,7 +1440,7 @@ SotElement_Impl* OStorage_Impl::InsertStream( ::rtl::OUString aName, sal_Bool bE
}
//-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertRawStream( ::rtl::OUString aName, const uno::Reference< io::XInputStream >& xInStream )
+SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Reference< io::XInputStream >& xInStream )
{
// insert of raw stream means insert and commit
OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" );
@@ -1510,7 +1510,7 @@ OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
}
//-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertStorage( ::rtl::OUString aName, sal_Int32 nStorageMode )
+SotElement_Impl* OStorage_Impl::InsertStorage( OUString aName, sal_Int32 nStorageMode )
{
SotElement_Impl* pNewElement = InsertElement( aName, sal_True );
@@ -1522,7 +1522,7 @@ SotElement_Impl* OStorage_Impl::InsertStorage( ::rtl::OUString aName, sal_Int32
}
//-----------------------------------------------
-SotElement_Impl* OStorage_Impl::InsertElement( ::rtl::OUString aName, sal_Bool bIsStorage )
+SotElement_Impl* OStorage_Impl::InsertElement( OUString aName, sal_Bool bIsStorage )
{
OSL_ENSURE( FindElement( aName ) == NULL, "Should not try to insert existing element" );
@@ -1615,14 +1615,14 @@ void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement )
}
//-----------------------------------------------
-uno::Sequence< ::rtl::OUString > OStorage_Impl::GetElementNames()
+uno::Sequence< OUString > OStorage_Impl::GetElementNames()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
ReadContents();
sal_uInt32 nSize = m_aChildrenList.size();
- uno::Sequence< ::rtl::OUString > aElementNames( nSize );
+ uno::Sequence< OUString > aElementNames( nSize );
sal_uInt32 nInd = 0;
for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin();
@@ -1679,7 +1679,7 @@ void OStorage_Impl::ClearElement( SotElement_Impl* pElement )
}
//-----------------------------------------------
-void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
+void OStorage_Impl::CloneStreamElement( const OUString& aStreamName,
sal_Bool bEncryptionDataProvided,
const ::comphelper::SequenceAsHashMap& aEncryptionData,
uno::Reference< io::XStream >& xTargetStream )
@@ -1723,14 +1723,14 @@ void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
}
//-----------------------------------------------
-void OStorage_Impl::RemoveStreamRelInfo( const ::rtl::OUString& aOriginalName )
+void OStorage_Impl::RemoveStreamRelInfo( const OUString& aOriginalName )
{
// this method should be used only in OStorage_Impl::Commit() method
// the aOriginalName can be empty, in this case the storage relation info should be removed
if ( m_nStorageType == embed::StorageFormats::OFOPXML && m_xRelStorage.is() )
{
- ::rtl::OUString aRelStreamName = aOriginalName;
+ OUString aRelStreamName = aOriginalName;
aRelStreamName += ".rels";
if ( m_xRelStorage->hasByName( aRelStreamName ) )
@@ -1789,14 +1789,14 @@ void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement )
}
//-----------------------------------------------
-uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const ::rtl::OUString& aName )
+uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const OUString& aName )
{
if ( m_nStorageType == embed::StorageFormats::OFOPXML )
{
ReadContents();
if ( m_xRelStorage.is() )
{
- ::rtl::OUString aRelStreamName = aName;
+ OUString aRelStreamName = aName;
aRelStreamName += ".rels";
if ( m_xRelStorage->hasByName( aRelStreamName ) )
{
@@ -1814,7 +1814,7 @@ uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const
void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContainer >& xNewPackageFolder )
{
// this method should be used only in OStorage_Impl::Commit() method
- ::rtl::OUString aRelsStorName("_rels");
+ OUString aRelsStorName("_rels");
if ( !xNewPackageFolder.is() )
throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
@@ -1853,7 +1853,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
m_nRelInfoStatus = RELINFO_READ;
}
else if ( m_xRelStorage.is() )
- RemoveStreamRelInfo( ::rtl::OUString() ); // remove own rel info
+ RemoveStreamRelInfo( OUString() ); // remove own rel info
}
else if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM_READ
|| m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
@@ -2178,7 +2178,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
}
//-----------------------------------------------
-SotElement_Impl* OStorage::OpenStreamElement_Impl( const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr )
+SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr )
{
::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
@@ -2464,7 +2464,7 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
//-----------------------------------------------
uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
- const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode )
+ const OUString& aStreamName, sal_Int32 nOpenMode )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::WrongPasswordException,
@@ -2566,7 +2566,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
//-----------------------------------------------
uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
- const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass )
+ const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::NoEncryptionException,
@@ -2582,7 +2582,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
//-----------------------------------------------
uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
- const ::rtl::OUString& aStorName, sal_Int32 nStorageMode )
+ const OUString& aStorName, sal_Int32 nStorageMode )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
io::IOException,
@@ -2735,7 +2735,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
}
//-----------------------------------------------
-uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl::OUString& aStreamName )
+uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUString& aStreamName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::WrongPasswordException,
@@ -2817,8 +2817,8 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl
//-----------------------------------------------
uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement(
- const ::rtl::OUString& aStreamName,
- const ::rtl::OUString& aPass )
+ const OUString& aStreamName,
+ const OUString& aPass )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::NoEncryptionException,
@@ -2900,7 +2900,7 @@ void SAL_CALL OStorage::copyLastCommitTo(
//-----------------------------------------------
void SAL_CALL OStorage::copyStorageElementLastCommitTo(
- const ::rtl::OUString& aStorName,
+ const OUString& aStorName,
const uno::Reference< embed::XStorage >& xTargetStorage )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
@@ -2997,7 +2997,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
}
//-----------------------------------------------
-sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName )
+sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3065,7 +3065,7 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName
}
//-----------------------------------------------
-sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementName )
+sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3133,7 +3133,7 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementNam
}
//-----------------------------------------------
-void SAL_CALL OStorage::removeElement( const ::rtl::OUString& aElementName )
+void SAL_CALL OStorage::removeElement( const OUString& aElementName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3225,7 +3225,7 @@ void SAL_CALL OStorage::removeElement( const ::rtl::OUString& aElementName )
}
//-----------------------------------------------
-void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, const ::rtl::OUString& aNewName )
+void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUString& aNewName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3328,9 +3328,9 @@ void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, cons
}
//-----------------------------------------------
-void SAL_CALL OStorage::copyElementTo( const ::rtl::OUString& aElementName,
+void SAL_CALL OStorage::copyElementTo( const OUString& aElementName,
const uno::Reference< embed::XStorage >& xDest,
- const ::rtl::OUString& aNewName )
+ const OUString& aNewName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3431,9 +3431,9 @@ void SAL_CALL OStorage::copyElementTo( const ::rtl::OUString& aElementName,
//-----------------------------------------------
-void SAL_CALL OStorage::moveElementTo( const ::rtl::OUString& aElementName,
+void SAL_CALL OStorage::moveElementTo( const OUString& aElementName,
const uno::Reference< embed::XStorage >& xDest,
- const ::rtl::OUString& aNewName )
+ const OUString& aNewName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3549,7 +3549,7 @@ void SAL_CALL OStorage::moveElementTo( const ::rtl::OUString& aElementName,
//-----------------------------------------------
uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
- const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
+ const OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::NoEncryptionException,
@@ -3658,7 +3658,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
//-----------------------------------------------
uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
- const ::rtl::OUString& aStreamName,
+ const OUString& aStreamName,
const uno::Sequence< beans::NamedValue >& aEncryptionData )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
@@ -3753,7 +3753,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
//-----------------------------------------------
uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
- const ::rtl::OUString& sStreamName )
+ const OUString& sStreamName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -3860,7 +3860,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
//-----------------------------------------------
uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
- const ::rtl::OUString& sStreamName )
+ const OUString& sStreamName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::NoEncryptionException,
@@ -3977,7 +3977,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
}
//-----------------------------------------------
-void SAL_CALL OStorage::insertRawEncrStreamElement( const ::rtl::OUString& aStreamName,
+void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName,
const uno::Reference< io::XInputStream >& xInStream )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
@@ -4340,7 +4340,7 @@ void SAL_CALL OStorage::removeModifyListener(
//____________________________________________________________________________________________________
//-----------------------------------------------
-uno::Any SAL_CALL OStorage::getByName( const ::rtl::OUString& aName )
+uno::Any SAL_CALL OStorage::getByName( const OUString& aName )
throw ( container::NoSuchElementException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -4408,7 +4408,7 @@ uno::Any SAL_CALL OStorage::getByName( const ::rtl::OUString& aName )
//-----------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStorage::getElementNames()
+uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
throw ( uno::RuntimeException )
{
RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getElementNames" );
@@ -4446,7 +4446,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStorage::getElementNames()
//-----------------------------------------------
-sal_Bool SAL_CALL OStorage::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
throw ( uno::RuntimeException )
{
RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::hasByName" );
@@ -4624,7 +4624,7 @@ void SAL_CALL OStorage::removeEventListener(
// XEncryptionProtectedSource
//____________________________________________________________________________________________________
-void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
+void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass )
throw ( uno::RuntimeException,
io::IOException )
{
@@ -4939,7 +4939,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo(
//-----------------------------------------------
-void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
+void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw ( beans::UnknownPropertyException,
beans::PropertyVetoException,
lang::IllegalArgumentException,
@@ -5050,7 +5050,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
//-----------------------------------------------
-uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyName )
+uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -5117,7 +5117,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
}
if ( aPropertyName == "URL" )
- return uno::makeAny( ::rtl::OUString() );
+ return uno::makeAny( OUString() );
return uno::makeAny( sal_False ); // RepairPackage
}
@@ -5160,7 +5160,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
//-----------------------------------------------
void SAL_CALL OStorage::addPropertyChangeListener(
- const ::rtl::OUString& /*aPropertyName*/,
+ const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -5180,7 +5180,7 @@ void SAL_CALL OStorage::addPropertyChangeListener(
//-----------------------------------------------
void SAL_CALL OStorage::removePropertyChangeListener(
- const ::rtl::OUString& /*aPropertyName*/,
+ const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -5200,7 +5200,7 @@ void SAL_CALL OStorage::removePropertyChangeListener(
//-----------------------------------------------
void SAL_CALL OStorage::addVetoableChangeListener(
- const ::rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -5220,7 +5220,7 @@ void SAL_CALL OStorage::addVetoableChangeListener(
//-----------------------------------------------
void SAL_CALL OStorage::removeVetoableChangeListener(
- const ::rtl::OUString& /*PropertyName*/,
+ const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -5244,7 +5244,7 @@ void SAL_CALL OStorage::removeVetoableChangeListener(
// TODO/LATER: the storage and stream implementations of this interface are very similar, they could use a helper class
//-----------------------------------------------
-sal_Bool SAL_CALL OStorage::hasByID( const ::rtl::OUString& sID )
+sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID )
throw ( io::IOException,
uno::RuntimeException )
{
@@ -5274,7 +5274,7 @@ sal_Bool SAL_CALL OStorage::hasByID( const ::rtl::OUString& sID )
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL OStorage::getTargetByID( const ::rtl::OUString& sID )
+OUString SAL_CALL OStorage::getTargetByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -5295,11 +5295,11 @@ sal_Bool SAL_CALL OStorage::hasByID( const ::rtl::OUString& sID )
if ( aSeq[nInd].First == "Target" )
return aSeq[nInd].Second;
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-::rtl::OUString SAL_CALL OStorage::getTypeByID( const ::rtl::OUString& sID )
+OUString SAL_CALL OStorage::getTypeByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -5320,11 +5320,11 @@ sal_Bool SAL_CALL OStorage::hasByID( const ::rtl::OUString& sID )
if ( aSeq[nInd].First == "Type" )
return aSeq[nInd].Second;
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------
-uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID( const ::rtl::OUString& sID )
+uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -5355,7 +5355,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID( cons
}
//-----------------------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelationshipsByType( const ::rtl::OUString& sType )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelationshipsByType( const OUString& sType )
throw ( io::IOException,
uno::RuntimeException )
{
@@ -5410,7 +5410,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel
}
//-----------------------------------------------
-void SAL_CALL OStorage::insertRelationshipByID( const ::rtl::OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace )
+void SAL_CALL OStorage::insertRelationshipByID( const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace )
throw ( container::ElementExistException,
io::IOException,
uno::RuntimeException )
@@ -5475,7 +5475,7 @@ void SAL_CALL OStorage::insertRelationshipByID( const ::rtl::OUString& sID, con
}
//-----------------------------------------------
-void SAL_CALL OStorage::removeRelationshipByID( const ::rtl::OUString& sID )
+void SAL_CALL OStorage::removeRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
uno::RuntimeException )
@@ -5625,7 +5625,7 @@ void SAL_CALL OStorage::clearRelationships()
//____________________________________________________________________________________________________
//-----------------------------------------------
void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect(
- const ::rtl::OUString& /*sStreamName*/,
+ const OUString& /*sStreamName*/,
const uno::Reference< io::XInputStream >& /*xInStream*/ )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
@@ -5642,7 +5642,7 @@ void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect(
//-----------------------------------------------
void SAL_CALL OStorage::insertStreamElementDirect(
- const ::rtl::OUString& aStreamName,
+ const OUString& aStreamName,
const uno::Reference< io::XInputStream >& xInStream,
const uno::Sequence< beans::PropertyValue >& aProps )
throw ( embed::InvalidStorageException,
@@ -5733,9 +5733,9 @@ void SAL_CALL OStorage::insertStreamElementDirect(
//-----------------------------------------------
void SAL_CALL OStorage::copyElementDirectlyTo(
- const ::rtl::OUString& aElementName,
+ const OUString& aElementName,
const uno::Reference< embed::XOptimizedStorage >& xDest,
- const ::rtl::OUString& aNewName )
+ const OUString& aNewName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -5907,7 +5907,7 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea
}
//-----------------------------------------------
-void SAL_CALL OStorage::attachToURL( const ::rtl::OUString& sURL,
+void SAL_CALL OStorage::attachToURL( const OUString& sURL,
sal_Bool bReadOnly )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
@@ -5990,7 +5990,7 @@ void SAL_CALL OStorage::attachToURL( const ::rtl::OUString& sURL,
}
//-----------------------------------------------
-uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aElementName, const ::rtl::OUString& aPropertyName )
+uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementName, const OUString& aPropertyName )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -6096,7 +6096,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle
}
//-----------------------------------------------
-void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamName, const uno::Reference< io::XStream >& xTargetStream )
+void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, const uno::Reference< io::XStream >& xTargetStream )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::WrongPasswordException,
@@ -6185,7 +6185,7 @@ void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamNam
//____________________________________________________________________________________________________
//-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::WrongPasswordException,
@@ -6244,7 +6244,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
}
//-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const ::rtl::OUString& sPassword )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const OUString& sPassword )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::NoEncryptionException,
@@ -6257,7 +6257,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
}
//-----------------------------------------------
-void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath )
+void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& aStreamPath )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
container::NoSuchElementException,
@@ -6293,7 +6293,7 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUSt
// XHierarchicalStorageAccess2
//____________________________________________________________________________________________________
-uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
throw ( embed::InvalidStorageException,
lang::IllegalArgumentException,
packages::NoEncryptionException,
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 83c997ca3544..b8d5e15ba517 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -72,8 +72,8 @@ struct OWriteStream_Impl;
struct SotElement_Impl
{
- ::rtl::OUString m_aName;
- ::rtl::OUString m_aOriginalName;
+ OUString m_aName;
+ OUString m_aOriginalName;
sal_Bool m_bIsRemoved;
sal_Bool m_bIsInserted;
sal_Bool m_bIsStorage;
@@ -82,7 +82,7 @@ struct SotElement_Impl
OWriteStream_Impl* m_pStream;
public:
- SotElement_Impl( const ::rtl::OUString& rName, sal_Bool bStor, sal_Bool bNew );
+ SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew );
~SotElement_Impl();
};
@@ -152,11 +152,11 @@ struct OStorage_Impl
OStorage_Impl* m_pParent;
sal_Bool m_bControlMediaType;
- ::rtl::OUString m_aMediaType;
+ OUString m_aMediaType;
sal_Bool m_bMTFallbackUsed;
sal_Bool m_bControlVersion;
- ::rtl::OUString m_aVersion;
+ OUString m_aVersion;
SwitchablePersistenceStream* m_pSwitchStream;
@@ -194,7 +194,7 @@ struct OStorage_Impl
~OStorage_Impl();
- void AddLog( const ::rtl::OUString& aMessage );
+ void AddLog( const OUString& aMessage );
void SetReadOnlyWrap( OStorage& aStorage );
void RemoveReadOnlyWrap( OStorage& aStorage );
@@ -210,10 +210,10 @@ struct OStorage_Impl
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetAllRelationshipsIfAny();
void CopyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStor );
void CopyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStor,
- const ::rtl::OUString& aPass );
+ const OUString& aPass );
void InsertIntoPackageFolder(
- const ::rtl::OUString& aName,
+ const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xParentPackageFolder );
void Commit();
@@ -225,32 +225,32 @@ struct OStorage_Impl
sal_Bool bDirect );
void CopyStorageElement( SotElement_Impl* pElement,
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xDest,
- ::rtl::OUString aName,
+ OUString aName,
sal_Bool bDirect );
void SetModified( sal_Bool bModified );
- SotElement_Impl* FindElement( const ::rtl::OUString& rName );
+ SotElement_Impl* FindElement( const OUString& rName );
- SotElement_Impl* InsertStream( ::rtl::OUString aName, sal_Bool bEncr );
- SotElement_Impl* InsertRawStream( ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
+ SotElement_Impl* InsertStream( OUString aName, sal_Bool bEncr );
+ SotElement_Impl* InsertRawStream( OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream );
OStorage_Impl* CreateNewStorageImpl( sal_Int32 nStorageMode );
- SotElement_Impl* InsertStorage( ::rtl::OUString aName, sal_Int32 nStorageMode );
- SotElement_Impl* InsertElement( ::rtl::OUString aName, sal_Bool bIsStorage );
+ SotElement_Impl* InsertStorage( OUString aName, sal_Int32 nStorageMode );
+ SotElement_Impl* InsertElement( OUString aName, sal_Bool bIsStorage );
void OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode );
void OpenSubStream( SotElement_Impl* pElement );
- ::com::sun::star::uno::Sequence< ::rtl::OUString > GetElementNames();
+ ::com::sun::star::uno::Sequence< OUString > GetElementNames();
void RemoveElement( SotElement_Impl* pElement );
void ClearElement( SotElement_Impl* pElement );
void DisposeChildren();
void CloneStreamElement(
- const ::rtl::OUString& aStreamName,
+ const OUString& aStreamName,
sal_Bool bPassProvided,
const ::comphelper::SequenceAsHashMap& aEncryptionData,
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
@@ -261,10 +261,10 @@ struct OStorage_Impl
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException );
- void RemoveStreamRelInfo( const ::rtl::OUString& aOriginalName );
+ void RemoveStreamRelInfo( const OUString& aOriginalName );
void CreateRelStorage();
void CommitStreamRelInfo( SotElement_Impl* pStreamElement );
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRelInfoStreamForName( const ::rtl::OUString& aName );
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRelInfoStreamForName( const OUString& aName );
void CommitRelInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xNewPackageFolder );
static void completeStorageStreamCopy_Impl(
@@ -296,7 +296,7 @@ protected:
void Commit_Impl();
- SotElement_Impl* OpenStreamElement_Impl( const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr );
+ SotElement_Impl* OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr );
void BroadcastModifiedIfNecessary();
@@ -362,7 +362,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,
@@ -371,7 +371,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,
@@ -381,7 +381,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,
@@ -389,7 +389,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,
@@ -398,7 +398,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,
@@ -416,7 +416,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,
@@ -424,19 +424,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,
@@ -444,7 +444,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,
@@ -453,9 +453,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,
@@ -464,9 +464,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,
@@ -479,7 +479,7 @@ public:
// XStorage2
//____________________________________________________________________________________________________
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStream( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::packages::NoEncryptionException,
@@ -488,7 +488,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 cloneEncryptedStream( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::packages::NoEncryptionException,
@@ -502,7 +502,7 @@ public:
//____________________________________________________________________________________________________
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getPlainRawStreamElement(
- const ::rtl::OUString& sStreamName )
+ const OUString& sStreamName )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
@@ -511,7 +511,7 @@ public:
::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawEncrStreamElement(
- const ::rtl::OUString& sStreamName )
+ const OUString& sStreamName )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::packages::NoEncryptionException,
@@ -520,7 +520,7 @@ public:
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL insertRawEncrStreamElement( const ::rtl::OUString& aStreamName,
+ virtual void SAL_CALL insertRawEncrStreamElement( const OUString& aStreamName,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
@@ -579,15 +579,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()
@@ -615,7 +615,7 @@ public:
// XEncryptionProtectedSource
//____________________________________________________________________________________________________
- virtual void SAL_CALL setEncryptionPassword( const ::rtl::OUString& aPass )
+ virtual void SAL_CALL setEncryptionPassword( const OUString& aPass )
throw ( ::com::sun::star::uno::RuntimeException,
::com::sun::star::io::IOException );
@@ -650,40 +650,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 );
@@ -691,7 +691,7 @@ public:
//____________________________________________________________________________________________________
// XOptimizedStorage
//____________________________________________________________________________________________________
- virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
+ virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::packages::NoRawFormatException,
@@ -700,7 +700,7 @@ public:
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL insertStreamElementDirect( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps )
+ virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::ElementExistException,
@@ -708,7 +708,7 @@ public:
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL copyElementDirectlyTo( const ::rtl::OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const ::rtl::OUString& sTargetName )
+ virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
@@ -724,14 +724,14 @@ public:
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL attachToURL( const ::rtl::OUString& sURL, sal_Bool bReadOnly )
+ virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException,
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Any SAL_CALL getElementPropertyValue( const ::rtl::OUString& sElementName, const ::rtl::OUString& sPropertyName )
+ virtual ::com::sun::star::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
@@ -741,7 +741,7 @@ public:
::com::sun::star::embed::StorageWrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL copyStreamElementData( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
+ virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::packages::WrongPasswordException,
@@ -753,26 +753,26 @@ public:
// XRelationshipAccess
//____________________________________________________________________________________________________
- virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID )
+ virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID )
throw ( ::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID )
+ virtual OUString SAL_CALL getTargetByID( const OUString& sID )
throw ( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTypeByID( const ::rtl::OUString& sID )
+ virtual OUString SAL_CALL getTypeByID( const OUString& sID )
throw ( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const ::rtl::OUString& sID )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID )
throw ( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const ::rtl::OUString& sType )
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType )
throw ( ::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
@@ -780,12 +780,12 @@ public:
throw ( ::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertRelationshipByID( const ::rtl::OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace )
+ virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace )
throw ( ::com::sun::star::container::ElementExistException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeRelationshipByID( const ::rtl::OUString& sID )
+ virtual void SAL_CALL removeRelationshipByID( const OUString& sID )
throw ( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
@@ -803,7 +803,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,
@@ -811,7 +811,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,
@@ -820,7 +820,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,
@@ -832,7 +832,7 @@ public:
// XHierarchicalStorageAccess2
//____________________________________________________________________________________________________
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
throw ( ::com::sun::star::embed::InvalidStorageException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::packages::NoEncryptionException,
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index cb4b8123a71c..cd2e2f988ef2 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -38,7 +38,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using com::sun::star::lang::IllegalArgumentException;
using com::sun::star::packages::zip::ZipIOException;
-using ::rtl::OUString;
XUnbufferedStream::XUnbufferedStream(
const uno::Reference< uno::XComponentContext >& xContext,
@@ -48,7 +47,7 @@ XUnbufferedStream::XUnbufferedStream(
const ::rtl::Reference< EncryptionData >& rData,
sal_Int8 nStreamMode,
sal_Bool bIsEncrypted,
- const ::rtl::OUString& aMediaType,
+ const OUString& aMediaType,
sal_Bool bRecoveryMode )
: maMutexHolder( aMutexHolder.Is() ? aMutexHolder : SotMutexHolderRef( new SotMutexHolder ) )
, mxZipStream ( xNewZipStream )
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 4bfa35c49a05..9840ff0b471a 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -68,7 +68,7 @@ public:
const ::rtl::Reference< EncryptionData >& rData,
sal_Int8 nStreamMode,
sal_Bool bIsEncrypted,
- const ::rtl::OUString& aMediaType,
+ const OUString& aMediaType,
sal_Bool bRecoveryMode );
// allows to read package raw stream
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 1237b26f17a8..9a894f496e77 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -56,7 +56,6 @@ using namespace com::sun::star::packages;
using namespace com::sun::star::packages::zip;
using namespace com::sun::star::packages::zip::ZipConstants;
-using rtl::OUString;
using ZipUtils::Inflater;
/** This class is used to read entries from a zip file
@@ -194,7 +193,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un
void ZipFile::StaticFillHeader( const ::rtl::Reference< EncryptionData >& rData,
sal_Int64 nSize,
- const ::rtl::OUString& aMediaType,
+ const OUString& aMediaType,
sal_Int8 * & pHeader )
{
// I think it's safe to restrict vector and salt length to 2 bytes !
@@ -294,7 +293,7 @@ sal_Bool ZipFile::StaticFillData ( ::rtl::Reference< BaseEncryptionData > & rDa
sal_Int32 &rDerivedKeySize,
sal_Int32 &rStartKeyGenID,
sal_Int32 &rSize,
- ::rtl::OUString& aMediaType,
+ OUString& aMediaType,
const uno::Reference< XInputStream >& rStream )
{
sal_Bool bOk = sal_False;
@@ -364,7 +363,7 @@ sal_Bool ZipFile::StaticFillData ( ::rtl::Reference< BaseEncryptionData > & rDa
if ( nMediaTypeLength == rStream->readBytes ( aBuffer, nMediaTypeLength ) )
{
- aMediaType = ::rtl::OUString( (sal_Unicode*)aBuffer.getConstArray(),
+ aMediaType = OUString( (sal_Unicode*)aBuffer.getConstArray(),
nMediaTypeLength / sizeof( sal_Unicode ) );
bOk = sal_True;
}
@@ -517,7 +516,7 @@ uno::Reference< XInputStream > ZipFile::createUnbufferedStream(
const ::rtl::Reference< EncryptionData > &rData,
sal_Int8 nStreamMode,
sal_Bool bIsEncrypted,
- ::rtl::OUString aMediaType )
+ OUString aMediaType )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -616,7 +615,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry,
uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
ZipEntry& rEntry,
const ::rtl::Reference< EncryptionData >& rData,
- const ::rtl::OUString& aMediaType,
+ const OUString& aMediaType,
SotMutexHolderRef aMutexHolder )
throw ( packages::NoEncryptionException,
IOException,
@@ -671,7 +670,7 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
if ( nRead < aNameBuffer.getLength() )
aNameBuffer.realloc( nRead );
- ::rtl::OUString sLOCPath = rtl::OUString::intern( (sal_Char *) aNameBuffer.getArray(),
+ OUString sLOCPath = OUString::intern( (sal_Char *) aNameBuffer.getArray(),
aNameBuffer.getLength(),
RTL_TEXTENCODING_UTF8 );
@@ -849,7 +848,7 @@ sal_Int32 ZipFile::readCEN()
throw ZipException("unexpected extra header info length", uno::Reference < XInterface > () );
// read always in UTF8, some tools seem not to set UTF8 bit
- aEntry.sPath = rtl::OUString::intern ( (sal_Char *) aMemGrabber.getCurrentPos(),
+ aEntry.sPath = OUString::intern ( (sal_Char *) aMemGrabber.getCurrentPos(),
aEntry.nPathLen,
RTL_TEXTENCODING_UTF8 );
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index f24881dfbb7a..7b2ae4ffe543 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -320,7 +320,7 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
if ( !::comphelper::OStorageHelper::IsValidZipEntryFileName( rEntry.sPath, sal_True ) )
throw IOException("Unexpected character is used in file name.", uno::Reference< XInterface >() );
- ::rtl::OString sUTF8Name = ::rtl::OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
+ OString sUTF8Name = OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
sal_Int16 nNameLength = static_cast < sal_Int16 > ( sUTF8Name.getLength() );
aChucker << CENSIG;
@@ -391,7 +391,7 @@ sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry )
if ( !::comphelper::OStorageHelper::IsValidZipEntryFileName( rEntry.sPath, sal_True ) )
throw IOException("Unexpected character is used in file name.", uno::Reference< XInterface >() );
- ::rtl::OString sUTF8Name = ::rtl::OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
+ OString sUTF8Name = OUStringToOString( rEntry.sPath, RTL_TEXTENCODING_UTF8 );
sal_Int16 nNameLength = static_cast < sal_Int16 > ( sUTF8Name.getLength() );
aChucker << LOCSIG;
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
index 627ccdaf4408..e3b1676cd83a 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
@@ -21,7 +21,6 @@
#include <ContentInfo.hxx>
using namespace com::sun::star;
-using rtl::OUString;
ZipPackageFolderEnumeration::ZipPackageFolderEnumeration ( ContentHash &rInput)
: rContents (rInput)
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index 4879616c4945..b9894a2feefe 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -34,7 +34,7 @@ protected:
ContentHash& rContents;
ContentHash::const_iterator aIterator;
public:
- //ZipPackageFolderEnumeration (boost::unordered_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput);
+ //ZipPackageFolderEnumeration (boost::unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput);
ZipPackageFolderEnumeration (ContentHash &rInput);
virtual ~ZipPackageFolderEnumeration( void );
@@ -45,11 +45,11 @@ public:
throw(::com::sun::star::container::NoSuchElementException, ::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);
};
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index d9303845fe07..4adb755c2e0f 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -36,9 +36,6 @@ using namespace psp;
using namespace padmin;
using namespace std;
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringHash;
-using ::rtl::OUStringToOString;
APTabPage::APTabPage( AddPrinterDialog* pParent, const ResId& rResId )
@@ -285,7 +282,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
int nPos = file->SearchBackward( '.' );
if( file->Copy( 0, nPos ) == String( aPPD ) )
{
- rtl::OString aSysPath(OUStringToOString(aFile, aEncoding));
+ OString aSysPath(OUStringToOString(aFile, aEncoding));
if (unlink(aSysPath.getStr()))
{
OUString aText( PaResId( RID_ERR_REMOVEDRIVERFAILED ) );
@@ -487,37 +484,37 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
// read defaults
aConfig.SetGroup( "Xprinter,PostScript" );
- rtl::OString aDefPageSize( aConfig.ReadKey( "PageSize" ) );
- rtl::OString aDefOrientation( aConfig.ReadKey( "Orientation" ) );
- rtl::OString aDefMarginLeft( aConfig.ReadKey( "MarginLeft" ) );
- rtl::OString aDefMarginRight( aConfig.ReadKey( "MarginRight" ) );
- rtl::OString aDefMarginTop( aConfig.ReadKey( "MarginTop" ) );
- rtl::OString aDefMarginBottom( aConfig.ReadKey( "MarginBottom" ) );
- rtl::OString aDefScale( aConfig.ReadKey( "Scale" ) );
+ OString aDefPageSize( aConfig.ReadKey( "PageSize" ) );
+ OString aDefOrientation( aConfig.ReadKey( "Orientation" ) );
+ OString aDefMarginLeft( aConfig.ReadKey( "MarginLeft" ) );
+ OString aDefMarginRight( aConfig.ReadKey( "MarginRight" ) );
+ OString aDefMarginTop( aConfig.ReadKey( "MarginTop" ) );
+ OString aDefMarginBottom( aConfig.ReadKey( "MarginBottom" ) );
+ OString aDefScale( aConfig.ReadKey( "Scale" ) );
aConfig.SetGroup( "devices" );
int nDevices = aConfig.GetKeyCount();
for( int nKey = 0; nKey < nDevices; nKey++ )
{
aConfig.SetGroup( "devices" );
- rtl::OString aPrinter(aConfig.GetKeyName(nKey));
- rtl::OString aValue(aConfig.ReadKey(aPrinter));
- rtl::OString aPort(aValue.getToken(1, ','));
- rtl::OString aDriver(aValue.getToken(0, ' '));
- rtl::OString aPS( aValue.getToken(0, ',').getToken(1, ' ') );
- rtl::OString aNewDriver(aDriver);
+ OString aPrinter(aConfig.GetKeyName(nKey));
+ OString aValue(aConfig.ReadKey(aPrinter));
+ OString aPort(aValue.getToken(1, ','));
+ OString aDriver(aValue.getToken(0, ' '));
+ OString aPS( aValue.getToken(0, ',').getToken(1, ' ') );
+ OString aNewDriver(aDriver);
if( aDriver == "GENERIC")
- aNewDriver = rtl::OString("SGENPRT");
+ aNewDriver = OString("SGENPRT");
if( aPS != "PostScript" )
continue;
- const PPDParser* pParser = PPDParser::getParser(rtl::OStringToOUString(aNewDriver, aEncoding));
+ const PPDParser* pParser = PPDParser::getParser(OStringToOUString(aNewDriver, aEncoding));
if( pParser == NULL )
{
OUString aText( PaResId( RID_TXT_DRIVERDOESNOTEXIST ) );
- aText = aText.replaceFirst( OUString( "%s1" ), rtl::OStringToOUString(aPrinter, aEncoding) );
- aText = aText.replaceFirst( OUString( "%s2" ), rtl::OStringToOUString(aDriver, aEncoding) );
+ aText = aText.replaceFirst( OUString( "%s1" ), OStringToOUString(aPrinter, aEncoding) );
+ aText = aText.replaceFirst( OUString( "%s2" ), OStringToOUString(aDriver, aEncoding) );
InfoBox aBox( this, aText );
aBox.Execute();
continue;
@@ -525,28 +522,28 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
// read the command
aConfig.SetGroup( "ports" );
- rtl::OString aCommand( aConfig.ReadKey( aPort ) );
+ OString aCommand( aConfig.ReadKey( aPort ) );
if (!aCommand.isEmpty())
{
OUString aText( PaResId( RID_TXT_PRINTERWITHOUTCOMMAND ) );
- aText = aText.replaceFirst( OUString( "%s" ), rtl::OStringToOUString(aPrinter, aEncoding) );
+ aText = aText.replaceFirst( OUString( "%s" ), OStringToOUString(aPrinter, aEncoding) );
InfoBox aBox( this, aText );
aBox.Execute();
continue;
}
- String aUPrinter( AddPrinterDialog::uniquePrinterName(rtl::OStringToOUString(aPrinter, aEncoding)) );
+ String aUPrinter( AddPrinterDialog::uniquePrinterName(OStringToOUString(aPrinter, aEncoding)) );
PrinterInfo aInfo;
- aInfo.m_aDriverName = rtl::OStringToOUString(aNewDriver, aEncoding);
+ aInfo.m_aDriverName = OStringToOUString(aNewDriver, aEncoding);
aInfo.m_pParser = pParser;
aInfo.m_aContext.setParser( pParser );
aInfo.m_aPrinterName = aUPrinter;
- aInfo.m_aCommand = rtl::OStringToOUString(aCommand, aEncoding);
+ aInfo.m_aCommand = OStringToOUString(aCommand, aEncoding);
// read the printer settings
- rtl::OStringBuffer aGroup(aDriver);
+ OStringBuffer aGroup(aDriver);
aGroup.append(",PostScript,");
aGroup.append(aPort);
aConfig.SetGroup(aGroup.makeStringAndClear());
@@ -554,11 +551,11 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
aValue = aConfig.ReadKey( "PageSize", aDefPageSize );
int nLeft, nRight, nTop, nBottom;
if( !aValue.isEmpty() &&
- aInfo.m_pParser->getMargins( rtl::OStringToOUString(aValue, aEncoding),
+ aInfo.m_pParser->getMargins( OStringToOUString(aValue, aEncoding),
nLeft, nRight, nTop, nBottom ) )
{
const PPDKey* pKey = aInfo.m_pParser->getKey( String( "PageSize" ) );
- const PPDValue* pValue = pKey ? pKey->getValue( rtl::OStringToOUString(aValue, aEncoding) ) : NULL;
+ const PPDValue* pValue = pKey ? pKey->getValue( OStringToOUString(aValue, aEncoding) ) : NULL;
if( pKey && pValue )
aInfo.m_aContext.setValue( pKey, pValue );
aValue = aConfig.ReadKey( "MarginLeft", aDefMarginLeft );
@@ -580,7 +577,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
aInfo.m_nCopies = aValue.toInt32();
aValue = aConfig.ReadKey( "Comment" );
- aInfo.m_aComment = rtl::OStringToOUString(aValue, aEncoding);
+ aInfo.m_aComment = OStringToOUString(aValue, aEncoding);
aValue = aConfig.ReadKey( "Level" );
if (!aValue.isEmpty())
@@ -592,7 +589,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
int nGroupKeys = aConfig.GetKeyCount();
for( int nPPDKey = 0; nPPDKey < nGroupKeys; nPPDKey++ )
{
- rtl::OString aPPDKey( aConfig.GetKeyName( nPPDKey ) );
+ OString aPPDKey( aConfig.GetKeyName( nPPDKey ) );
// ignore page region
// there are some ppd keys in old Xpdefaults that
// should never have been writte because they are defaults
@@ -602,8 +599,8 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
{
aValue = aConfig.ReadKey( nPPDKey );
aPPDKey = aPPDKey.copy(4);
- const PPDKey* pKey = aInfo.m_pParser->getKey( rtl::OStringToOUString(aPPDKey, RTL_TEXTENCODING_ISO_8859_1) );
- const PPDValue* pValue = pKey ? ( aValue == "*nil" ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)) ) : NULL;
+ const PPDKey* pKey = aInfo.m_pParser->getKey( OStringToOUString(aPPDKey, RTL_TEXTENCODING_ISO_8859_1) );
+ const PPDValue* pValue = pKey ? ( aValue == "*nil" ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)) ) : NULL;
if( pKey )
aInfo.m_aContext.setValue( pKey, pValue, true );
}
@@ -1080,22 +1077,22 @@ OUString AddPrinterDialog::uniquePrinterName( const OUString& rBase )
String AddPrinterDialog::getOldPrinterLocation()
{
static const char* pHome = getenv( "HOME" );
- rtl::OString aFileName;
+ OString aFileName;
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
if( pHome )
{
- aFileName = rtl::OStringBuffer().append(pHome).
+ aFileName = OStringBuffer().append(pHome).
append("/.Xpdefaults").makeStringAndClear();
if (access(aFileName.getStr(), F_OK))
{
- aFileName = rtl::OStringBuffer().append(pHome).
+ aFileName = OStringBuffer().append(pHome).
append("/.sversionrc").makeStringAndClear();
- Config aSVer(rtl::OStringToOUString(aFileName, aEncoding));
+ Config aSVer(OStringToOUString(aFileName, aEncoding));
aSVer.SetGroup( "Versions" );
aFileName = aSVer.ReadKey( "StarOffice 5.2" );
if (!aFileName.isEmpty())
- aFileName = aFileName + rtl::OString("/share/xp3/Xpdefaults");
+ aFileName = aFileName + OString("/share/xp3/Xpdefaults");
else if(
(aFileName = aSVer.ReadKey( "StarOffice 5.1" ) ).getLength()
||
@@ -1104,14 +1101,14 @@ String AddPrinterDialog::getOldPrinterLocation()
(aFileName = aSVer.ReadKey( "StarOffice 4.0" ) ).getLength()
)
{
- aFileName = aFileName + rtl::OString("/xp3/Xpdefaults");
+ aFileName = aFileName + OString("/xp3/Xpdefaults");
}
if (!aFileName.isEmpty() && access(aFileName.getStr(), F_OK))
- aFileName = rtl::OString();
+ aFileName = OString();
}
}
- return !aFileName.isEmpty() ? rtl::OStringToOUString(aFileName, aEncoding) : OUString();
+ return !aFileName.isEmpty() ? OStringToOUString(aFileName, aEncoding) : OUString();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 169550f3376a..725c850638da 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -85,7 +85,7 @@ class APChooseDriverPage : public APTabPage
DECL_LINK( ClickBtnHdl, PushButton* );
DECL_LINK( DelPressedHdl, ListBox* );
- void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( "SGENPRT" ) );
+ void updateDrivers( bool bRefresh = false, const OUString& rSelectDriver = OUString( "SGENPRT" ) );
public:
APChooseDriverPage( AddPrinterDialog* pParent );
~APChooseDriverPage();
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 911b879ca873..c9b21edc4d67 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -123,7 +123,7 @@ void CommandStore::getStoredCommands( const char* pGroup, ::std::list< String >&
::std::list< String >::const_iterator it;
while( nKeys-- )
{
- OUString aCommand( rConfig.ReadKey(rtl::OString::valueOf(nKeys), RTL_TEXTENCODING_UTF8 ) );
+ OUString aCommand( rConfig.ReadKey(OString::valueOf(nKeys), RTL_TEXTENCODING_UTF8 ) );
if( !aCommand.isEmpty() )
{
for( it = rCommands.begin(); it != rCommands.end() && *it != aCommand; ++it )
@@ -166,7 +166,7 @@ void CommandStore::setCommands(
nWritten--;
}
for( nWritten = 0, it = aWriteList.begin(); it != aWriteList.end(); ++it, ++nWritten )
- rConfig.WriteKey( rtl::OString::valueOf(nWritten), OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
+ rConfig.WriteKey( OString::valueOf(nWritten), OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
}
diff --git a/padmin/source/desktopcontext.cxx b/padmin/source/desktopcontext.cxx
index 143e3c0cac35..01ba6dee1f09 100644
--- a/padmin/source/desktopcontext.cxx
+++ b/padmin/source/desktopcontext.cxx
@@ -23,7 +23,6 @@
using namespace com::sun::star::uno;
-using ::rtl::OUString;
namespace padmin
{
diff --git a/padmin/source/desktopcontext.hxx b/padmin/source/desktopcontext.hxx
index 3bd0d782fc8e..2eb2dc796213 100644
--- a/padmin/source/desktopcontext.hxx
+++ b/padmin/source/desktopcontext.hxx
@@ -33,7 +33,7 @@ namespace padmin
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/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 988cc82fd3ca..3b5e5f75cb47 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -42,8 +42,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ui::dialogs;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
/*
* PaResId
@@ -62,7 +60,7 @@ ResId padmin::PaResId( sal_uInt32 nId )
OUString("org.openoffice.Setup/L10N") );
if ( aNode.isValid() )
{
- rtl::OUString aLoc;
+ OUString aLoc;
Any aValue = aNode.getNodeValue( OUString("ooLocale") );
if( aValue >>= aLoc )
{
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 18c0b8ee8802..cd8626778cc8 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -44,7 +44,6 @@ using namespace padmin;
using namespace psp;
using namespace osl;
-using ::rtl::OUStringToOString;
PPDImportDialog::PPDImportDialog( Window* pParent ) :
ModalDialog( pParent, PaResId( RID_PPDIMPORT_DLG ) ),
@@ -67,12 +66,12 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) :
Config& rConfig = getPadminRC();
rConfig.SetGroup( PPDIMPORT_GROUP );
- m_aPathBox.SetText( rtl::OStringToOUString(rConfig.ReadKey("LastDir"), RTL_TEXTENCODING_UTF8) );
+ m_aPathBox.SetText( OStringToOUString(rConfig.ReadKey("LastDir"), RTL_TEXTENCODING_UTF8) );
for (sal_Int32 i = 0; i < 11; ++i)
{
- rtl::OString aEntry(rConfig.ReadKey(rtl::OString::valueOf(i)));
+ OString aEntry(rConfig.ReadKey(OString::valueOf(i)));
if (!aEntry.isEmpty())
- m_aPathBox.InsertEntry(rtl::OStringToOUString(aEntry, RTL_TEXTENCODING_UTF8));
+ m_aPathBox.InsertEntry(OStringToOUString(aEntry, RTL_TEXTENCODING_UTF8));
}
m_aOKBtn.SetClickHdl( LINK( this, PPDImportDialog, ClickBtnHdl ) );
@@ -100,7 +99,7 @@ void PPDImportDialog::Import()
Config& rConfig = getPadminRC();
rConfig.SetGroup( PPDIMPORT_GROUP );
- rConfig.WriteKey( "LastDir", rtl::OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
+ rConfig.WriteKey( "LastDir", OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
int nEntries = m_aPathBox.GetEntryCount();
while( nEntries-- )
@@ -109,9 +108,9 @@ void PPDImportDialog::Import()
if( nEntries < 0 )
{
sal_Int32 nNextEntry = rConfig.ReadKey("NextEntry").toInt32();
- rConfig.WriteKey( rtl::OString::valueOf(nNextEntry), rtl::OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
+ rConfig.WriteKey( OString::valueOf(nNextEntry), OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
nNextEntry = nNextEntry < 10 ? nNextEntry+1 : 0;
- rConfig.WriteKey( "NextEntry", rtl::OString::valueOf(nNextEntry) );
+ rConfig.WriteKey( "NextEntry", OString::valueOf(nNextEntry) );
m_aPathBox.InsertEntry( aImportPath );
}
while( m_aDriverLB.GetEntryCount() )
@@ -141,7 +140,7 @@ void PPDImportDialog::Import()
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "Warning: File %s has empty printer name.\n",
- rtl::OUStringToOString( aPath.PathToFileName(), osl_getThreadTextEncoding() ).getStr() );
+ OUStringToOString( aPath.PathToFileName(), osl_getThreadTextEncoding() ).getStr() );
#endif
continue;
}
@@ -212,7 +211,7 @@ IMPL_LINK( PPDImportDialog, ModifyHdl, ComboBox*, pListBox )
{
if( pListBox == &m_aPathBox )
{
- rtl::OString aDir(rtl::OUStringToOString(m_aPathBox.GetText(), osl_getThreadTextEncoding()));
+ OString aDir(OUStringToOString(m_aPathBox.GetText(), osl_getThreadTextEncoding()));
if (!access( aDir.getStr(), F_OK))
Import();
}
diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx
index c87d8bb62bd1..b94fc4b0c7ae 100644
--- a/padmin/source/newppdlg.hxx
+++ b/padmin/source/newppdlg.hxx
@@ -52,12 +52,12 @@ namespace padmin {
void Import();
- std::list< rtl::OUString > m_aImportedFiles;
+ std::list< OUString > m_aImportedFiles;
public:
PPDImportDialog( Window* pParent );
~PPDImportDialog();
- const std::list< rtl::OUString >& getImportedFiles() const
+ const std::list< OUString >& getImportedFiles() const
{ return m_aImportedFiles; }
};
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index fc04a2c1e67b..c6adfc93f779 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -60,8 +60,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
PADialog* PADialog::Create( Window* pParent, sal_Bool bAdmin )
{
@@ -435,7 +433,7 @@ void SpaPrinterController::printPage( int ) const
for( unsigned int i = 0; i < SAL_N_ELEMENTS(aResIds); i++ )
{
if( aResIds[i].pDirect )
- aToken = rtl::OUString::createFromAscii(aResIds[i].pDirect);
+ aToken = OUString::createFromAscii(aResIds[i].pDirect);
else
aToken = String( PaResId( aResIds[i].nResId ) );
nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth;
@@ -564,7 +562,7 @@ void SpaPrinterController::jobFinished( com::sun::star::view::PrintableState )
void PADialog::PrintTestPage()
{
- const rtl::OUString sPrinter( getSelectedDevice() );
+ const OUString sPrinter( getSelectedDevice() );
boost::shared_ptr<Printer> pPrinter( new Printer( sPrinter ) );
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 999347405030..bb058cb72473 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -64,7 +64,7 @@ namespace padmin {
String m_aRenameStr;
::psp::PrinterInfoManager& m_rPIManager;
- ::std::list< ::rtl::OUString > m_aPrinters;
+ ::std::list< OUString > m_aPrinters;
Image m_aPrinterImg;
Image m_aFaxImg;
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 70f9267bfdb3..bbccadf032c1 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace comphelper;
-using ::rtl::OUString;
class MyApp : public Application
{
@@ -51,7 +50,7 @@ public:
int Main();
virtual sal_uInt16 Exception( sal_uInt16 nError );
- static rtl::OUString ReadStringHook( const rtl::OUString& );
+ static OUString ReadStringHook( const OUString& );
};
void vclmain::createApplication()
@@ -59,10 +58,10 @@ void vclmain::createApplication()
static MyApp aMyApp;
}
-rtl::OUString MyApp::ReadStringHook( const rtl::OUString& rStr )
+OUString MyApp::ReadStringHook( const OUString& rStr )
{
return rStr.replaceAll(
- rtl::OUString("%PRODUCTNAME"), utl::ConfigManager::getProductName() );
+ OUString("%PRODUCTNAME"), utl::ConfigManager::getProductName() );
};
@@ -73,7 +72,7 @@ sal_uInt16 MyApp::Exception( sal_uInt16 nError )
switch( nError & EXC_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
- Abort( rtl::OUString( "Error: could not load language resources.\nPlease check your installation.\n" ) );
+ Abort( OUString( "Error: could not load language resources.\nPlease check your installation.\n" ) );
break;
}
return 0;
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 7d58ff9ef4a4..53d09ce0c5e4 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -31,9 +31,6 @@
using namespace psp;
using namespace padmin;
-using ::rtl::OUString;
-using ::rtl::OUStringHash;
-using ::rtl::OString;
void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, const PPDKey* pKey )
{
@@ -283,7 +280,7 @@ void RTSPaperPage::update()
// input slots
if( m_pParent->m_aJobData.m_pParser &&
- (pKey = m_pParent->m_aJobData.m_pParser->getKey( rtl::OUString("InputSlot") )) )
+ (pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString("InputSlot") )) )
{
m_pParent->insertAllPPDValues( *m_pSlotBox, m_pParent->m_aJobData.m_pParser, pKey );
}
@@ -811,12 +808,12 @@ RTSPWDialog::~RTSPWDialog()
OString RTSPWDialog::getUserName() const
{
- return rtl::OUStringToOString( m_aUserEdit.GetText(), osl_getThreadTextEncoding() );
+ return OUStringToOString( m_aUserEdit.GetText(), osl_getThreadTextEncoding() );
}
OString RTSPWDialog::getPassword() const
{
- return rtl::OUStringToOString( m_aPassEdit.GetText(), osl_getThreadTextEncoding() );
+ return OUStringToOString( m_aPassEdit.GetText(), osl_getThreadTextEncoding() );
}
extern "C" {
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 9a9fb638f367..0db1b9b59023 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -43,9 +43,6 @@
#endif
#endif
-using rtl::OUString;
-using rtl::OUStringBuffer;
-using rtl::OString;
using pyuno::PyRef;
using pyuno::Runtime;
@@ -121,7 +118,7 @@ static void setPythonHome ( const OUString & pythonHome )
{
OUString systemPythonHome;
osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
- OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
+ OString o = OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
#if PY_MAJOR_VERSION >= 3
// static because Py_SetPythonHome just copies the "wide" pointer
static wchar_t wide[PATH_MAX + 1];
@@ -145,7 +142,7 @@ static void setPythonHome ( const OUString & pythonHome )
static void prependPythonPath( const OUString & pythonPathBootstrap )
{
- rtl::OUStringBuffer bufPYTHONPATH( 256 );
+ OUStringBuffer bufPYTHONPATH( 256 );
sal_Int32 nIndex = 0;
while( 1 )
{
@@ -169,10 +166,10 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
}
const char * oldEnv = getenv( "PYTHONPATH");
if( oldEnv )
- bufPYTHONPATH.append( rtl::OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) );
+ bufPYTHONPATH.append( OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) );
- rtl::OUString envVar("PYTHONPATH");
- rtl::OUString envValue(bufPYTHONPATH.makeStringAndClear());
+ OUString envVar("PYTHONPATH");
+ OUString envValue(bufPYTHONPATH.makeStringAndClear());
osl_setEnvironment(envVar.pData, envValue.pData);
}
@@ -203,13 +200,13 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
#ifdef WNT
//extend PATH under windows to include the branddir/program so ssl libs will be found
//for use by terminal mailmerge dependency _ssl.pyd
- rtl::OUString sEnvName("PATH");
- rtl::OUString sPath;
+ OUString sEnvName("PATH");
+ OUString sPath;
osl_getEnvironment(sEnvName.pData, &sPath.pData);
- rtl::OUString sBrandLocation("$BRAND_BASE_DIR/program");
+ OUString sBrandLocation("$BRAND_BASE_DIR/program");
rtl::Bootstrap::expandMacros(sBrandLocation);
osl::FileBase::getSystemPathFromFileURL(sBrandLocation, sBrandLocation);
- sPath = rtl::OUStringBuffer(sPath).
+ sPath = OUStringBuffer(sPath).
append(static_cast<sal_Unicode>(SAL_PATHSEPARATOR)).
append(sBrandLocation).makeStringAndClear();
osl_setEnvironment(sEnvName.pData, sPath.pData);
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index cf18d9c6de6a..4c6191d4da30 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -29,10 +29,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XMaterialHolder.hpp>
-using rtl::OStringBuffer;
-using rtl::OUStringBuffer;
-using rtl::OUStringToOString;
-using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
@@ -754,7 +750,7 @@ PyObject* PyUNO_new_UNCHECKED (
Reference<XInvocation2> tmp_invocation (tmp_interface, UNO_QUERY);
if (!tmp_invocation.is()) {
- throw RuntimeException (rtl::OUString::createFromAscii (
+ throw RuntimeException (OUString::createFromAscii (
"XInvocation2 not implemented, cannot interact with object"),
Reference< XInterface > ());
}
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index e987a7e42762..b51bc06912d0 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -25,11 +25,6 @@
#include <cppuhelper/typeprovider.hxx>
-using rtl::OUStringToOString;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-using rtl::OString;
-using rtl::OStringBuffer;
using com::sun::star::beans::XIntrospectionAccess;
using com::sun::star::beans::XIntrospection;
diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
index 1b9a20b91d1c..4175c8066e76 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -21,8 +21,6 @@
#include <osl/thread.h>
#include <rtl/ustrbuf.hxx>
-using rtl::OUStringToOString;
-using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index 3d1c104ca2d2..9c21a9e65e4e 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -22,9 +22,6 @@
#include <typelib/typedescription.hxx>
-using rtl::OUString;
-using rtl::OUStringBuffer;
-using rtl::OUStringToOString;
using com::sun::star::uno::RuntimeException;
using com::sun::star::uno::Sequence;
diff --git a/pyuno/source/module/pyuno_gc.cxx b/pyuno/source/module/pyuno_gc.cxx
index 7195a3563334..637be9d62523 100644
--- a/pyuno/source/module/pyuno_gc.cxx
+++ b/pyuno/source/module/pyuno_gc.cxx
@@ -86,8 +86,8 @@ void GCThread::execute()
}
catch( const com::sun::star::uno::RuntimeException & e )
{
- rtl::OString msg;
- msg = rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US );
+ OString msg;
+ msg = OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US );
fprintf( stderr, "Leaking python objects bridged to UNO for reason %s\n",msg.getStr());
}
}
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 446a28615ed5..95245230fb5a 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -144,21 +144,21 @@ static const sal_Int32 ARGS = 2;
}
bool isLog( RuntimeCargo *cargo, sal_Int32 loglevel );
-void log( RuntimeCargo *cargo, sal_Int32 level, const rtl::OUString &logString );
+void log( RuntimeCargo *cargo, sal_Int32 level, const OUString &logString );
void log( RuntimeCargo *cargo, sal_Int32 level, const char *str );
void logCall( RuntimeCargo *cargo, const char *intro,
- void * ptr, const rtl::OUString & aFunctionName,
+ void * ptr, const OUString & aFunctionName,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & args );
void logReply( RuntimeCargo *cargo, const char *intro,
- void * ptr, const rtl::OUString & aFunctionName,
+ void * ptr, const OUString & aFunctionName,
const com::sun::star::uno::Any &returnValue,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & args );
void logException( RuntimeCargo *cargo, const char *intro,
- void * ptr, const rtl::OUString &aFunctionName,
+ void * ptr, const OUString &aFunctionName,
const void * data, const com::sun::star::uno::Type & type );
static const sal_Int32 VAL2STR_MODE_DEEP = 0;
static const sal_Int32 VAL2STR_MODE_SHALLOW = 1;
-rtl::OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW(());
+OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW(());
//--------------------------------------------------
typedef ::boost::unordered_map
@@ -172,18 +172,18 @@ typedef ::boost::unordered_map
typedef ::boost::unordered_map
<
-rtl::OUString,
+OUString,
PyRef,
-rtl::OUStringHash,
-std::equal_to<rtl::OUString>
+OUStringHash,
+std::equal_to<OUString>
> ExceptionClassMap;
typedef ::boost::unordered_map
<
- rtl::OUString,
+ OUString,
com::sun::star::uno::Sequence< sal_Int16 >,
- rtl::OUStringHash,
- std::equal_to< rtl::OUString >
+ OUStringHash,
+ std::equal_to< OUString >
> MethodOutIndexMap;
typedef ::boost::unordered_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet;
@@ -208,9 +208,9 @@ typedef struct
PyUNOInternals* members;
} PyUNO;
-PyRef ustring2PyUnicode( const rtl::OUString &source );
-PyRef ustring2PyString( const ::rtl::OUString & source );
-rtl::OUString pyString2ustring( PyObject *str );
+PyRef ustring2PyUnicode( const OUString &source );
+PyRef ustring2PyString( const OUString & source );
+OUString pyString2ustring( PyObject *str );
PyRef AnyToPyObject (const com::sun::star::uno::Any & a, const Runtime &r )
@@ -226,7 +226,7 @@ com::sun::star::uno::TypeClass StringToTypeClass (char* string);
PyRef PyUNO_callable_new (
const com::sun::star::uno::Reference<com::sun::star::script::XInvocation2> &xInv,
- const rtl::OUString &methodName,
+ const OUString &methodName,
const com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> &ssf,
const com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> &tc,
ConversionMode mode = REJECT_UNO_ANY );
@@ -242,7 +242,7 @@ PyRef getBoolClass( const Runtime &);
PyRef getCharClass( const Runtime &);
PyRef getByteSequenceClass( const Runtime & );
PyRef getPyUnoClass();
-PyRef getClass( const rtl::OUString & name , const Runtime & runtime );
+PyRef getClass( const OUString & name , const Runtime & runtime );
PyRef getAnyClass( const Runtime &);
PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args );
@@ -308,7 +308,7 @@ class Adapter : public cppu::WeakImplHelper2<
MethodOutIndexMap m_methodOutIndexMap;
private:
- com::sun::star::uno::Sequence< sal_Int16 > getOutIndexes( const rtl::OUString & functionName );
+ com::sun::star::uno::Sequence< sal_Int16 > getOutIndexes( const OUString & functionName );
public:
public:
@@ -324,7 +324,7 @@ public:
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 )
@@ -334,19 +334,19 @@ public:
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setValue(
- const ::rtl::OUString& aPropertyName,
+ 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);
// XUnoTunnel
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index b709c13a63ca..768b6d735a8a 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -44,12 +44,6 @@
using osl::Module;
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringHash;
-using rtl::OUStringToOString;
-using rtl::OUStringBuffer;
-using rtl::OStringBuffer;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -171,7 +165,7 @@ static void fillStruct(
{
const OUString OUMemberName (pCompType->ppMemberNames[i]);
PyObject *pyMemberName =
- PyStr_FromString(::rtl::OUStringToOString(OUMemberName,
+ PyStr_FromString(OUStringToOString(OUMemberName,
RTL_TEXTENCODING_UTF8).getStr());
if ( PyObject *element = PyDict_GetItem(kwinitializer, pyMemberName ) )
{
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 7f03b21dde1a..15615ba48dcb 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -35,11 +35,6 @@
#include <com/sun/star/script/Converter.hpp>
#include <com/sun/star/reflection/theCoreReflection.hpp>
-using rtl::OUString;
-using rtl::OUStringToOString;
-using rtl::OUStringBuffer;
-using rtl::OStringBuffer;
-using rtl::OString;
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
@@ -915,7 +910,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
PyRef args( PyTuple_New( 1), SAL_NO_ACQUIRE );
PyTuple_SetItem( args.get(), 0, excTraceback.getAcquired() );
PyRef pyStr( PyObject_CallObject( extractTraceback.get(),args.get() ), SAL_NO_ACQUIRE);
- str = rtl::OUString::createFromAscii( PyStr_AsString(pyStr.get()) );
+ str = OUString::createFromAscii( PyStr_AsString(pyStr.get()) );
}
else
{
@@ -980,7 +975,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
e.Message = buf.makeStringAndClear();
#if OSL_DEBUG_LEVEL > 0
fprintf( stderr, "Python exception: %s\n",
- rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
#endif
ret = com::sun::star::uno::makeAny( e );
}
@@ -989,7 +984,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
static const char * g_NUMERICID = "pyuno.lcNumeric";
-static ::std::vector< rtl::OString > g_localeList;
+static ::std::vector< OString > g_localeList;
static const char *ensureUnlimitedLifetime( const char *str )
{
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index d03368ab136f..2cd663ca9325 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -23,11 +23,6 @@
#include <typelib/typedescription.hxx>
-using rtl::OString;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-using rtl::OUStringToOString;
-using rtl::OStringBuffer;
using com::sun::star::uno::TypeClass;
using com::sun::star::uno::Type;
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index 0b0d6ef488a4..1cf1e40b343c 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -30,11 +30,6 @@
#include <com/sun/star/beans/XMaterialHolder.hpp>
-using rtl::OUStringToOString;
-using rtl::OUString;
-using rtl::OString;
-using rtl::OStringBuffer;
-using rtl::OUStringBuffer;
using com::sun::star::uno::TypeDescription;
@@ -127,7 +122,7 @@ bool isLog( RuntimeCargo * cargo, sal_Int32 loglevel )
return cargo && cargo->logFile && loglevel <= cargo->logLevel;
}
-void log( RuntimeCargo * cargo, sal_Int32 level, const rtl::OUString &logString )
+void log( RuntimeCargo * cargo, sal_Int32 level, const OUString &logString )
{
log( cargo, level, OUStringToOString( logString, osl_getThreadTextEncoding() ).getStr() );
}
@@ -165,7 +160,7 @@ void log( RuntimeCargo * cargo, sal_Int32 level, const char *str )
namespace {
-void appendPointer(rtl::OUStringBuffer & buffer, void * pointer) {
+void appendPointer(OUStringBuffer & buffer, void * pointer) {
buffer.append(
sal::static_int_cast< sal_Int64 >(
reinterpret_cast< sal_IntPtr >(pointer)),
@@ -175,12 +170,12 @@ void appendPointer(rtl::OUStringBuffer & buffer, void * pointer) {
}
void logException( RuntimeCargo *cargo, const char *intro,
- void * ptr, const rtl::OUString &aFunctionName,
+ void * ptr, const OUString &aFunctionName,
const void * data, const com::sun::star::uno::Type & type )
{
if( isLog( cargo, LogLevel::CALL ) )
{
- rtl::OUStringBuffer buf( 128 );
+ OUStringBuffer buf( 128 );
buf.appendAscii( intro );
appendPointer(buf, ptr);
buf.append( "]." );
@@ -197,11 +192,11 @@ void logReply(
RuntimeCargo *cargo,
const char *intro,
void * ptr,
- const rtl::OUString & aFunctionName,
+ const OUString & aFunctionName,
const Any &returnValue,
const Sequence< Any > & aParams )
{
- rtl::OUStringBuffer buf( 128 );
+ OUStringBuffer buf( 128 );
buf.appendAscii( intro );
appendPointer(buf, ptr);
buf.append( "]." );
@@ -223,10 +218,10 @@ void logReply(
}
void logCall( RuntimeCargo *cargo, const char *intro,
- void * ptr, const rtl::OUString & aFunctionName,
+ void * ptr, const OUString & aFunctionName,
const Sequence< Any > & aParams )
{
- rtl::OUStringBuffer buf( 128 );
+ OUStringBuffer buf( 128 );
buf.appendAscii( intro );
appendPointer(buf, ptr);
buf.append( "]." );
diff --git a/registry/inc/registry/reader.hxx b/registry/inc/registry/reader.hxx
index 7e2d200ff653..a867f3b1185a 100644
--- a/registry/inc/registry/reader.hxx
+++ b/registry/inc/registry/reader.hxx
@@ -141,13 +141,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getDocumentation() const {
+ OUString getDocumentation() const {
rtl_uString * s = 0;
typereg_reader_getDocumentation(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -159,13 +159,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- rtl::OUString getFileName() const {
+ OUString getFileName() const {
rtl_uString * s = 0;
typereg_reader_getFileName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -200,13 +200,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getTypeName() const {
+ OUString getTypeName() const {
rtl_uString * s = 0;
typereg_reader_getTypeName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -229,13 +229,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getSuperTypeName(sal_uInt16 index) const {
+ OUString getSuperTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getSuperTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -257,13 +257,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldDocumentation(sal_uInt16 index) const {
+ OUString getFieldDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -276,13 +276,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- rtl::OUString getFieldFileName(sal_uInt16 index) const {
+ OUString getFieldFileName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldFileName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -305,13 +305,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldName(sal_uInt16 index) const {
+ OUString getFieldName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -323,13 +323,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldTypeName(sal_uInt16 index) const {
+ OUString getFieldTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -370,13 +370,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodDocumentation(sal_uInt16 index) const {
+ OUString getMethodDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -399,13 +399,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodName(sal_uInt16 index) const {
+ OUString getMethodName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -417,13 +417,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const {
+ OUString getMethodReturnTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodReturnTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -468,7 +468,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodParameterName(
+ OUString getMethodParameterName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = 0;
@@ -477,7 +477,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -493,7 +493,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodParameterTypeName(
+ OUString getMethodParameterTypeName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = 0;
@@ -502,7 +502,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -529,7 +529,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodExceptionTypeName(
+ OUString getMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const
{
rtl_uString * s = 0;
@@ -538,7 +538,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -561,13 +561,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getReferenceDocumentation(sal_uInt16 index) const {
+ OUString getReferenceDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getReferenceDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -604,13 +604,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getReferenceTypeName(sal_uInt16 index) const {
+ OUString getReferenceTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getReferenceTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
private:
diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx
index 9627be639fad..a3e6378f8443 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/registry/inc/registry/reflread.hxx
@@ -151,11 +151,11 @@ public:
/** returns the full qualified name of the type.
*/
- inline ::rtl::OUString getTypeName() const;
+ inline OUString getTypeName() const;
/** returns the full qualified name of the supertype.
*/
- inline ::rtl::OUString getSuperTypeName() const;
+ inline OUString getSuperTypeName() const;
/** @deprecated
returns the unique identifier for an interface type as an out parameter.
@@ -168,11 +168,11 @@ public:
/** returns the documentation string of this type.
*/
- inline ::rtl::OUString getDoku() const;
+ inline OUString getDoku() const;
/** returns the IDL filename where the type is defined.
*/
- inline ::rtl::OUString getFileName() const;
+ inline OUString getFileName() const;
/** returns the number of fields (attributes/properties, enum values or number
of constants in a module).
@@ -182,11 +182,11 @@ public:
/** returns the name of the field specified by index.
*/
- inline ::rtl::OUString getFieldName( sal_uInt16 index ) const;
+ inline OUString getFieldName( sal_uInt16 index ) const;
/** returns the full qualified name of the field specified by index.
*/
- inline ::rtl::OUString getFieldType( sal_uInt16 index ) const;
+ inline OUString getFieldType( sal_uInt16 index ) const;
/** returns the access mode of the field specified by index.
*/
@@ -202,14 +202,14 @@ public:
Each field of a type can have their own documentation.
*/
- inline ::rtl::OUString getFieldDoku( sal_uInt16 index ) const;
+ inline OUString getFieldDoku( sal_uInt16 index ) const;
/** returns the IDL filename of the field specified by index.
The IDL filename of a field can differ from the filename of the ype itself
because modules and also constants can be defined in different IDL files.
*/
- inline ::rtl::OUString getFieldFileName( sal_uInt16 index ) const;
+ inline OUString getFieldFileName( sal_uInt16 index ) const;
/** returns the number of methods of an interface type.
*/
@@ -217,7 +217,7 @@ public:
/** returns the name of the method specified by index.
*/
- inline ::rtl::OUString getMethodName( sal_uInt16 index ) const;
+ inline OUString getMethodName( sal_uInt16 index ) const;
/** returns number of parameters of the method specified by index.
*/
@@ -228,14 +228,14 @@ public:
@param index indicates the method
@param paramIndex indeciates the parameter which type will be returned.
*/
- inline ::rtl::OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+ inline OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
/** returns the name of a parameter.
@param index indicates the method
@param paramIndex indiciates the parameter which name will be returned.
*/
- inline ::rtl::OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+ inline OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
/** returns the parameter mode, if it is an in, out or inout parameter.
@@ -255,11 +255,11 @@ public:
@param index indicates the method
@param excIndex indeciates the exception which typename will be returned.
*/
- inline ::rtl::OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
+ inline OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
/** returns the full qualified return type of the method specified by index.
*/
- inline ::rtl::OUString getMethodReturnType( sal_uInt16 index ) const;
+ inline OUString getMethodReturnType( sal_uInt16 index ) const;
/** returns the full qualified exception type of the specified exception.
@@ -271,7 +271,7 @@ public:
@param index indicates the method.
*/
- inline ::rtl::OUString getMethodDoku( sal_uInt16 index ) const;
+ inline OUString getMethodDoku( sal_uInt16 index ) const;
/** returns the number of references (supported interfaces, exported services).
*/
@@ -281,7 +281,7 @@ public:
@param index indicates the reference.
*/
- inline ::rtl::OUString getReferenceName( sal_uInt16 index ) const;
+ inline OUString getReferenceName( sal_uInt16 index ) const;
/** returns the type of the reference specified by index.
@@ -293,7 +293,7 @@ public:
@param index indicates the reference.
*/
- inline ::rtl::OUString getReferenceDoku( sal_uInt16 index ) const;
+ inline OUString getReferenceDoku( sal_uInt16 index ) const;
/** returns the access mode of the reference specified by index.
@@ -356,16 +356,16 @@ inline sal_uInt16 RegistryTypeReader::getMajorVersion() const
inline RTTypeClass RegistryTypeReader::getTypeClass() const
{ return m_pApi->getTypeClass(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getTypeName() const
+inline OUString RegistryTypeReader::getTypeName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getTypeName(m_hImpl, &sRet.pData);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getSuperTypeName() const
+inline OUString RegistryTypeReader::getSuperTypeName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getSuperTypeName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -373,16 +373,16 @@ inline ::rtl::OUString RegistryTypeReader::getSuperTypeName() const
inline void RegistryTypeReader::getUik(RTUik& uik) const
{ m_pApi->getUik(m_hImpl, &uik); }
-inline ::rtl::OUString RegistryTypeReader::getDoku() const
+inline OUString RegistryTypeReader::getDoku() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getDoku(m_hImpl, &sRet.pData);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getFileName() const
+inline OUString RegistryTypeReader::getFileName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFileName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -390,16 +390,16 @@ inline ::rtl::OUString RegistryTypeReader::getFileName() const
inline sal_uInt32 RegistryTypeReader::getFieldCount() const
{ return m_pApi->getFieldCount(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldName(m_hImpl, &sRet.pData, index);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldType(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -414,16 +414,16 @@ inline RTConstValue RegistryTypeReader::getFieldConstValue( sal_uInt16 index ) c
return ret;
}
-inline ::rtl::OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldFileName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -431,9 +431,9 @@ inline ::rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index )
inline sal_uInt32 RegistryTypeReader::getMethodCount() const
{ return m_pApi->getMethodCount(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -441,16 +441,16 @@ inline ::rtl::OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) con
inline sal_uInt32 RegistryTypeReader::getMethodParamCount( sal_uInt16 index ) const
{ return m_pApi->getMethodParamCount(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
+inline OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodParamType(m_hImpl, &sRet.pData, index, paramIndex);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
+inline OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodParamName(m_hImpl, &sRet.pData, index, paramIndex);
return sRet;
}
@@ -461,16 +461,16 @@ inline RTParamMode RegistryTypeReader::getMethodParamMode( sal_uInt16 index, sal
inline sal_uInt32 RegistryTypeReader::getMethodExcCount( sal_uInt16 index ) const
{ return m_pApi->getMethodExcCount(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
+inline OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodExcType(m_hImpl, &sRet.pData, index, excIndex);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodReturnType(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -478,9 +478,9 @@ inline ::rtl::OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index
inline RTMethodMode RegistryTypeReader::getMethodMode( sal_uInt16 index ) const
{ return m_pApi->getMethodMode(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -488,9 +488,9 @@ inline ::rtl::OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) con
inline sal_uInt32 RegistryTypeReader::getReferenceCount() const
{ return m_pApi->getReferenceCount(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getReferenceName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -498,9 +498,9 @@ inline ::rtl::OUString RegistryTypeReader::getReferenceName( sal_uInt16 index )
inline RTReferenceType RegistryTypeReader::getReferenceType( sal_uInt16 index ) const
{ return m_pApi->getReferenceType(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getReferenceDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index ae96ac6720d7..3da3d7d21590 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -94,8 +94,8 @@ public:
exported services ...)
*/
inline RegistryTypeWriter(RTTypeClass RTTypeClass,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& superTypeName,
+ const OUString& typeName,
+ const OUString& superTypeName,
sal_uInt16 fieldCount,
sal_uInt16 methodCount,
sal_uInt16 referenceCount);
@@ -126,11 +126,11 @@ public:
This documentation should be the same as the documentation which is provided
for this type in IDL.
*/
- inline void setDoku(const ::rtl::OUString& doku);
+ inline void setDoku(const OUString& doku);
/** sets the IDL filename where this type is defined.
*/
- inline void setFileName(const ::rtl::OUString& fileName);
+ inline void setFileName(const OUString& fileName);
/** sets the data for a field member of a type blob.
@@ -144,10 +144,10 @@ public:
for enum values or constants.
*/
inline void setFieldData( sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& doku,
- const ::rtl::OUString& fileName,
+ const OUString& name,
+ const OUString& typeName,
+ const OUString& doku,
+ const OUString& fileName,
RTFieldAccess access,
RTConstValue constValue = RTConstValue());
@@ -162,12 +162,12 @@ public:
@param doku specifies the documentation string of the field.
*/
inline void setMethodData(sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& returnTypeName,
+ const OUString& name,
+ const OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
- const ::rtl::OUString& doku);
+ const OUString& doku);
/** sets the data for the specified parameter of a method.
@@ -179,8 +179,8 @@ public:
*/
inline void setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
- const ::rtl::OUString& type,
- const ::rtl::OUString& name,
+ const OUString& type,
+ const OUString& name,
RTParamMode mode);
/** sets the data for the specified exception of a mehtod.
@@ -191,7 +191,7 @@ public:
*/
inline void setExcData(sal_uInt16 index,
sal_uInt16 excIndex,
- const ::rtl::OUString& type);
+ const OUString& type);
/** returns a pointer to the new type blob.
@@ -213,9 +213,9 @@ public:
@param access specifies the access mode of the reference.
*/
inline void setReferenceData( sal_uInt16 index,
- const ::rtl::OUString& name,
+ const OUString& name,
RTReferenceType refType,
- const ::rtl::OUString& doku,
+ const OUString& doku,
RTFieldAccess access = RT_ACCESS_INVALID);
protected:
@@ -229,8 +229,8 @@ protected:
inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass RTTypeClass,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& superTypeName,
+ const OUString& typeName,
+ const OUString& superTypeName,
sal_uInt16 fieldCount,
sal_uInt16 methodCount,
sal_uInt16 referenceCount)
@@ -271,10 +271,10 @@ inline RegistryTypeWriter& RegistryTypeWriter::operator == (const RegistryTypeWr
}
inline void RegistryTypeWriter::setFieldData( sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& doku,
- const ::rtl::OUString& fileName,
+ const OUString& name,
+ const OUString& typeName,
+ const OUString& doku,
+ const OUString& fileName,
RTFieldAccess access,
RTConstValue constValue)
{
@@ -283,12 +283,12 @@ inline void RegistryTypeWriter::setFieldData( sal_uInt16 index,
inline void RegistryTypeWriter::setMethodData(sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& returnTypeName,
+ const OUString& name,
+ const OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
- const ::rtl::OUString& doku)
+ const OUString& doku)
{
m_pApi->setMethodData(m_hImpl, index, name.pData, returnTypeName.pData, mode, paramCount, excCount, doku.pData);
}
@@ -299,20 +299,20 @@ inline void RegistryTypeWriter::setUik(const RTUik& uik)
m_pApi->setUik(m_hImpl, &uik);
}
-inline void RegistryTypeWriter::setDoku(const ::rtl::OUString& doku)
+inline void RegistryTypeWriter::setDoku(const OUString& doku)
{
m_pApi->setDoku(m_hImpl, doku.pData);
}
-inline void RegistryTypeWriter::setFileName(const ::rtl::OUString& doku)
+inline void RegistryTypeWriter::setFileName(const OUString& doku)
{
m_pApi->setFileName(m_hImpl, doku.pData);
}
inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
- const ::rtl::OUString& type,
- const ::rtl::OUString& name,
+ const OUString& type,
+ const OUString& name,
RTParamMode mode)
{
m_pApi->setParamData(m_hImpl, index, paramIndex, type.pData, name.pData, mode);
@@ -320,7 +320,7 @@ inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
inline void RegistryTypeWriter::setExcData(sal_uInt16 index,
sal_uInt16 excIndex,
- const ::rtl::OUString& type)
+ const OUString& type)
{
m_pApi->setExcData(m_hImpl, index, excIndex, type.pData);
}
@@ -337,9 +337,9 @@ inline sal_uInt32 RegistryTypeWriter::getBlopSize()
inline void RegistryTypeWriter::setReferenceData( sal_uInt16 index,
- const ::rtl::OUString& name,
+ const OUString& name,
RTReferenceType refType,
- const ::rtl::OUString& doku,
+ const OUString& doku,
RTFieldAccess access)
{
m_pApi->setReferenceData(m_hImpl, index, name.pData, refType, doku.pData, access);
diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx
index 239a916cc3c4..d165c594adff 100644
--- a/registry/inc/registry/registry.hxx
+++ b/registry/inc/registry/registry.hxx
@@ -126,14 +126,14 @@ public:
inline RegError openRootKey(RegistryKey& rRootKey);
/// returns the name of the current registry data file.
- inline ::rtl::OUString getName();
+ inline OUString getName();
/** creates a new registry with the specified name and creates a root key.
@param registryName specifies the name of the new registry.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError create(const ::rtl::OUString& registryName);
+ inline RegError create(const OUString& registryName);
/** opens a registry with the specified name.
@@ -142,7 +142,7 @@ public:
@param accessMode specifies the access mode for the registry, REG_READONLY or REG_READWRITE.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError open(const ::rtl::OUString& registryName,
+ inline RegError open(const OUString& registryName,
RegAccessMode accessMode);
/// closes explicitly the current registry data file.
@@ -154,7 +154,7 @@ public:
itselfs will be destroyed.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError destroy(const ::rtl::OUString& registryName);
+ inline RegError destroy(const OUString& registryName);
/** loads registry information from a specified file and save it under the
specified keyName.
@@ -168,8 +168,8 @@ public:
@return REG_NO_ERROR if succeeds else an error code.
*/
inline RegError loadKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName);
+ const OUString& keyName,
+ const OUString& regFileName);
/** saves the registry information of the specified key and all subkeys and save
it in the specified file.
@@ -183,8 +183,8 @@ public:
@return REG_NO_ERROR if succeeds else an error code.
*/
inline RegError saveKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName);
+ const OUString& keyName,
+ const OUString& regFileName);
/** merges the registry information of the specified key with the registry
information of the specified file.
@@ -202,8 +202,8 @@ public:
restore the state before merging.
*/
inline RegError mergeKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName,
+ const OUString& keyName,
+ const OUString& regFileName,
sal_Bool bWarnings = sal_False,
sal_Bool bReport = sal_False);
@@ -287,7 +287,7 @@ public:
inline ~RegistryKeyNames();
/// returns the name of the key sepecified by index.
- inline ::rtl::OUString getElement(sal_uInt32 index);
+ inline OUString getElement(sal_uInt32 index);
/// returns the length of the array.
inline sal_uInt32 getLength();
@@ -417,7 +417,7 @@ public:
inline sal_Bool isReadOnly() const;
/// returns the full qualified name of the key beginning with the rootkey.
- inline ::rtl::OUString getName();
+ inline OUString getName();
/** creates a new key or opens a key if the specified key already exists.
@@ -426,7 +426,7 @@ public:
@param rNewKey references a RegistryKey which will be filled with the new or open key.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError createKey(const ::rtl::OUString& keyName,
+ inline RegError createKey(const OUString& keyName,
RegistryKey& rNewKey);
/** opens the specified key.
@@ -436,7 +436,7 @@ public:
@param rOpenKey references a RegistryKey which will be filled with the open key.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError openKey(const ::rtl::OUString& keyName,
+ inline RegError openKey(const OUString& keyName,
RegistryKey& rOpenKey);
/** opens all subkeys of the specified key.
@@ -446,7 +446,7 @@ public:
@param rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError openSubKeys(const ::rtl::OUString& keyName,
+ inline RegError openSubKeys(const OUString& keyName,
RegistryKeyArray& rSubKeys);
/** returns an array with the names of all subkeys of the specified key.
@@ -456,7 +456,7 @@ public:
@param rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyNames(const ::rtl::OUString& keyName,
+ inline RegError getKeyNames(const OUString& keyName,
RegistryKeyNames& rSubKeyNames);
/** closes all keys specified in the array.
@@ -471,7 +471,7 @@ public:
@param keyName specifies the name of the key which will be deleted.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError deleteKey(const ::rtl::OUString& keyName);
+ inline RegError deleteKey(const OUString& keyName);
/// closes explicitly the current key
inline RegError closeKey();
@@ -489,7 +489,7 @@ public:
@param valueSize specifies the size of pData in bytes
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setValue(const ::rtl::OUString& keyName,
+ inline RegError setValue(const OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize);
@@ -503,7 +503,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setLongListValue(const ::rtl::OUString& keyName,
+ inline RegError setLongListValue(const OUString& keyName,
sal_Int32* pValueList,
sal_uInt32 len);
@@ -516,7 +516,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setStringListValue(const ::rtl::OUString& keyName,
+ inline RegError setStringListValue(const OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len);
@@ -529,7 +529,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setUnicodeListValue(const ::rtl::OUString& keyName,
+ inline RegError setUnicodeListValue(const OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len);
@@ -542,7 +542,7 @@ public:
@param pValueSize returns the size of the value in bytes or the length of a list value.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getValueInfo(const ::rtl::OUString& keyName,
+ inline RegError getValueInfo(const OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize);
@@ -554,7 +554,7 @@ public:
@param pValue points to an allocated memory block receiving the data of the value.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getValue(const ::rtl::OUString& keyName,
+ inline RegError getValue(const OUString& keyName,
RegValue pValue);
/** gets a long list value of a key.
@@ -565,7 +565,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the long values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getLongListValue(const ::rtl::OUString& keyName,
+ inline RegError getLongListValue(const OUString& keyName,
RegistryValueList<sal_Int32>& rValueList);
/** gets an ascii list value of a key.
@@ -576,7 +576,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the ascii values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getStringListValue(const ::rtl::OUString& keyName,
+ inline RegError getStringListValue(const OUString& keyName,
RegistryValueList<sal_Char*>& rValueList);
/** gets a unicode value of a key.
@@ -587,7 +587,7 @@ public:
@param rValueList reference a RegistryValueList which will be filled with the unicode values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getUnicodeListValue(const ::rtl::OUString& keyName,
+ inline RegError getUnicodeListValue(const OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList);
/** used to create a link.
@@ -596,8 +596,8 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError createLink(const ::rtl::OUString& linkName,
- const ::rtl::OUString& linkTarget);
+ inline RegError createLink(const OUString& linkName,
+ const OUString& linkTarget);
/** used to delete a link.
@@ -605,7 +605,7 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError deleteLink(const ::rtl::OUString& linkName);
+ inline RegError deleteLink(const OUString& linkName);
/** returns the type of the specified key.
@@ -613,7 +613,7 @@ public:
@param pKeyType returns the type of the key (always RG_KEYTYPE).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyType(const ::rtl::OUString& name,
+ inline RegError getKeyType(const OUString& name,
RegKeyType* pKeyType) const;
/** used to return the target of a link.
@@ -622,8 +622,8 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError getLinkTarget(const ::rtl::OUString& linkName,
- ::rtl::OUString& rLinkTarget) const;
+ inline RegError getLinkTarget(const OUString& linkName,
+ OUString& rLinkTarget) const;
/** resolves a keyname.
@@ -633,12 +633,12 @@ public:
@param[out] rResolvedName the resolved name.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getResolvedKeyName(const ::rtl::OUString& keyName,
+ inline RegError getResolvedKeyName(const OUString& keyName,
sal_Bool firstLinkOnly,
- ::rtl::OUString& rResolvedName) const;
+ OUString& rResolvedName) const;
/// returns the name of the registry in which the key is defined.
- inline ::rtl::OUString getRegistryName();
+ inline OUString getRegistryName();
/// returns the registry in which the key is defined.
Registry getRegistry() const { return m_registry; }
@@ -736,13 +736,13 @@ inline RegistryKeyNames::~RegistryKeyNames()
m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
}
-inline ::rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index)
+inline OUString RegistryKeyNames::getElement(sal_uInt32 index)
{
if (m_pKeyNames && index < m_length)
return m_pKeyNames[index];
else
- return ::rtl::OUString();
+ return OUString();
}
inline sal_uInt32 RegistryKeyNames::getLength()
@@ -834,15 +834,15 @@ inline sal_Bool RegistryKey::isReadOnly() const
return sal_False;
}
-inline ::rtl::OUString RegistryKey::getName()
+inline OUString RegistryKey::getName()
{
- ::rtl::OUString sRet;
+ OUString sRet;
if (m_registry.isValid())
m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError RegistryKey::createKey(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::createKey(const OUString& keyName,
RegistryKey& rNewKey)
{
if (rNewKey.isValid()) rNewKey.closeKey();
@@ -855,7 +855,7 @@ inline RegError RegistryKey::createKey(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::openKey(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::openKey(const OUString& keyName,
RegistryKey& rOpenKey)
{
if (rOpenKey.isValid()) rOpenKey.closeKey();
@@ -869,7 +869,7 @@ inline RegError RegistryKey::openKey(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::openSubKeys(const OUString& keyName,
RegistryKeyArray& rSubKeys)
{
if (m_registry.isValid())
@@ -891,7 +891,7 @@ inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyNames(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getKeyNames(const OUString& keyName,
RegistryKeyNames& rSubKeyNames)
{
if (m_registry.isValid())
@@ -921,7 +921,7 @@ inline RegError RegistryKey::closeSubKeys(RegistryKeyArray& rSubKeys)
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::deleteKey(const ::rtl::OUString& keyName)
+inline RegError RegistryKey::deleteKey(const OUString& keyName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData);
@@ -952,7 +952,7 @@ inline void RegistryKey::releaseKey()
}
}
-inline RegError RegistryKey::setValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setValue(const OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize)
@@ -964,7 +964,7 @@ inline RegError RegistryKey::setValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setLongListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setLongListValue(const OUString& keyName,
sal_Int32* pValueList,
sal_uInt32 len)
{
@@ -975,7 +975,7 @@ inline RegError RegistryKey::setLongListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setStringListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setStringListValue(const OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len)
{
@@ -986,7 +986,7 @@ inline RegError RegistryKey::setStringListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setUnicodeListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len)
{
@@ -997,7 +997,7 @@ inline RegError RegistryKey::setUnicodeListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getValueInfo(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getValueInfo(const OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize)
{
@@ -1007,7 +1007,7 @@ inline RegError RegistryKey::getValueInfo(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getValue(const OUString& keyName,
RegValue pValue)
{
if (m_registry.isValid())
@@ -1016,7 +1016,7 @@ inline RegError RegistryKey::getValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getLongListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getLongListValue(const OUString& keyName,
RegistryValueList<sal_Int32>& rValueList)
{
if (m_registry.isValid())
@@ -1039,7 +1039,7 @@ inline RegError RegistryKey::getLongListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getStringListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getStringListValue(const OUString& keyName,
RegistryValueList<sal_Char*>& rValueList)
{
if (m_registry.isValid())
@@ -1062,7 +1062,7 @@ inline RegError RegistryKey::getStringListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList)
{
if (m_registry.isValid())
@@ -1085,8 +1085,8 @@ inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::createLink(const ::rtl::OUString& linkName,
- const ::rtl::OUString& linkTarget)
+inline RegError RegistryKey::createLink(const OUString& linkName,
+ const OUString& linkTarget)
{
if (m_registry.isValid())
return m_registry.m_pApi->createLink(m_hImpl, linkName.pData, linkTarget.pData);
@@ -1094,7 +1094,7 @@ inline RegError RegistryKey::createLink(const ::rtl::OUString& linkName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::deleteLink(const ::rtl::OUString& linkName)
+inline RegError RegistryKey::deleteLink(const OUString& linkName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteLink(m_hImpl, linkName.pData);
@@ -1102,7 +1102,7 @@ inline RegError RegistryKey::deleteLink(const ::rtl::OUString& linkName)
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyType(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getKeyType(const OUString& keyName,
RegKeyType* pKeyType) const
{
if (m_registry.isValid())
@@ -1111,8 +1111,8 @@ inline RegError RegistryKey::getKeyType(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getLinkTarget(const ::rtl::OUString& linkName,
- ::rtl::OUString& rLinkTarget) const
+inline RegError RegistryKey::getLinkTarget(const OUString& linkName,
+ OUString& rLinkTarget) const
{
if (m_registry.isValid())
{
@@ -1124,9 +1124,9 @@ inline RegError RegistryKey::getLinkTarget(const ::rtl::OUString& linkName,
}
-inline RegError RegistryKey::getResolvedKeyName(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName,
sal_Bool firstLinkOnly,
- ::rtl::OUString& rResolvedName) const
+ OUString& rResolvedName) const
{
if (m_registry.isValid())
return m_registry.m_pApi->getResolvedKeyName(m_hImpl,
@@ -1137,13 +1137,13 @@ inline RegError RegistryKey::getResolvedKeyName(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline ::rtl::OUString RegistryKey::getRegistryName()
+inline OUString RegistryKey::getRegistryName()
{
if (m_registry.isValid())
{
return m_registry.getName();
} else
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------------------------------------
@@ -1193,21 +1193,21 @@ inline RegError Registry::openRootKey(RegistryKey& rRootKey)
return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl);
}
-inline ::rtl::OUString Registry::getName()
+inline OUString Registry::getName()
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError Registry::create(const ::rtl::OUString& registryName)
+inline RegError Registry::create(const OUString& registryName)
{
if (m_hImpl)
m_pApi->release(m_hImpl);
return m_pApi->createRegistry(registryName.pData, &m_hImpl);
}
-inline RegError Registry::open(const ::rtl::OUString& registryName,
+inline RegError Registry::open(const OUString& registryName,
RegAccessMode accessMode)
{
if (m_hImpl)
@@ -1223,7 +1223,7 @@ inline RegError Registry::close()
return ret;
}
-inline RegError Registry::destroy(const ::rtl::OUString& registryName)
+inline RegError Registry::destroy(const OUString& registryName)
{
RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData);
if ( !ret && registryName.isEmpty() )
@@ -1232,18 +1232,18 @@ inline RegError Registry::destroy(const ::rtl::OUString& registryName)
}
inline RegError Registry::loadKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName)
+ const OUString& keyName,
+ const OUString& regFileName)
{ return m_pApi->loadKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
inline RegError Registry::saveKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName)
+ const OUString& keyName,
+ const OUString& regFileName)
{ return m_pApi->saveKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
inline RegError Registry::mergeKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName,
+ const OUString& keyName,
+ const OUString& regFileName,
sal_Bool bWarnings,
sal_Bool bReport)
{ return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, bWarnings, bReport); }
diff --git a/registry/inc/registry/writer.hxx b/registry/inc/registry/writer.hxx
index 082b9853488e..cfdf479853df 100644
--- a/registry/inc/registry/writer.hxx
+++ b/registry/inc/registry/writer.hxx
@@ -70,9 +70,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
Writer(
- typereg_Version version, rtl::OUString const & documentation,
- rtl::OUString const & fileName, RTTypeClass typeClass, bool published,
- rtl::OUString const & typeName, sal_uInt16 superTypeCount,
+ typereg_Version version, OUString const & documentation,
+ OUString const & fileName, RTTypeClass typeClass, bool published,
+ OUString const & typeName, sal_uInt16 superTypeCount,
sal_uInt16 fieldCount, sal_uInt16 methodCount,
sal_uInt16 referenceCount):
m_handle(
@@ -103,7 +103,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- void setSuperTypeName(sal_uInt16 index, rtl::OUString const & typeName) {
+ void setSuperTypeName(sal_uInt16 index, OUString const & typeName) {
if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) {
throw std::bad_alloc();
}
@@ -129,9 +129,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setFieldData(
- sal_uInt16 index, rtl::OUString const & documentation,
- rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name,
- rtl::OUString const & typeName, RTConstValue const & value)
+ sal_uInt16 index, OUString const & documentation,
+ OUString const & fileName, RTFieldAccess flags, OUString const & name,
+ OUString const & typeName, RTConstValue const & value)
{
if (!typereg_writer_setFieldData(
m_handle, index, documentation.pData, fileName.pData, flags,
@@ -161,9 +161,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setMethodData(
- sal_uInt16 index, rtl::OUString const & documentation,
- RTMethodMode flags, rtl::OUString const & name,
- rtl::OUString const & returnTypeName, sal_uInt16 parameterCount,
+ sal_uInt16 index, OUString const & documentation,
+ RTMethodMode flags, OUString const & name,
+ OUString const & returnTypeName, sal_uInt16 parameterCount,
sal_uInt16 exceptionCount)
{
if (!typereg_writer_setMethodData(
@@ -193,8 +193,8 @@ public:
*/
void setMethodParameterData(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
- RTParamMode flags, rtl::OUString const & name,
- rtl::OUString const & typeName)
+ RTParamMode flags, OUString const & name,
+ OUString const & typeName)
{
if (!typereg_writer_setMethodParameterData(
m_handle, methodIndex, parameterIndex, flags, name.pData,
@@ -219,7 +219,7 @@ public:
*/
void setMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
- rtl::OUString const & typeName)
+ OUString const & typeName)
{
if (!typereg_writer_setMethodExceptionTypeName(
m_handle, methodIndex, exceptionIndex, typeName.pData))
@@ -245,9 +245,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setReferenceData(
- sal_uInt16 index, rtl::OUString const & documentation,
+ sal_uInt16 index, OUString const & documentation,
RTReferenceType sort, RTFieldAccess flags,
- rtl::OUString const & typeName)
+ OUString const & typeName)
{
if (!typereg_writer_setReferenceData(
m_handle, index, documentation.pData, sort, flags,
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 8a1234f76054..05993dd6ff87 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -26,8 +26,6 @@
#include "rtl/alloc.h"
#include "rtl/ustrbuf.hxx"
-using rtl::OUString;
-using rtl::OUStringBuffer;
using namespace store;
namespace { static char const VALUE_PREFIX[] = "$VL_"; }
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index 61fbb247d811..281872eb48da 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -28,7 +28,7 @@ class ORegKey
{
public:
- ORegKey(const rtl::OUString& keyName, ORegistry* pReg);
+ ORegKey(const OUString& keyName, ORegistry* pReg);
~ORegKey();
sal_uInt32 acquire()
@@ -39,62 +39,62 @@ public:
RegError releaseKey(RegKeyHandle hKey);
- RegError createKey(const rtl::OUString& keyName, RegKeyHandle* phNewKey);
+ RegError createKey(const OUString& keyName, RegKeyHandle* phNewKey);
- RegError openKey(const rtl::OUString& keyName, RegKeyHandle* phOpenKey);
+ RegError openKey(const OUString& keyName, RegKeyHandle* phOpenKey);
- RegError openSubKeys(const rtl::OUString& keyName,
+ RegError openSubKeys(const OUString& keyName,
RegKeyHandle** phOpenSubKeys,
sal_uInt32* pnSubKeys);
- RegError getKeyNames(const rtl::OUString& keyName,
+ RegError getKeyNames(const OUString& keyName,
rtl_uString*** pSubKeyNames,
sal_uInt32* pnSubKeys);
RegError closeKey(RegKeyHandle hKey);
- RegError deleteKey(const rtl::OUString& keyName);
+ RegError deleteKey(const OUString& keyName);
- RegError getValueInfo(const rtl::OUString& valueName,
+ RegError getValueInfo(const OUString& valueName,
RegValueType* pValueTye,
sal_uInt32* pValueSize) const;
- RegError setValue(const rtl::OUString& valueName,
+ RegError setValue(const OUString& valueName,
RegValueType vType,
RegValue value,
sal_uInt32 vSize);
- RegError setLongListValue(const rtl::OUString& valueName,
+ RegError setLongListValue(const OUString& valueName,
sal_Int32* pValueList,
sal_uInt32 len);
- RegError setStringListValue(const rtl::OUString& valueName,
+ RegError setStringListValue(const OUString& valueName,
sal_Char** pValueList,
sal_uInt32 len);
- RegError setUnicodeListValue(const rtl::OUString& valueName,
+ RegError setUnicodeListValue(const OUString& valueName,
sal_Unicode** pValueList,
sal_uInt32 len);
- RegError getValue(const rtl::OUString& valueName, RegValue value) const;
+ RegError getValue(const OUString& valueName, RegValue value) const;
- RegError getLongListValue(const rtl::OUString& valueName,
+ RegError getLongListValue(const OUString& valueName,
sal_Int32** pValueList,
sal_uInt32* pLen) const;
- RegError getStringListValue(const rtl::OUString& valueName,
+ RegError getStringListValue(const OUString& valueName,
sal_Char*** pValueList,
sal_uInt32* pLen) const;
- RegError getUnicodeListValue(const rtl::OUString& valueName,
+ RegError getUnicodeListValue(const OUString& valueName,
sal_Unicode*** pValueList,
sal_uInt32* pLen) const;
- RegError getKeyType(const rtl::OUString& name,
+ RegError getKeyType(const OUString& name,
RegKeyType* pKeyType) const;
- RegError getResolvedKeyName(const rtl::OUString& keyName,
- rtl::OUString& resolvedName);
+ RegError getResolvedKeyName(const OUString& keyName,
+ OUString& resolvedName);
bool isDeleted() const
{ return m_bDeleted != 0; }
@@ -121,17 +121,17 @@ public:
store::OStoreDirectory getStoreDir();
- const rtl::OUString& getName() const
+ const OUString& getName() const
{ return m_name; }
sal_uInt32 getRefCount() const
{ return m_refCount; }
- rtl::OUString getFullPath(rtl::OUString const & path) const;
+ OUString getFullPath(OUString const & path) const;
private:
sal_uInt32 m_refCount;
- rtl::OUString m_name;
+ OUString m_name;
int m_bDeleted:1;
int m_bModified:1;
ORegistry* m_pRegistry;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 7e3242de6cd9..23b065d5614e 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -32,13 +32,12 @@
#include "reflcnst.hxx"
-using ::rtl::OString;
namespace {
-inline rtl::OString toByteString(rtl_uString const * str) {
- return rtl::OString(
+inline OString toByteString(rtl_uString const * str) {
+ return OString(
str->buffer, str->length, RTL_TEXTENCODING_UTF8,
OUSTRING_TO_OSTRING_CVTFLAGS);
}
@@ -662,8 +661,8 @@ public:
sal_uInt32 m_blopSize;
TypeWriter(typereg_Version version,
- rtl::OString const & documentation,
- rtl::OString const & fileName,
+ OString const & documentation,
+ OString const & fileName,
RTTypeClass RTTypeClass,
bool published,
const OString& typeName,
@@ -680,8 +679,8 @@ public:
};
TypeWriter::TypeWriter(typereg_Version version,
- rtl::OString const & documentation,
- rtl::OString const & fileName,
+ OString const & documentation,
+ OString const & fileName,
RTTypeClass RTTypeClass,
bool published,
const OString& typeName,
@@ -1416,7 +1415,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
RTTypeClass typeClass, rtl_uString * typeName, rtl_uString * superTypeName,
sal_uInt16 fieldCount, sal_uInt16 methodCount, sal_uInt16 referenceCount)
{
- rtl::OUString empty;
+ OUString empty;
sal_uInt16 superTypeCount = rtl_uString_getLength(superTypeName) == 0
? 0 : 1;
TypeWriterImpl t = typereg_writer_create(
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 998f2372ff07..30249d44b372 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -52,14 +52,10 @@
using namespace osl;
using namespace store;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
namespace {
-void printString(rtl::OUString const & s) {
+void printString(OUString const & s) {
printf("\"");
for (sal_Int32 i = 0; i < s.getLength(); ++i) {
sal_Unicode c = s[i];
@@ -129,7 +125,7 @@ void printFieldOrReferenceFlags(RTFieldAccess flags) {
}
}
-void dumpType(typereg::Reader const & reader, rtl::OString const & indent) {
+void dumpType(typereg::Reader const & reader, OString const & indent) {
if (reader.isValid()) {
printf("version: %ld\n", static_cast< long >(reader.getVersion()));
printf("%sdocumentation: ", indent.getStr());
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 20d777905dd7..deeae444311f 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -67,35 +67,35 @@ public:
sal_uInt32 release()
{ return --m_refCount; }
- RegError initRegistry(const rtl::OUString& name,
+ RegError initRegistry(const OUString& name,
RegAccessMode accessMode);
RegError closeRegistry();
- RegError destroyRegistry(const rtl::OUString& name);
+ RegError destroyRegistry(const OUString& name);
RegError acquireKey(RegKeyHandle hKey);
RegError releaseKey(RegKeyHandle hKey);
RegError createKey(RegKeyHandle hKey,
- const rtl::OUString& keyName,
+ const OUString& keyName,
RegKeyHandle* phNewKey);
RegError openKey(RegKeyHandle hKey,
- const rtl::OUString& keyName,
+ const OUString& keyName,
RegKeyHandle* phOpenKey);
RegError closeKey(RegKeyHandle hKey);
- RegError deleteKey(RegKeyHandle hKey, const rtl::OUString& keyName);
+ RegError deleteKey(RegKeyHandle hKey, const OUString& keyName);
RegError loadKey(RegKeyHandle hKey,
- const rtl::OUString& regFileName,
+ const OUString& regFileName,
sal_Bool bWarings=sal_False,
sal_Bool bReport=sal_False);
RegError saveKey(RegKeyHandle hKey,
- const rtl::OUString& regFileName,
+ const OUString& regFileName,
sal_Bool bWarings=sal_False,
sal_Bool bReport=sal_False);
@@ -114,25 +114,25 @@ public:
const store::OStoreFile& getStoreFile() const
{ return m_file; }
- const rtl::OUString& getName() const
+ const OUString& getName() const
{ return m_name; }
friend class ORegKey;
private:
- RegError eraseKey(ORegKey* pKey, const rtl::OUString& keyName);
+ RegError eraseKey(ORegKey* pKey, const OUString& keyName);
RegError deleteSubkeysAndValues(ORegKey* pKey);
RegError loadAndSaveValue(ORegKey* pTargetKey,
ORegKey* pSourceKey,
- const rtl::OUString& valueName,
+ const OUString& valueName,
sal_uInt32 nCut,
sal_Bool bWarnings=sal_False,
sal_Bool bReport=sal_False);
RegError checkBlop(store::OStoreStream& rValue,
- const rtl::OUString& sTargetPath,
+ const OUString& sTargetPath,
sal_uInt32 srcValueSize,
sal_uInt8* pSrcBuffer,
sal_Bool bReport=sal_False);
@@ -143,30 +143,30 @@ private:
RegError loadAndSaveKeys(ORegKey* pTargetKey,
ORegKey* pSourceKey,
- const rtl::OUString& keyName,
+ const OUString& keyName,
sal_uInt32 nCut,
sal_Bool bWarnings=sal_False,
sal_Bool bReport=sal_False);
- RegError dumpValue(const rtl::OUString& sPath,
- const rtl::OUString& sName,
+ RegError dumpValue(const OUString& sPath,
+ const OUString& sName,
sal_Int16 nSpace) const;
- RegError dumpKey(const rtl::OUString& sPath,
- const rtl::OUString& sName,
+ RegError dumpKey(const OUString& sPath,
+ const OUString& sName,
sal_Int16 nSpace) const;
- typedef boost::unordered_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap;
+ typedef boost::unordered_map< OUString, ORegKey*, OUStringHash > KeyMap;
sal_uInt32 m_refCount;
osl::Mutex m_mutex;
bool m_readOnly;
bool m_isOpen;
- rtl::OUString m_name;
+ OUString m_name;
store::OStoreFile m_file;
KeyMap m_openKeyTable;
- const rtl::OUString ROOT;
+ const OUString ROOT;
};
#endif
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 726f00d8c7bc..2e0d93c77303 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -25,7 +25,6 @@
#include "regimpl.hxx"
#include "keyimpl.hxx"
-using rtl::OUString;
//*********************************************************************
// acquireKey
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 7d1c9e5aa99e..f1b063c0d4e7 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -32,7 +32,6 @@
using namespace std;
-using ::rtl::OUString;
sal_Int32 lValue1 = 123456789;
sal_Int32 lValue2 = 54321;
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 59b51c9379a9..87b06d04ce93 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -31,9 +31,6 @@
using namespace std;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
void test_coreReflection()
{
diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx
index e70941113889..2813ef36b5c8 100644
--- a/registry/tools/fileurl.cxx
+++ b/registry/tools/fileurl.cxx
@@ -33,7 +33,6 @@
#define SEPARATOR '\\'
#endif
-using rtl::OUString;
using osl::FileBase;
namespace registry
diff --git a/registry/tools/fileurl.hxx b/registry/tools/fileurl.hxx
index 9a28314800c7..cec372468bbc 100644
--- a/registry/tools/fileurl.hxx
+++ b/registry/tools/fileurl.hxx
@@ -27,7 +27,7 @@ namespace registry
namespace tools
{
-rtl::OUString convertToFileUrl(char const * filename, size_t length);
+OUString convertToFileUrl(char const * filename, size_t length);
} // namespace tools
} // namespace registry
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 49ba6cd6b87c..4aac38d4a5c3 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -37,7 +37,7 @@
using namespace rtl;
using namespace registry::tools;
-typedef std::set< rtl::OUString > StringSet;
+typedef std::set< OUString > StringSet;
class Options_Impl : public Options
{
@@ -80,12 +80,12 @@ protected:
#define U2S( s ) OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()
-inline rtl::OUString makeOUString (std::string const & s)
+inline OUString makeOUString (std::string const & s)
{
- return rtl::OUString(s.c_str(), s.size(), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
+ return OUString(s.c_str(), s.size(), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
}
-inline rtl::OUString shortName(rtl::OUString const & fullName)
+inline OUString shortName(OUString const & fullName)
{
return fullName.copy(fullName.lastIndexOf('/') + 1);
}
@@ -441,7 +441,7 @@ static void printConstValue(RTConstValue& constValue)
case RT_TYPE_STRING:
fprintf(
stdout, "%s",
- (rtl::OUStringToOString(
+ (OUStringToOString(
constValue.m_value.aString, RTL_TEXTENCODING_UTF8).
getStr()));
break;
@@ -553,11 +553,11 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
fprintf(
stdout, " Field %d: Value1 = %s != Value2 = %s\n",
index1,
- rtl::OUStringToOString(
- rtl::OUString::valueOf(constValue1.m_value.aHyper),
+ OUStringToOString(
+ OUString::valueOf(constValue1.m_value.aHyper),
RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(
- rtl::OUString::valueOf(constValue2.m_value.aHyper),
+ OUStringToOString(
+ OUString::valueOf(constValue2.m_value.aHyper),
RTL_TEXTENCODING_ASCII_US).getStr());
}
return 1;
@@ -572,13 +572,13 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
fprintf(
stdout, " Field %d: Value1 = %s != Value2 = %s\n",
index1,
- rtl::OUStringToOString(
- rtl::OUString::valueOf(
+ OUStringToOString(
+ OUString::valueOf(
static_cast< sal_Int64 >(
constValue1.m_value.aUHyper)),
RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(
- rtl::OUString::valueOf(
+ OUStringToOString(
+ OUString::valueOf(
static_cast< sal_Int64 >(
constValue2.m_value.aUHyper)),
RTL_TEXTENCODING_ASCII_US).getStr());
@@ -1644,10 +1644,10 @@ static sal_uInt32 checkValueDifference(
static bool hasPublishedChildren(Options_Impl const & options, RegistryKey & key)
{
RegistryKeyNames subKeyNames;
- key.getKeyNames(rtl::OUString(), subKeyNames);
+ key.getKeyNames(OUString(), subKeyNames);
for (sal_uInt32 i = 0; i < subKeyNames.getLength(); ++i)
{
- rtl::OUString keyName(subKeyNames.getElement(i));
+ OUString keyName(subKeyNames.getElement(i));
if (!options.matchedWithExcludeKey(keyName))
{
keyName = keyName.copy(keyName.lastIndexOf('/') + 1);
@@ -1668,7 +1668,7 @@ static bool hasPublishedChildren(Options_Impl const & options, RegistryKey & key
{
RegValueType type;
sal_uInt32 size;
- if (subKey.getValueInfo(rtl::OUString(), &type, &size) != REG_NO_ERROR)
+ if (subKey.getValueInfo(OUString(), &type, &size) != REG_NO_ERROR)
{
if (options.forceOutput())
{
@@ -1684,7 +1684,7 @@ static bool hasPublishedChildren(Options_Impl const & options, RegistryKey & key
{
bool published = false;
std::vector< sal_uInt8 > value(size);
- if (subKey.getValue(rtl::OUString(), &value[0]) != REG_NO_ERROR)
+ if (subKey.getValue(OUString(), &value[0]) != REG_NO_ERROR)
{
if (options.forceOutput())
{
@@ -1747,7 +1747,7 @@ static sal_uInt32 checkDifferences(
}
else
{
- rtl::OUString keyName(subKeyNames1.getElement(i));
+ OUString keyName(subKeyNames1.getElement(i));
if (!options.matchedWithExcludeKey(keyName))
{
keyName = keyName.copy(keyName.lastIndexOf('/') + 1);
@@ -1769,7 +1769,7 @@ static sal_uInt32 checkDifferences(
{
RegValueType type;
sal_uInt32 size;
- if (subKey.getValueInfo(rtl::OUString(), &type, &size) != REG_NO_ERROR)
+ if (subKey.getValueInfo(OUString(), &type, &size) != REG_NO_ERROR)
{
if (options.forceOutput())
{
@@ -1785,7 +1785,7 @@ static sal_uInt32 checkDifferences(
else if (type == RG_VALUETYPE_BINARY)
{
std::vector< sal_uInt8 > value(size);
- if (subKey.getValue(rtl::OUString(), &value[0]) != REG_NO_ERROR)
+ if (subKey.getValue(OUString(), &value[0]) != REG_NO_ERROR)
{
if (options.forceOutput())
{
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 6b2c19f0f73f..bdd72b22bb6b 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
-using rtl::OUString;
using namespace registry::tools;
#if (defined UNX)
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index c127202779ad..a202b197cf01 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -88,8 +88,6 @@ protected:
};
#endif
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
#if (defined UNX)
int main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index 3652839b5bc3..52cf41336a00 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -27,8 +27,6 @@
using namespace std;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
#if (defined UNX)
int main()
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 973086fd7722..7a6e45318614 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -41,7 +41,6 @@ using namespace com::sun::star::connection;
using namespace com::sun::star::bridge;
using namespace com::sun::star::registry;
-using ::rtl::OUString;
#define SERVICENAME "com.sun.star.bridge.UnoUrlResolver"
#define IMPLNAME "com.sun.star.comp.bridge.UnoUrlResolver"
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index c923f1d940a9..b4842117ab97 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -99,12 +99,12 @@ namespace reportdesign
OReportDefinition(const OReportDefinition&);
OReportDefinition& operator=(const OReportDefinition&);
- void setSection( const ::rtl::OUString& _sProperty
+ void setSection( const OUString& _sProperty
,const sal_Bool& _bOn
- ,const ::rtl::OUString& _sName
+ ,const OUString& _sName
,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -145,7 +145,7 @@ namespace reportdesign
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue> & rMediaDesc);
- void notifyEvent(const ::rtl::OUString& _sEventName);
+ void notifyEvent(const OUString& _sEventName);
void init();
void fillArgs(::comphelper::MediaDescriptor& _aDescriptor);
@@ -174,8 +174,8 @@ namespace reportdesign
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory
,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape);
- 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 & xContext);
@@ -192,42 +192,42 @@ namespace reportdesign
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
// ::com::sun::star::lang::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);
// 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);
// XReportDefinition
- virtual ::rtl::OUString SAL_CALL getMimeType() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setMimeType( const ::rtl::OUString& _mimetype ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getMimeType() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) 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& _command ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setCommand( const OUString& _command ) 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 _commandtype ) 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& _filter ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setFilter( const OUString& _filter ) 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 _escapeprocessing ) 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 >& _activeconnection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- 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);
virtual ::sal_Bool SAL_CALL getReportHeaderOn() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setReportHeaderOn( ::sal_Bool _reportheaderon ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getReportFooterOn() throw (::com::sun::star::uno::RuntimeException);
@@ -243,7 +243,7 @@ namespace reportdesign
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getPageFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getReportFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster > SAL_CALL getEventBroadcaster( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableMimeTypes( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XReportComponent
REPORTCOMPONENT_HEADER()
@@ -252,7 +252,7 @@ namespace reportdesign
SHAPE_HEADER()
// XShapeDescriptor
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
//XFunctionsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException);
@@ -283,8 +283,8 @@ namespace reportdesign
virtual void SAL_CALL close( ::sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::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);
@@ -341,32 +341,32 @@ namespace reportdesign
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);
// 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();
// SvxUnoDrawMSFactory
- 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);
- ::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& 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);
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) 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);
// XModule
- virtual void SAL_CALL setIdentifier( const ::rtl::OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException);
// XNumberFormatsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats( ) 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);
@@ -376,7 +376,7 @@ namespace reportdesign
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);
// XDocumentPropertiesSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx
index a54dea39a218..afdfc9bfd707 100644
--- a/reportdesign/inc/ReportHelperDefines.hxx
+++ b/reportdesign/inc/ReportHelperDefines.hxx
@@ -20,12 +20,12 @@
#define INCLUDED_REPORTHELPERDEFINES_HXX
#define REPORTCONTROLMODEL_HEADER() \
- virtual ::rtl::OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
- virtual void SAL_CALL setDataField(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException); \
+ virtual OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
+ virtual void SAL_CALL setDataField(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException); \
virtual ::sal_Bool SAL_CALL getPrintWhenGroupChange() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
virtual void SAL_CALL setPrintWhenGroupChange(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
- virtual ::rtl::OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
- virtual void SAL_CALL setConditionalPrintExpression(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
+ virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
+ virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > SAL_CALL createFormatCondition() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception);
#define SHAPE_HEADER() \
@@ -35,8 +35,8 @@
virtual void SAL_CALL setSize(const ::com::sun::star::awt::Size & aSize) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException);
#define REPORTCOMPONENT_HEADER() \
- virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); \
- virtual void SAL_CALL setName(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); \
+ virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException); \
+ virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); \
virtual ::sal_Int32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException); \
virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException); \
virtual ::sal_Int32 SAL_CALL getPositionX() throw (::com::sun::star::uno::RuntimeException); \
@@ -51,10 +51,10 @@
virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException); \
virtual ::sal_Bool SAL_CALL getPrintRepeatedValues() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
virtual void SAL_CALL setPrintRepeatedValues(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
- virtual void SAL_CALL setMasterFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
- virtual void SAL_CALL setDetailFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
+ virtual void SAL_CALL setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
+ virtual void SAL_CALL setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getSection() throw (::com::sun::star::uno::RuntimeException);
#define REPORTCONTROLFORMAT_HEADER() \
@@ -76,10 +76,10 @@
virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Bool SAL_CALL getCharCombineIsOn() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharCombineIsOn( ::sal_Bool _charcombineison ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharCombinePrefix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharCombinePrefix( const ::rtl::OUString& _charcombineprefix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharCombineSuffix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharCombineSuffix( const ::rtl::OUString& _charcombinesuffix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharCombinePrefix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharCombineSuffix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Bool SAL_CALL getCharHidden() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharHidden( ::sal_Bool _charhidden ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Bool SAL_CALL getCharShadowed() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
@@ -102,10 +102,10 @@
virtual void SAL_CALL setCharFlash( ::sal_Bool _charflash ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharRelief() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharFontName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharFontName( const ::rtl::OUString& _charfontname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharFontStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharFontStyleName( const ::rtl::OUString& _charfontstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharFontName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharFontStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
@@ -134,24 +134,24 @@
virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::com::sun::star::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setVerticalAlign( ::com::sun::star::style::VerticalAlignment _paravertalignment ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setHyperLinkURL( const ::rtl::OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setHyperLinkTarget( const ::rtl::OUString& _hyperlinktarget ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getHyperLinkName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setHyperLinkName( const ::rtl::OUString& _hyperlinkname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getVisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setVisitedCharStyleName( const ::rtl::OUString& _visitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getUnvisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setUnvisitedCharStyleName( const ::rtl::OUString& _unvisitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getHyperLinkName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getVisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual float SAL_CALL getCharHeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual float SAL_CALL getCharWeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharFontNameAsian( const ::rtl::OUString& _charfontnameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharFontStyleNameAsian( const ::rtl::OUString& _charfontstylenameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
@@ -166,10 +166,10 @@
virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual float SAL_CALL getCharWeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharFontNameComplex( const ::rtl::OUString& _charfontnamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual ::rtl::OUString SAL_CALL getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
- virtual void SAL_CALL setCharFontStyleNameComplex( const ::rtl::OUString& _charfontstylenamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
+ virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);\
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index da1efc198b3c..f633259f631b 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -78,11 +78,11 @@ namespace ControlModification
static const ::sal_Int32 HEIGHT_GREATEST = (sal_Int32)10;
}
-class AnyConverter : public ::std::binary_function< ::rtl::OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any >
+class AnyConverter : public ::std::binary_function< OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any >
{
public:
virtual ~AnyConverter(){}
- virtual ::com::sun::star::uno::Any operator() (const ::rtl::OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const
+ virtual ::com::sun::star::uno::Any operator() (const OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const
{
return lhs;
}
@@ -91,7 +91,7 @@ public:
@param _xComponent the report component
*/
REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
-typedef ::std::pair< ::rtl::OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter;
+typedef ::std::pair< OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter;
DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair);
/** returns the property name map for the givern property id
@param _nObjectId the object id
@@ -100,7 +100,7 @@ REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _n
REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport);
// -----------------------------------------------------------------------------
-template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const ::rtl::OUString& _sPropertyName)
+template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
{
T nReturn = T();
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY_THROW);
@@ -108,7 +108,7 @@ template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference
return nReturn;
}
// -----------------------------------------------------------------------------
-template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const ::rtl::OUString& _sPropertyName,const T& _aValue)
+template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName,const T& _aValue)
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY);
if ( xProp.is() )
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 197932b424b2..9062a7aaf0f7 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -87,7 +87,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >
getReportDefinition() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const ::rtl::OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1);
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1);
};
}
#endif
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 7a11c4e52c50..ac22e47d4f45 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -38,7 +38,7 @@
namespace rptui
{
-typedef ::std::multimap< sal_Int16, ::rtl::OUString, ::std::less< sal_Int16 > > IndexToNameMap;
+typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexToNameMap;
enum DlgEdHintKind
{
RPTUI_HINT_UNKNOWN,
@@ -83,11 +83,11 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener;
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive;
- ::rtl::OUString m_sComponentName;
+ OUString m_sComponentName;
sal_Bool m_bIsListening;
OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
- OObjectBase(const ::rtl::OUString& _sComponentName);
+ OObjectBase(const OUString& _sComponentName);
virtual ~OObjectBase();
@@ -115,14 +115,14 @@ public:
virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
virtual void initializeOle() {}
- sal_Bool supportsService( const ::rtl::OUString& _sServiceName ) const;
+ sal_Bool supportsService( const OUString& _sServiceName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
inline void setOldParent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) { m_xSection = _xSection; }
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getOldParent() const { return m_xSection;}
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const;
- inline const ::rtl::OUString getServiceName() const { return m_sComponentName; }
+ inline const OUString getServiceName() const { return m_sComponentName; }
/** releases the reference to our UNO shape (m_xKeepShapeAlive)
*/
@@ -147,7 +147,7 @@ public:
protected:
OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
- OCustomShape(const ::rtl::OUString& _sComponentName);
+ OCustomShape(const OUString& _sComponentName);
virtual void NbcMove( const Size& rSize );
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -189,7 +189,7 @@ public:
}
protected:
OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType);
- OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType);
+ OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType);
virtual void NbcMove( const Size& rSize );
@@ -231,11 +231,11 @@ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase
sal_uInt16 m_nObjectType;
protected:
- OUnoObject(const ::rtl::OUString& _sComponentName
- ,const ::rtl::OUString& rModelName
+ OUnoObject(const OUString& _sComponentName
+ ,const OUString& rModelName
,sal_uInt16 _nObjectType);
OUnoObject( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent
- ,const ::rtl::OUString& rModelName
+ ,const OUString& rModelName
,sal_uInt16 _nObjectType);
virtual ~OUnoObject();
@@ -261,7 +261,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
- static ::rtl::OUString GetDefaultName(const OUnoObject* _pObj);
+ static OUString GetDefaultName(const OUnoObject* _pObj);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape();
virtual sal_uInt16 GetObjIdentifier() const;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 056ebf8773d5..4f8a1d8ec65b 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -113,7 +113,7 @@ namespace rptui
class UndoContext
{
public:
- UndoContext( SfxUndoManager& i_undoManager, const ::rtl::OUString& i_undoTitle )
+ UndoContext( SfxUndoManager& i_undoManager, const OUString& i_undoTitle )
:m_rUndoManager( i_undoManager )
{
m_rUndoManager.EnterListAction( i_undoTitle, String() );
@@ -164,7 +164,7 @@ namespace rptui
,sal_uInt16 nCommentID);
virtual ~OCommentUndoAction();
- virtual rtl::OUString GetComment() const { return m_strComment; }
+ virtual OUString GetComment() const { return m_strComment; }
virtual void Undo();
virtual void Redo();
};
@@ -252,7 +252,7 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj;
- ::rtl::OUString m_aPropertyName;
+ OUString m_aPropertyName;
::com::sun::star::uno::Any m_aNewValue;
::com::sun::star::uno::Any m_aOldValue;
@@ -270,7 +270,7 @@ namespace rptui
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment() const;
+ virtual OUString GetComment() const;
};
//==================================================================
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index a8a968ab40d3..bc7c89ea4900 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -38,14 +38,14 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC ConditionalExpression
{
private:
- const ::rtl::OUString m_sPattern;
+ const OUString m_sPattern;
public:
ConditionalExpression( const sal_Char* _pAsciiPattern );
/** assembles an expression string from a field data source, and one or two operands
*/
- ::rtl::OUString assembleExpression( const ::rtl::OUString& _rFieldDataSource, const ::rtl::OUString& _rLHS, const ::rtl::OUString& _rRHS ) const;
+ OUString assembleExpression( const OUString& _rFieldDataSource, const OUString& _rLHS, const OUString& _rRHS ) const;
/** matches the given expression string to the expression pattern represented by the object
@param _rExpression
@@ -60,7 +60,7 @@ namespace rptui
<TRUE/> if and only if the expression string could be successfully matched to
the pattern.
*/
- bool matchExpression( const ::rtl::OUString& _rExpression, const ::rtl::OUString& _rFieldDataSource, ::rtl::OUString& _out_rLHS, ::rtl::OUString& _out_rRHS ) const;
+ bool matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const;
};
//========================================================================
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 01f502bf59de..12f9eae4695c 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -47,15 +47,15 @@ namespace rptui
private:
BindType m_eType;
- ::rtl::OUString m_sCompleteFormula;
- ::rtl::OUString m_sUndecoratedContent;
+ OUString m_sCompleteFormula;
+ OUString m_sUndecoratedContent;
public:
/// constructs a ReportFormula object from a string
- ReportFormula( const ::rtl::OUString& _rFormula );
+ ReportFormula( const OUString& _rFormula );
/// constructs a ReportFormula by BindType
- ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression );
+ ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression );
~ReportFormula();
ReportFormula& operator=(class ReportFormula const &);
@@ -67,7 +67,7 @@ namespace rptui
inline BindType getType() const { return m_eType; }
/// returns the complete formula represented by the object
- const ::rtl::OUString&
+ const OUString&
getCompleteFormula() const;
/** gets the <em>undecorated formula</em> content
@@ -78,18 +78,18 @@ namespace rptui
If the formula denotes an expression, then the <em>undecorated content</em> is the expression
itself.
*/
- const ::rtl::OUString& getUndecoratedContent() const;
+ const OUString& getUndecoratedContent() const;
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression
- inline ::rtl::OUString getFieldName() const;
+ inline OUString getFieldName() const;
/**
@returns "=" + getFieldName()
*/
- ::rtl::OUString getEqualUndecoratedContent() const;
+ OUString getEqualUndecoratedContent() const;
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on a field
- inline ::rtl::OUString getExpression() const;
+ inline OUString getExpression() const;
/** returns a bracketed field name of the formula denotes a field reference,
or the undecorated expression if the formula denotes an expression.
@@ -97,21 +97,21 @@ namespace rptui
Effectively, this means the method returns the complete formular, stripped by the prefix
which indicates a field or a expression.
*/
- ::rtl::OUString getBracketedFieldOrExpression() const;
+ OUString getBracketedFieldOrExpression() const;
private:
- void impl_construct( const ::rtl::OUString& _rFormula );
+ void impl_construct( const OUString& _rFormula );
};
//--------------------------------------------------------------------
- inline ::rtl::OUString ReportFormula::getFieldName() const
+ inline OUString ReportFormula::getFieldName() const
{
OSL_PRECOND( getType() == Field, "ReportFormula::getFieldName: not bound to a field!" );
return getUndecoratedContent();
}
//--------------------------------------------------------------------
- inline ::rtl::OUString ReportFormula::getExpression() const
+ inline OUString ReportFormula::getExpression() const
{
OSL_PRECOND( getType() == Expression, "ReportFormula::getExpression: not bound to an expression!" );
return getUndecoratedContent();
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 9d5e56f89c85..f22fb7a0bb04 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -38,9 +38,9 @@ namespace reportdesign
// =============================================================================
using namespace com::sun::star;
using namespace comphelper;
-uno::Sequence< ::rtl::OUString > lcl_getLineOptionals()
+uno::Sequence< OUString > lcl_getLineOptionals()
{
- ::rtl::OUString pProps[] = {
+ OUString pProps[] = {
PROPERTY_DATAFIELD
,PROPERTY_DEFAULTCONTROL
,PROPERTY_CONTROLBORDER
@@ -124,7 +124,7 @@ uno::Sequence< ::rtl::OUString > lcl_getLineOptionals()
};
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
DBG_NAME(rpt_OFixedLine)
// -----------------------------------------------------------------------------
@@ -207,20 +207,20 @@ void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException)
cppu::WeakComponentImplHelperBase::dispose();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OFixedLine::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OFixedLine");
+ return OUString("com.sun.star.comp.report.OFixedLine");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFixedLine::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OFixedLine::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OFixedLine::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_FIXEDLINE;
return aServices;
@@ -232,12 +232,12 @@ uno::Reference< uno::XInterface > OFixedLine::create(uno::Reference< uno::XCompo
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OFixedLine::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFixedLine::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -271,43 +271,43 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedLine::getPropertySetInf
return FixedLinePropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedLine::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedLinePropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OFixedLine::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OFixedLine::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return FixedLinePropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedLine::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedLinePropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedLine::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedLinePropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedLine::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedLinePropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedLine::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedLinePropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
// XReportControlModel
-::rtl::OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::setDataField( const ::rtl::OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OFixedLine::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
@@ -342,12 +342,12 @@ void SAL_CALL OFixedLine::setPrintWhenGroupChange( ::sal_Bool /*_printwhengroupc
throw beans::UnknownPropertyException();
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedLine::setConditionalPrintExpression( const ::rtl::OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OFixedLine::setConditionalPrintExpression( const OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
@@ -515,7 +515,7 @@ awt::Size SAL_CALL OFixedLine::getSize( ) throw (uno::RuntimeException)
void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException)
{
const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter)
- const rtl::OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8);
+ const OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8);
if ( aSize.Width < MIN_WIDTH && m_nOrientation == 1 )
throw beans::PropertyVetoException("Too small width for FixedLine; minimum is " + OUString::number(MIN_WIDTH) + hundredthmm, static_cast<cppu::OWeakObject*>(this));
else if ( aSize.Height < MIN_HEIGHT && m_nOrientation == 0 )
@@ -524,32 +524,32 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper
}
// -----------------------------------------------------------------------------
// XShapeDescriptor
-::rtl::OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException)
+OUString SAL_CALL OFixedLine::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.drawing.ControlShape");
+ return OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
+OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
{
throw beans::UnknownPropertyException();
}
-void SAL_CALL OFixedLine::setHyperLinkURL(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)
+void SAL_CALL OFixedLine::setHyperLinkURL(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
throw beans::UnknownPropertyException();
}
-::rtl::OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException)
+OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException)
{
throw beans::UnknownPropertyException();
}
-void SAL_CALL OFixedLine::setHyperLinkTarget(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)
+void SAL_CALL OFixedLine::setHyperLinkTarget(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
throw beans::UnknownPropertyException();
}
-::rtl::OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException)
+OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException)
{
throw beans::UnknownPropertyException();
}
-void SAL_CALL OFixedLine::setHyperLinkName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)
+void SAL_CALL OFixedLine::setHyperLinkName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
throw beans::UnknownPropertyException();
}
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index de2ff89b7c82..8c256c15e354 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -36,10 +36,10 @@ namespace reportdesign
// =============================================================================
using namespace com::sun::star;
using namespace comphelper;
-uno::Sequence< ::rtl::OUString > lcl_getFixedTextOptionals()
+uno::Sequence< OUString > lcl_getFixedTextOptionals()
{
- ::rtl::OUString pProps[] = { PROPERTY_DATAFIELD,PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ OUString pProps[] = { PROPERTY_DATAFIELD,PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
DBG_NAME( rpt_OFixedText )
// -----------------------------------------------------------------------------
@@ -97,20 +97,20 @@ void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException)
uno::Reference< report::XFixedText> xHoldAlive = this;
}
// -----------------------------------------------------------------------------
-::rtl::OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OFixedText::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OFixedText");
+ return OUString("com.sun.star.comp.report.OFixedText");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFixedText::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OFixedText::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_FIXEDTEXT;
return aServices;
@@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > OFixedText::create(uno::Reference< uno::XCompo
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OFixedText::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFixedText::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -143,43 +143,43 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedText::getPropertySetInf
return FixedTextPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedText::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedTextPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OFixedText::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OFixedText::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return FixedTextPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedText::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedTextPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedText::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedTextPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedText::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedTextPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFixedText::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FixedTextPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
// XReportControlModel
-::rtl::OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::setDataField( const ::rtl::OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
@@ -197,13 +197,13 @@ void SAL_CALL OFixedText::setPrintWhenGroupChange( ::sal_Bool _printwhengroupcha
set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aConditionalPrintExpression;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OFixedText::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
}
@@ -219,13 +219,13 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone( ) throw (u
// -----------------------------------------------------------------------------
// XFixedText
-::rtl::OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException)
+OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_sLabel;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFixedText::setLabel( const ::rtl::OUString& _label ) throw (uno::RuntimeException)
+void SAL_CALL OFixedText::setLabel( const OUString& _label ) throw (uno::RuntimeException)
{
set(PROPERTY_LABEL,_label,m_sLabel);
}
@@ -319,9 +319,9 @@ void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::Proper
// -----------------------------------------------------------------------------
// XShapeDescriptor
-::rtl::OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException)
+OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.drawing.ControlShape");
+ return OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 96d9df3c4c3b..b17ea240b7f3 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -43,7 +43,7 @@ DBG_NAME( rpt_OFormatCondition )
// -----------------------------------------------------------------------------
OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext)
:FormatConditionBase(m_aMutex)
-,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_bEnabled(sal_True)
{
DBG_CTOR( rpt_OFormatCondition,NULL);
@@ -62,31 +62,31 @@ void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException)
cppu::WeakComponentImplHelperBase::dispose();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OFormatCondition::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OFormatCondition");
+ return OUString("com.sun.star.comp.report.OFormatCondition");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormatCondition::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OFormatCondition::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OFormatCondition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_FORMATCONDITION;
return aServices;
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OFormatCondition::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFormatCondition::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -96,32 +96,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getProperty
return FormatConditionPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormatCondition::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormatCondition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
FormatConditionPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OFormatCondition::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OFormatCondition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return FormatConditionPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormatCondition::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormatCondition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormatConditionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormatCondition::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormatCondition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormatConditionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormatCondition::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormatCondition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormatConditionPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormatCondition::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormatCondition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormatConditionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
@@ -138,13 +138,13 @@ void SAL_CALL OFormatCondition::setEnabled( ::sal_Bool _enabled ) throw (uno::Ru
set(PROPERTY_ENABLED,_enabled,m_bEnabled);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException)
+OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_sFormula;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormatCondition::setFormula( const ::rtl::OUString& _formula ) throw (uno::RuntimeException)
+void SAL_CALL OFormatCondition::setFormula( const OUString& _formula ) throw (uno::RuntimeException)
{
set(PROPERTY_FORMULA,_formula,m_sFormula);
}
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 9f5462fe01db..646cae21bce1 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -43,10 +43,10 @@ uno::Reference< uno::XInterface > OFormattedField::create(uno::Reference< uno::X
return *(new OFormattedField(xContext));
}
-uno::Sequence< ::rtl::OUString > lcl_getFormattedFieldOptionals()
+uno::Sequence< OUString > lcl_getFormattedFieldOptionals()
{
- ::rtl::OUString pProps[] = { PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ OUString pProps[] = { PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
DBG_NAME( rpt_OFormattedField )
// -----------------------------------------------------------------------------
@@ -105,32 +105,32 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException)
m_xFunction.clear();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OFormattedField::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OFormattedField");
+ return OUString("com.sun.star.comp.report.OFormattedField");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormattedField::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OFormattedField::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OFormattedField::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(2);
+ uno::Sequence< OUString > aServices(2);
aServices.getArray()[0] = SERVICE_FORMATTEDFIELD;
- aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.UnoControlFormattedFieldModel");
+ aServices.getArray()[1] = OUString("com.sun.star.awt.UnoControlFormattedFieldModel");
return aServices;
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OFormattedField::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFormattedField::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -147,7 +147,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormattedField::getPropertyS
return FormattedFieldPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
// special case here /// TODO check
if ( !aValue.hasValue() && aPropertyName == PROPERTY_FORMATKEY )
@@ -156,39 +156,39 @@ void SAL_CALL OFormattedField::setPropertyValue( const ::rtl::OUString& aPropert
FormattedFieldPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OFormattedField::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OFormattedField::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return FormattedFieldPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormattedField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormattedFieldPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormattedField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormattedFieldPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormattedField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormattedFieldPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFormattedField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FormattedFieldPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
// XReportControlModel
-::rtl::OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aDataField;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::setDataField( const ::rtl::OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OFormattedField::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField);
}
@@ -204,13 +204,13 @@ void SAL_CALL OFormattedField::setPrintWhenGroupChange( ::sal_Bool _printwhengro
set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aConditionalPrintExpression;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFormattedField::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
}
@@ -262,7 +262,7 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm
{
uno::Reference< beans::XPropertySet> xProp(::dbtools::findDataSource(getParent()),uno::UNO_QUERY);
if ( xProp.is() )
- m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString("NumberFormatsSupplier")),uno::UNO_QUERY);
+ m_xFormatsSupplier.set(xProp->getPropertyValue(OUString("NumberFormatsSupplier")),uno::UNO_QUERY);
}
}
return m_xFormatsSupplier;
@@ -362,9 +362,9 @@ void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::P
// -----------------------------------------------------------------------------
// XShapeDescriptor
-::rtl::OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException)
+OUString SAL_CALL OFormattedField::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.drawing.ControlShape");
+ return OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
// =============================================================================
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 36bbd10b703e..38868973be49 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -40,7 +40,7 @@ DBG_NAME( rpt_OFunction )
// -----------------------------------------------------------------------------
OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
:FunctionBase(m_aMutex)
-,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_xContext(_xContext)
,m_bPreEvaluated(sal_False)
,m_bDeepTraversing(sal_False)
@@ -62,31 +62,31 @@ void SAL_CALL OFunction::dispose() throw(uno::RuntimeException)
cppu::WeakComponentImplHelperBase::dispose();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OFunction::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OFunction");
+ return OUString("com.sun.star.comp.report.OFunction");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFunction::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OFunction::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OFunction::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_FUNCTION;
return aServices;
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OFunction::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFunction::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -96,32 +96,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo
return FunctionPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFunction::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
FunctionPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OFunction::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OFunction::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return FunctionPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFunction::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FunctionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFunction::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FunctionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFunction::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FunctionPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OFunction::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
FunctionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
@@ -152,36 +152,36 @@ void SAL_CALL OFunction::setDeepTraversing(::sal_Bool the_value) throw (uno::Run
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException)
+OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_sName;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::setName(const ::rtl::OUString & the_value) throw (uno::RuntimeException)
+void SAL_CALL OFunction::setName(const OUString & the_value) throw (uno::RuntimeException)
{
set(PROPERTY_NAME,the_value,m_sName);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException)
+OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_sFormula;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::setFormula(const ::rtl::OUString & the_value) throw (uno::RuntimeException)
+void SAL_CALL OFunction::setFormula(const OUString & the_value) throw (uno::RuntimeException)
{
set(PROPERTY_FORMULA,the_value,m_sFormula);
}
// -----------------------------------------------------------------------------
-beans::Optional< ::rtl::OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException)
+beans::Optional< OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_sInitialFormula;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OFunction::setInitialFormula(const beans::Optional< ::rtl::OUString> & the_value) throw (uno::RuntimeException)
+void SAL_CALL OFunction::setInitialFormula(const beans::Optional< OUString> & the_value) throw (uno::RuntimeException)
{
set(PROPERTY_INITIALFORMULA,the_value,m_sInitialFormula);
}
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index ba056faf96ba..353d3695e080 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -40,7 +40,7 @@ DBG_NAME( rpt_OGroup )
OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
,const uno::Reference< uno::XComponentContext >& _xContext)
:GroupBase(m_aMutex)
-,GroupPropertySet(_xContext,static_cast< GroupPropertySet::Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,GroupPropertySet(_xContext,static_cast< GroupPropertySet::Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_xContext(_xContext)
,m_xParent(_xParent)
{
@@ -78,24 +78,24 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource)
//--------------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.Group");
+ return OUString("com.sun.star.comp.report.Group");
}
//------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
+uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString> aSupported(1);
+ uno::Sequence< OUString> aSupported(1);
aSupported.getArray()[0] = SERVICE_GROUP;
return aSupported;
}
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException)
+uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
// -----------------------------------------------------------------------------
-sal_Bool SAL_CALL OGroup::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static());
}
@@ -138,7 +138,7 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc
{
if ( _headeron != m_xHeader.is() )
{
- ::rtl::OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager()));
+ OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager()));
setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader);
}
}
@@ -153,7 +153,7 @@ void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeExc
{
if ( _footeron != m_xFooter.is() )
{
- ::rtl::OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager()));
+ OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager()));
setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter);
}
}
@@ -193,7 +193,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container
void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException)
{
if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupOn")
+ throwIllegallArgumentException(OUString("com::sun::star::report::GroupOn")
,*this
,1
,m_xContext);
@@ -220,7 +220,7 @@ void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno:
void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException)
{
if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::KeepTogether")
+ throwIllegallArgumentException(OUString("com::sun::star::report::KeepTogether")
,*this
,1
,m_xContext);
@@ -232,13 +232,13 @@ uno::Reference< report::XGroups > SAL_CALL OGroup::getGroups() throw (uno::Runti
return m_xParent;
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException)
+OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.m_sExpression;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OGroup::setExpression( const ::rtl::OUString& _expression ) throw (uno::RuntimeException)
+void SAL_CALL OGroup::setExpression( const OUString& _expression ) throw (uno::RuntimeException)
{
set(PROPERTY_EXPRESSION,_expression,m_aProps.m_sExpression);
}
@@ -282,39 +282,39 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(
return GroupPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OGroup::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OGroup::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
GroupPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OGroup::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OGroup::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return GroupPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OGroup::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OGroup::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
GroupPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OGroup::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OGroup::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
GroupPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OGroup::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OGroup::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
GroupPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OGroup::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void OGroup::setSection( const ::rtl::OUString& _sProperty
+void OGroup::setSection( const OUString& _sProperty
,const sal_Bool& _bOn
- ,const ::rtl::OUString& _sName
+ ,const OUString& _sName
,uno::Reference< report::XSection>& _member)
{
BoundListeners l;
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index d083e8d9da2c..d41e83dae278 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -37,9 +37,9 @@ namespace reportdesign
// =============================================================================
using namespace com::sun::star;
using namespace comphelper;
-uno::Sequence< ::rtl::OUString > lcl_getImageOptionals()
+uno::Sequence< OUString > lcl_getImageOptionals()
{
- ::rtl::OUString pProps[] = {
+ OUString pProps[] = {
PROPERTY_CHARCOLOR
,PROPERTY_CHAREMPHASIS
,PROPERTY_CHARFONTCHARSET
@@ -109,7 +109,7 @@ uno::Sequence< ::rtl::OUString > lcl_getImageOptionals()
, PROPERTY_CHARLOCALECOMPLEX
};
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
DBG_NAME( rpt_OImageControl )
@@ -171,20 +171,20 @@ void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException)
cppu::WeakComponentImplHelperBase::dispose();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OImageControl::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OImageControl");
+ return OUString("com.sun.star.comp.report.OImageControl");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OImageControl::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OImageControl::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OImageControl::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_IMAGECONTROL;
return aServices;
@@ -196,12 +196,12 @@ uno::Reference< uno::XInterface > OImageControl::create(uno::Reference< uno::XCo
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OImageControl::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OImageControl::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -211,30 +211,30 @@ REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent)
REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent)
REPORTCOMPONENT_NOMASTERDETAIL(OImageControl)
NO_REPORTCONTROLFORMAT_IMPL(OImageControl)
-::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
+OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aFormatProperties.sHyperLinkURL;
}
-void SAL_CALL OImageControl::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException)
+void SAL_CALL OImageControl::setHyperLinkURL(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL);
}
-::rtl::OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException)
+OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aFormatProperties.sHyperLinkTarget;
}
-void SAL_CALL OImageControl::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException)
+void SAL_CALL OImageControl::setHyperLinkTarget(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget);
}
-::rtl::OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException)
+OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aFormatProperties.sHyperLinkName;
}
-void SAL_CALL OImageControl::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException)
+void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName);
}
@@ -273,44 +273,44 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySet
return ImageControlPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OImageControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
ImageControlPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OImageControl::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OImageControl::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return ImageControlPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OImageControl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ImageControlPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OImageControl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ImageControlPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OImageControl::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ImageControlPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OImageControl::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ImageControlPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
// XReportControlModel
-::rtl::OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aDataField;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::setDataField( const ::rtl::OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OImageControl::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField);
}
@@ -327,13 +327,13 @@ void SAL_CALL OImageControl::setPrintWhenGroupChange( ::sal_Bool _printwhengroup
set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aConditionalPrintExpression;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
}
@@ -351,13 +351,13 @@ uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone( ) throw
// XImageControl
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException)
+OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aImageURL;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OImageControl::setImageURL( const ::rtl::OUString& _imageurl ) throw (uno::RuntimeException)
+void SAL_CALL OImageControl::setImageURL( const OUString& _imageurl ) throw (uno::RuntimeException)
{
set(PROPERTY_IMAGEURL,_imageurl,m_aImageURL);
}
@@ -456,9 +456,9 @@ void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::Pro
// -----------------------------------------------------------------------------
// XShapeDescriptor
-::rtl::OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException)
+OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.drawing.ControlShape");
+ return OUString("com.sun.star.drawing.ControlShape");
}
// -----------------------------------------------------------------------------
::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index b8c9b13bc901..998aefb9c936 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -83,11 +83,11 @@ OFormatProperties::OFormatProperties()
SvtLinguConfig aLinguConfig;
using namespace ::com::sun::star::i18n::ScriptType;
- aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale")) >>= aCharLocale;
+ aLinguConfig.GetProperty(OUString("DefaultLocale")) >>= aCharLocale;
LanguageType eCurLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocale).getLanguageType(false), LATIN);
- aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CJK")) >>= aCharLocaleAsian;
+ aLinguConfig.GetProperty(OUString("DefaultLocale_CJK")) >>= aCharLocaleAsian;
LanguageType eCurLangCJK = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleAsian).getLanguageType(false), ASIAN);
- aLinguConfig.GetProperty(::rtl::OUString("DefaultLocale_CTL")) >>= aCharLocaleComplex;
+ aLinguConfig.GetProperty(OUString("DefaultLocale_CTL")) >>= aCharLocaleComplex;
LanguageType eCurLangCTL = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleComplex).getLanguageType(false), COMPLEX);
Font aLatin,aCJK,aCTL;
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index c6dc7eef15e4..0186ead39269 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -124,7 +124,7 @@
#include <boost/utility.hpp>
#define MAP_LEN(x) x, sizeof(x) - 1
-#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))
+#define MAP_CHAR_LEN(x) OUString(RTL_CONSTASCII_USTRINGPARAM(x))
// page styles
#define SC_UNO_PAGE_LEFTBORDER "LeftBorder"
#define SC_UNO_PAGE_RIGHTBORDER "RightBorder"
@@ -201,15 +201,15 @@ void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::b
uno::Reference<beans::XPropertySet> xProp(_xStorage,uno::UNO_QUERY);
sal_Int32 nOpenMode = embed::ElementModes::READ;
if ( xProp.is() )
- xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nOpenMode;
+ xProp->getPropertyValue(OUString("OpenMode")) >>= nOpenMode;
_rModel->SetReadOnly((nOpenMode & embed::ElementModes::WRITE) != embed::ElementModes::WRITE);
}
void lcl_stripLoadArguments( ::comphelper::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs )
{
- _rDescriptor.erase( ::rtl::OUString( "StatusIndicator" ) );
- _rDescriptor.erase( ::rtl::OUString( "InteractionHandler" ) );
- _rDescriptor.erase( ::rtl::OUString( "Model" ) );
+ _rDescriptor.erase( OUString( "StatusIndicator" ) );
+ _rDescriptor.erase( OUString( "InteractionHandler" ) );
+ _rDescriptor.erase( OUString( "Model" ) );
_rDescriptor >> _rArgs;
}
// -----------------------------------------------------------------------------
@@ -221,7 +221,7 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r
_rxStatusIndicator = _rDescriptor.getUnpackedValueOrDefault( _rDescriptor.PROP_STATUSINDICATOR(), _rxStatusIndicator );
if ( _rxStatusIndicator.is() )
{
- _rxStatusIndicator->start( ::rtl::OUString(), (sal_Int32)1000000 );
+ _rxStatusIndicator->start( OUString(), (sal_Int32)1000000 );
sal_Int32 nLength = _rCallArgs.getLength();
_rCallArgs.realloc( nLength + 1 );
@@ -264,21 +264,21 @@ public:
// XStyle
::sal_Bool SAL_CALL isUserDefined( ) throw (uno::RuntimeException);
::sal_Bool SAL_CALL isInUse( ) throw (uno::RuntimeException);
- ::rtl::OUString SAL_CALL getParentStyle( ) throw (uno::RuntimeException);
- void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw (container::NoSuchElementException, uno::RuntimeException);
+ OUString SAL_CALL getParentStyle( ) throw (uno::RuntimeException);
+ void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw (container::NoSuchElementException, uno::RuntimeException);
// XNamed
- ::rtl::OUString SAL_CALL getName( ) throw (uno::RuntimeException);
- void SAL_CALL setName( const ::rtl::OUString& aName ) throw (uno::RuntimeException);
+ OUString SAL_CALL getName( ) throw (uno::RuntimeException);
+ void SAL_CALL setName( const OUString& aName ) throw (uno::RuntimeException);
// XMultiPropertyState
- uno::Sequence< beans::PropertyState > SAL_CALL getPropertyStates( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+ uno::Sequence< beans::PropertyState > SAL_CALL getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
return OStyle_PBASE::getPropertyStates(aPropertyNames);
}
void SAL_CALL setAllPropertiesToDefault( ) throw (uno::RuntimeException);
- void SAL_CALL setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException);
- uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+ void SAL_CALL setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException);
+ uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
};
// -----------------------------------------------------------------------------
OStyle::OStyle()
@@ -298,8 +298,8 @@ OStyle::OStyle()
const sal_Int32 nZero = 0;
const sal_Int16 n16Zero = 0;
const sal_Int16 nNummeringType = style::NumberingType::ARABIC;
- const ::rtl::OUString sName("Default");
- const ::rtl::OUString sEmpty;
+ const OUString sName("Default");
+ const OUString sEmpty;
const table::BorderLine eBorderLine(0,0,0,0);
const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0);
const style::PageStyleLayout ePageStyleLayout = style::PageStyleLayout_ALL;
@@ -307,7 +307,7 @@ OStyle::OStyle()
const sal_Int32 nMayBeVoid = beans::PropertyAttribute::MAYBEVOID;
sal_Int32 i = 0;
- registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName );
+ registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< OUString *>(NULL) ), &sName );
registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
@@ -317,11 +317,11 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin);
- registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
- registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
- registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
@@ -342,9 +342,9 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
//
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent);
- registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
- registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
@@ -372,8 +372,8 @@ OStyle::OStyle()
registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout);
- const ::rtl::OUString sPaperTray("[From printer settings]");
- registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray);
+ const OUString sPaperTray("[From printer settings]");
+ registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const OUString*)0) ,&sPaperTray);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin);
@@ -388,7 +388,7 @@ OStyle::OStyle()
uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL)));
registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs);
registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) );
- registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty);
+ registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const OUString*)0),&sEmpty);
uno::Sequence<sal_Int8> aSe;
registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe);
@@ -429,24 +429,24 @@ void OStyle::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, uno::Any& /*_rD
return sal_True;
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OStyle::getParentStyle( ) throw (uno::RuntimeException)
+OUString SAL_CALL OStyle::getParentStyle( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString();
+ return OUString();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OStyle::setParentStyle( const ::rtl::OUString& /*aParentStyle*/ ) throw (container::NoSuchElementException, uno::RuntimeException)
+void SAL_CALL OStyle::setParentStyle( const OUString& /*aParentStyle*/ ) throw (container::NoSuchElementException, uno::RuntimeException)
{
}
// -----------------------------------------------------------------------------
// XNamed
-::rtl::OUString SAL_CALL OStyle::getName( ) throw (uno::RuntimeException)
+OUString SAL_CALL OStyle::getName( ) throw (uno::RuntimeException)
{
- ::rtl::OUString sName;
+ OUString sName;
getPropertyValue(PROPERTY_NAME) >>= sName;
return sName;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OStyle::setName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+void SAL_CALL OStyle::setName( const OUString& aName ) throw (uno::RuntimeException)
{
setPropertyValue(PROPERTY_NAME,uno::makeAny(aName));
}
@@ -455,19 +455,19 @@ void SAL_CALL OStyle::setAllPropertiesToDefault( ) throw (uno::RuntimeException
{
}
// -----------------------------------------------------------------------------
-void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
- const ::rtl::OUString* pIter = aPropertyNames.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength();
+ const OUString* pIter = aPropertyNames.getConstArray();
+ const OUString* pEnd = pIter + aPropertyNames.getLength();
for(;pIter != pEnd;++pIter)
setPropertyToDefault(*pIter);
}
// -----------------------------------------------------------------------------
-uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Sequence< uno::Any > aRet(aPropertyNames.getLength());
- const ::rtl::OUString* pIter = aPropertyNames.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aPropertyNames.getLength();
+ const OUString* pIter = aPropertyNames.getConstArray();
+ const OUString* pEnd = pIter + aPropertyNames.getLength();
for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i)
aRet[i] = getPropertyDefault(*pIter);
return aRet;
@@ -476,10 +476,10 @@ namespace
{
class FactoryLoader : public ::osl::Thread
{
- ::rtl::OUString m_sMimeType;
+ OUString m_sMimeType;
uno::Reference< uno::XComponentContext > m_xContext;
public:
- FactoryLoader(const ::rtl::OUString& _sMimeType,uno::Reference< uno::XComponentContext > const & _xContext)
+ FactoryLoader(const OUString& _sMimeType,uno::Reference< uno::XComponentContext > const & _xContext)
:m_sMimeType(_sMimeType)
,m_xContext(_xContext)
{}
@@ -498,7 +498,7 @@ namespace
{
uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(m_xContext);
uno::Reference<frame::XComponentLoader> xFrameLoad(xDesktop,uno::UNO_QUERY);
- ::rtl::OUString sTarget("_blank");
+ OUString sTarget("_blank");
sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE;
uno::Reference< frame::XFrame> xFrame = xDesktop->findFrame(sTarget,nFrameSearchFlag);
xFrameLoad.set(xFrame,uno::UNO_QUERY);
@@ -507,20 +507,20 @@ namespace
{
uno::Sequence < beans::PropertyValue > aArgs( 3);
sal_Int32 nLen = 0;
- aArgs[nLen].Name = ::rtl::OUString("AsTemplate");
+ aArgs[nLen].Name = OUString("AsTemplate");
aArgs[nLen++].Value <<= sal_False;
- aArgs[nLen].Name = ::rtl::OUString("ReadOnly");
+ aArgs[nLen].Name = OUString("ReadOnly");
aArgs[nLen++].Value <<= sal_True;
- aArgs[nLen].Name = ::rtl::OUString("Hidden");
+ aArgs[nLen].Name = OUString("Hidden");
aArgs[nLen++].Value <<= sal_True;
::comphelper::MimeConfigurationHelper aHelper(m_xContext);
SvtModuleOptions aModuleOptions;
uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL(
aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(m_sMimeType) )),
- ::rtl::OUString(), // empty frame name
+ OUString(), // empty frame name
0,
aArgs
),uno::UNO_QUERY);
@@ -577,12 +577,12 @@ struct OReportDefinitionImpl
m_pObjectContainer;
::boost::shared_ptr<rptui::OReportModel> m_pReportModel;
::rtl::Reference< ::dbaui::UndoManager > m_pUndoManager;
- ::rtl::OUString m_sCaption;
- ::rtl::OUString m_sCommand;
- ::rtl::OUString m_sFilter;
- ::rtl::OUString m_sMimeType;
- ::rtl::OUString m_sIdentifier;
- ::rtl::OUString m_sDataSourceName;
+ OUString m_sCaption;
+ OUString m_sCommand;
+ OUString m_sFilter;
+ OUString m_sMimeType;
+ OUString m_sIdentifier;
+ OUString m_sDataSourceName;
awt::Size m_aVisualAreaSize;
::sal_Int64 m_nAspect;
::sal_Int16 m_nGroupKeepTogether;
@@ -639,7 +639,7 @@ DBG_NAME( rpt_OReportDefinition )
// -----------------------------------------------------------------------------
OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > const & _xContext)
: ReportDefinitionBase(m_aMutex)
-,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_aProps(new OReportComponentProperties(_xContext))
,m_pImpl(new OReportDefinitionImpl(m_aMutex))
{
@@ -659,7 +659,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co
,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
,uno::Reference< drawing::XShape >& _xShape)
: ReportDefinitionBase(m_aMutex)
-,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_aProps(new OReportComponentProperties(_xContext))
,m_pImpl(new OReportDefinitionImpl(m_aMutex))
{
@@ -679,7 +679,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co
OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy)
: cppu::BaseMutex()
,ReportDefinitionBase(m_aMutex)
-,ReportDefinitionPropertySet(_rCopy.m_aProps->m_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,ReportDefinitionPropertySet(_rCopy.m_aProps->m_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,comphelper::IEmbeddedHelper()
,m_aProps(new OReportComponentProperties(*_rCopy.m_aProps))
,m_pImpl(new OReportDefinitionImpl(m_aMutex,*_rCopy.m_pImpl))
@@ -725,9 +725,9 @@ void OReportDefinition::init()
if ( s_bFirstTime )
{
s_bFirstTime = false;
- const uno::Sequence< ::rtl::OUString > aMimeTypes = getAvailableMimeTypes();
- const ::rtl::OUString* pIter = aMimeTypes.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aMimeTypes.getLength();
+ const uno::Sequence< OUString > aMimeTypes = getAvailableMimeTypes();
+ const OUString* pIter = aMimeTypes.getConstArray();
+ const OUString* pEnd = pIter + aMimeTypes.getLength();
for ( ; pIter != pEnd; ++pIter )
{
FactoryLoader* pCreatorThread = new FactoryLoader(*pIter,m_aProps->m_xContext);
@@ -742,8 +742,8 @@ void OReportDefinition::init()
m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM );
SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin();
rAdmin.NewStandardLayer(RPT_LAYER_FRONT);
- rAdmin.NewLayer(rtl::OUString("back"), RPT_LAYER_BACK);
- rAdmin.NewLayer(rtl::OUString("HiddenLayer"), RPT_LAYER_HIDDEN);
+ rAdmin.NewLayer(OUString("back"), RPT_LAYER_BACK);
+ rAdmin.NewLayer(OUString("HiddenLayer"), RPT_LAYER_HIDDEN);
m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex );
m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() );
@@ -755,10 +755,10 @@ void OReportDefinition::init()
uno::Reference<beans::XPropertySet> xStorProps(m_pImpl->m_xStorage,uno::UNO_QUERY);
if ( xStorProps.is())
{
- ::rtl::OUString sMediaType;
- xStorProps->getPropertyValue( ::rtl::OUString("MediaType")) >>= sMediaType;
+ OUString sMediaType;
+ xStorProps->getPropertyValue( OUString("MediaType")) >>= sMediaType;
if ( sMediaType.isEmpty() )
- xStorProps->setPropertyValue( ::rtl::OUString("MediaType"),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT));
+ xStorProps->setPropertyValue( OUString("MediaType"),uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT));
}
m_pImpl->m_pObjectContainer.reset( new comphelper::EmbeddedObjectContainer(m_pImpl->m_xStorage , static_cast<cppu::OWeakObject*>(this) ) );
}
@@ -776,7 +776,7 @@ void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException)
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::disposing()
{
- notifyEvent(::rtl::OUString("OnUnload"));
+ notifyEvent(OUString("OnUnload"));
uno::Reference< frame::XModel > xHoldAlive( this );
@@ -827,29 +827,29 @@ void SAL_CALL OReportDefinition::disposing()
}
// -----------------------------------------------------------------------------
-::rtl::OUString OReportDefinition::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OReportDefinition::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OReportDefinition");
+ return OUString("com.sun.star.comp.report.OReportDefinition");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportDefinition::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OReportDefinition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OReportDefinition::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_REPORTDEFINITION;
return aServices;
}
// --------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
// first collect the services which are supported by our aggregate
- uno::Sequence< ::rtl::OUString > aSupported;
+ uno::Sequence< OUString > aSupported;
if ( m_aProps->m_xServiceInfo.is() )
aSupported = m_aProps->m_xServiceInfo->getSupportedServiceNames();
@@ -866,7 +866,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getSupportedService
}
// --------------------------------------------------------------------------------
-sal_Bool SAL_CALL OReportDefinition::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL OReportDefinition::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::findValue( getSupportedServiceNames(), _rServiceName, sal_True ).getLength() != 0;
}
@@ -898,13 +898,13 @@ uno::Reference< uno::XInterface > OReportDefinition::create(uno::Reference< uno:
// -----------------------------------------------------------------------------
// XReportDefinition
-::rtl::OUString SAL_CALL OReportDefinition::getCaption() throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getCaption() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_pImpl->m_sCaption;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
+void SAL_CALL OReportDefinition::setCaption( const OUString& _caption ) throw (uno::RuntimeException)
{
set(PROPERTY_CAPTION,_caption,m_pImpl->m_sCaption);
}
@@ -918,7 +918,7 @@ void SAL_CALL OReportDefinition::setCaption( const ::rtl::OUString& _caption ) t
void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (uno::RuntimeException)
{
if ( _groupkeeptogether < report::GroupKeepTogether::PER_PAGE || _groupkeeptogether > report::GroupKeepTogether::PER_COLUMN )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::GroupKeepTogether")
+ throwIllegallArgumentException(OUString("com::sun::star::report::GroupKeepTogether")
,*this
,1
,m_aProps->m_xContext);
@@ -934,7 +934,7 @@ void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptog
void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (uno::RuntimeException)
{
if ( _pageheaderoption < report::ReportPrintOption::ALL_PAGES || _pageheaderoption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption")
+ throwIllegallArgumentException(OUString("com::sun::star::report::ReportPrintOption")
,*this
,1
,m_aProps->m_xContext);
@@ -950,20 +950,20 @@ void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderopt
void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (uno::RuntimeException)
{
if ( _pagefooteroption < report::ReportPrintOption::ALL_PAGES || _pagefooteroption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ReportPrintOption")
+ throwIllegallArgumentException(OUString("com::sun::star::report::ReportPrintOption")
,*this
,1
,m_aProps->m_xContext);
set(PROPERTY_PAGEFOOTEROPTION,_pagefooteroption,m_pImpl->m_nPageFooterOption);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportDefinition::getCommand() throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getCommand() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_pImpl->m_sCommand;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setCommand( const ::rtl::OUString& _command ) throw (uno::RuntimeException)
+void SAL_CALL OReportDefinition::setCommand( const OUString& _command ) throw (uno::RuntimeException)
{
set(PROPERTY_COMMAND,_command,m_pImpl->m_sCommand);
}
@@ -977,20 +977,20 @@ void SAL_CALL OReportDefinition::setCommand( const ::rtl::OUString& _command ) t
void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) throw (uno::RuntimeException)
{
if ( _commandtype < sdb::CommandType::TABLE || _commandtype > sdb::CommandType::COMMAND )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::sdb::CommandType")
+ throwIllegallArgumentException(OUString("com::sun::star::sdb::CommandType")
,*this
,1
,m_aProps->m_xContext);
set(PROPERTY_COMMANDTYPE,_commandtype,m_pImpl->m_nCommandType);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportDefinition::getFilter() throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getFilter() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_pImpl->m_sFilter;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setFilter( const ::rtl::OUString& _filter ) throw (uno::RuntimeException)
+void SAL_CALL OReportDefinition::setFilter( const OUString& _filter ) throw (uno::RuntimeException)
{
set(PROPERTY_FILTER,_filter,m_pImpl->m_sFilter);
}
@@ -1123,32 +1123,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportDefinition::getPropert
return ReportDefinitionPropertySet::getPropertySetInfo();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportDefinition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportDefinitionPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OReportDefinition::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OReportDefinition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return ReportDefinitionPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportDefinition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportDefinitionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportDefinition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportDefinitionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportDefinition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportDefinitionPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportDefinition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportDefinitionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
@@ -1184,9 +1184,9 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t
return xSet.get();
}
// -----------------------------------------------------------------------------
-void OReportDefinition::setSection( const ::rtl::OUString& _sProperty
+void OReportDefinition::setSection( const OUString& _sProperty
,const sal_Bool& _bOn
- ,const ::rtl::OUString& _sName
+ ,const OUString& _sName
,uno::Reference< report::XSection>& _member)
{
BoundListeners l;
@@ -1258,7 +1258,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u
}
// -----------------------------------------------------------------------------
// XModel
-::sal_Bool SAL_CALL OReportDefinition::attachResource( const ::rtl::OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments ) throw (uno::RuntimeException)
+::sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments ) throw (uno::RuntimeException)
{
// LLA: we had a deadlock problem in our context, so we get the SolarMutex earlier.
SolarMutexGuard aSolarGuard;
@@ -1285,11 +1285,11 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u
void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor)
{
uno::Sequence<beans::PropertyValue> aComponentData;
- aComponentData = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("ComponentData"),aComponentData);
+ aComponentData = _aDescriptor.getUnpackedValueOrDefault(OUString("ComponentData"),aComponentData);
if ( aComponentData.getLength() && (!m_pImpl->m_xActiveConnection.is() || !m_pImpl->m_xNumberFormatsSupplier.is()) )
{
::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData );
- m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),m_pImpl->m_xActiveConnection);
+ m_pImpl->m_xActiveConnection = aComponentDataMap.getUnpackedValueOrDefault(OUString("ActiveConnection"),m_pImpl->m_xActiveConnection);
m_pImpl->m_xNumberFormatsSupplier = dbtools::getNumberFormats(m_pImpl->m_xActiveConnection);
}
if ( !m_pImpl->m_xNumberFormatsSupplier.is() )
@@ -1297,14 +1297,14 @@ void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor)
m_pImpl->m_xNumberFormatsSupplier.set( util::NumberFormatsSupplier::createWithDefaultLocale( m_aProps->m_xContext ) );
}
lcl_stripLoadArguments( _aDescriptor, m_pImpl->m_aArgs );
- ::rtl::OUString sCaption;
- sCaption = _aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("DocumentTitle"),sCaption);
+ OUString sCaption;
+ sCaption = _aDescriptor.getUnpackedValueOrDefault(OUString("DocumentTitle"),sCaption);
setCaption(sCaption);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportDefinition::getURL( ) throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getURL( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString();
+ return OUString();
}
// -----------------------------------------------------------------------------
uno::Sequence< beans::PropertyValue > SAL_CALL OReportDefinition::getArgs( ) throw (uno::RuntimeException)
@@ -1387,7 +1387,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
fillArgs(aDescriptor);
- aDescriptor.createItemIfMissing(::rtl::OUString("Storage"),uno::makeAny(_xStorageToLoadFrom));
+ aDescriptor.createItemIfMissing(OUString("Storage"),uno::makeAny(_xStorageToLoadFrom));
uno::Sequence< uno::Any > aDelegatorArguments(_aMediaDescriptor.getLength());
uno::Any* pIter = aDelegatorArguments.getArray();
@@ -1399,7 +1399,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
sal_Int32 nPos = aDelegatorArguments.getLength();
aDelegatorArguments.realloc(nPos+1);
beans::PropertyValue aPropVal;
- aPropVal.Name = ::rtl::OUString("Storage");
+ aPropVal.Name = OUString("Storage");
aPropVal.Value <<= _xStorageToLoadFrom;
aDelegatorArguments[nPos] <<= aPropVal;
@@ -1407,7 +1407,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
rptui::OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
{
uno::Reference< document::XFilter > xFilter(
- m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(::rtl::OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext),
+ m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(OUString("com.sun.star.comp.report.OReportFilter"),aDelegatorArguments,m_aProps->m_xContext),
uno::UNO_QUERY_THROW );
uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW);
@@ -1453,13 +1453,13 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
// export sub streams for package, else full stream into a file
sal_Bool bWarn = sal_False, bErr = sal_False;
- ::rtl::OUString sWarnFile, sErrFile;
+ OUString sWarnFile, sErrFile;
uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY);
if ( xProp.is() )
{
- static const ::rtl::OUString sPropName("MediaType");
- ::rtl::OUString sOldMediaType;
+ static const OUString sPropName("MediaType");
+ OUString sOldMediaType;
xProp->getPropertyValue(sPropName) >>= sOldMediaType;
if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT != sOldMediaType )
xProp->setPropertyValue( sPropName, uno::makeAny(MIMETYPE_OASIS_OPENDOCUMENT_REPORT) );
@@ -1469,22 +1469,22 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
comphelper::PropertyMapEntry aExportInfoMap[] =
{
{ MAP_LEN( "UsePrettyPrinting" ), 0, &::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamName") , 0,&::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamRelPath") , 0,&::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "BaseURI") , 0,&::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "StreamName") , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "StreamRelPath") , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "BaseURI") , 0,&::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
SvtSaveOptions aSaveOpt;
- xInfoSet->setPropertyValue(rtl::OUString("UsePrettyPrinting"), uno::makeAny(aSaveOpt.IsPrettyPrinting()));
+ xInfoSet->setPropertyValue(OUString("UsePrettyPrinting"), uno::makeAny(aSaveOpt.IsPrettyPrinting()));
if ( aSaveOpt.IsSaveRelFSys() )
{
- const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) );
- xInfoSet->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal));
+ const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) );
+ xInfoSet->setPropertyValue(OUString("BaseURI"), uno::makeAny(sVal));
}
- const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) );
- xInfoSet->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName));
+ const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),OUString()) );
+ xInfoSet->setPropertyValue(OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName));
sal_Int32 nArgsLen = aDelegatorArguments.getLength();
@@ -1507,7 +1507,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
uno::Reference<XComponent> xCom(static_cast<OWeakObject*>(this),uno::UNO_QUERY);
if( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("settings.xml")));
+ xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("settings.xml")));
if( !WriteThroughComponent(
xCom, "settings.xml",
"com.sun.star.comp.report.XMLSettingsExporter",
@@ -1516,14 +1516,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if( !bWarn )
{
bWarn = sal_True;
- sWarnFile = ::rtl::OUString("settings.xml");
+ sWarnFile = OUString("settings.xml");
}
}
}
if( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("meta.xml")));
+ xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("meta.xml")));
if( !WriteThroughComponent(
xCom, "meta.xml",
"com.sun.star.comp.report.XMLMetaExporter",
@@ -1532,14 +1532,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if( !bWarn )
{
bWarn = sal_True;
- sWarnFile = ::rtl::OUString("meta.xml");
+ sWarnFile = OUString("meta.xml");
}
}
}
if( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("styles.xml")));
+ xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("styles.xml")));
if( !WriteThroughComponent(
xCom, "styles.xml",
"com.sun.star.comp.report.XMLStylesExporter",
@@ -1548,21 +1548,21 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
if( !bWarn )
{
bWarn = sal_True;
- sWarnFile = ::rtl::OUString("styles.xml");
+ sWarnFile = OUString("styles.xml");
}
}
}
if ( !bErr )
{
- xInfoSet->setPropertyValue(rtl::OUString("StreamName"), uno::makeAny(::rtl::OUString("content.xml")));
+ xInfoSet->setPropertyValue(OUString("StreamName"), uno::makeAny(OUString("content.xml")));
if( !WriteThroughComponent(
xCom, "content.xml",
"com.sun.star.comp.report.ExportFilter",
aDelegatorArguments, aProps, _xStorageToSaveTo ) )
{
bErr = sal_True;
- sErrFile = ::rtl::OUString("content.xml");
+ sErrFile = OUString("content.xml");
}
}
@@ -1575,8 +1575,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
}
if ( aImage.hasValue() )
{
- ::rtl::OUString sObject1("report");
- ::rtl::OUString sPng("image/png");
+ OUString sObject1("report");
+ OUString sPng("image/png");
uno::Sequence<sal_Int8> aSeq;
aImage >>= aSeq;
@@ -1665,7 +1665,7 @@ sal_Bool OReportDefinition::WriteThroughComponent(
{
uno::Reference<embed::XStorage> xMyStorage = _xStorageToSaveTo;
// open stream
- ::rtl::OUString sStreamName = ::rtl::OUString::createFromAscii( pStreamName );
+ OUString sStreamName = OUString::createFromAscii( pStreamName );
uno::Reference<io::XStream> xStream = xMyStorage->openStreamElement( sStreamName,embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
if ( !xStream.is() )
return sal_False;
@@ -1684,8 +1684,8 @@ sal_Bool OReportDefinition::WriteThroughComponent(
xSeek->seek(0);
}
- ::rtl::OUString aPropName("MediaType");
- ::rtl::OUString aMime("text/xml");
+ OUString aPropName("MediaType");
+ OUString aMime("text/xml");
uno::Any aAny;
aAny <<= aMime;
xStreamProp->setPropertyValue( aPropName, aAny );
@@ -1736,7 +1736,7 @@ sal_Bool OReportDefinition::WriteThroughComponent(
// get filter component
uno::Reference< document::XExporter > xExporter(
m_aProps->m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- ::rtl::OUString::createFromAscii(pServiceName), aArgs,m_aProps->m_xContext), uno::UNO_QUERY);
+ OUString::createFromAscii(pServiceName), aArgs,m_aProps->m_xContext), uno::UNO_QUERY);
OSL_ENSURE( xExporter.is(),
"can't instantiate export filter component" );
if( !xExporter.is() )
@@ -1769,7 +1769,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
// the source for the to-be-created storage: either an URL, or a stream
uno::Reference< io::XInputStream > xStream;
- ::rtl::OUString sURL;
+ OUString sURL;
if ( aArguments.has( "Stream" ) )
{
@@ -1800,7 +1800,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
aStorageSource <<= sURL;
else
throw lang::IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ),
// TODO: resource
*this,
1
@@ -1836,7 +1836,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
{
if ( i == nLastOpenMode )
throw lang::WrappedTargetException(
- ::rtl::OUString( "An error occurred while creating the document storage." ),
+ OUString( "An error occurred while creating the document storage." ),
// TODO: resource
*this,
::cppu::getCaughtException()
@@ -1880,8 +1880,8 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
embed::VisualRepresentation aResult;
- ::rtl::OUString sImageName("report");
- ::rtl::OUString sMimeType;
+ OUString sImageName("report");
+ OUString sMimeType;
uno::Reference<io::XInputStream> xStream = m_pImpl->m_pObjectContainer->GetGraphicStream(sImageName,&sMimeType);
if ( xStream.is() )
{
@@ -1960,7 +1960,7 @@ void SAL_CALL OReportDefinition::setModified( ::sal_Bool _bModified ) throw (bea
lang::EventObject aEvent(*this);
aGuard.clear();
m_pImpl->m_aModifyListeners.notifyEach(&util::XModifyListener::modified,aEvent);
- notifyEvent(::rtl::OUString("OnModifyChanged"));
+ notifyEvent(OUString("OnModifyChanged"));
}
}
// -----------------------------------------------------------------------------
@@ -1980,7 +1980,7 @@ void SAL_CALL OReportDefinition::removeModifyListener( const uno::Reference< uti
m_pImpl->m_aModifyListeners.removeInterface(_xListener);
}
// -----------------------------------------------------------------------------
-void OReportDefinition::notifyEvent(const ::rtl::OUString& _sEventName)
+void OReportDefinition::notifyEvent(const OUString& _sEventName)
{
try
{
@@ -2084,45 +2084,45 @@ uno::Reference< ui::XUIConfigurationManager2 > OReportDefinition::getUIConfigura
return m_pImpl->m_xUIConfigurationManager;
}
// -----------------------------------------------------------------------------
-uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (uno::RuntimeException)
+uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
return m_pImpl->m_xStorage->openStorageElement(aStorageName, nMode);
}
// -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesNames( ) throw (io::IOException, uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesNames( ) throw (io::IOException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
uno::Reference<container::XNameAccess> xNameAccess(m_pImpl->m_xStorage,uno::UNO_QUERY);
- return xNameAccess.is() ? xNameAccess->getElementNames() : uno::Sequence< ::rtl::OUString >();
+ return xNameAccess.is() ? xNameAccess->getElementNames() : uno::Sequence< OUString >();
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportDefinition::getMimeType() throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getMimeType() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
return m_pImpl->m_sMimeType;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setMimeType( const ::rtl::OUString& _mimetype ) throw (lang::IllegalArgumentException, uno::RuntimeException)
+void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw (lang::IllegalArgumentException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
- uno::Sequence< ::rtl::OUString > aList = getAvailableMimeTypes();
- const ::rtl::OUString* pEnd = aList.getConstArray()+aList.getLength();
+ uno::Sequence< OUString > aList = getAvailableMimeTypes();
+ const OUString* pEnd = aList.getConstArray()+aList.getLength();
if ( ::std::find(aList.getConstArray(),pEnd,_mimetype) == pEnd )
- throwIllegallArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()"))
+ throwIllegallArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()"))
,*this
,1
,m_aProps->m_xContext);
set(PROPERTY_MIMETYPE,_mimetype,m_pImpl->m_sMimeType);
}
// -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes( ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes( ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > s_aList(2);
+ uno::Sequence< OUString > s_aList(2);
s_aList[0] = MIMETYPE_OASIS_OPENDOCUMENT_TEXT;
s_aList[1] = MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET;
return s_aList;
@@ -2192,7 +2192,7 @@ uno::Reference< uno::XComponentContext > OReportDefinition::getContext()
return pReportModel;
}
// -----------------------------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWithArguments( const ::rtl::OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& _aArgs)
+uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& _aArgs)
throw( uno::Exception, uno::RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -2217,7 +2217,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith
return xRet;
}
// -----------------------------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException)
+uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2225,14 +2225,14 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
if ( aServiceSpecifier.indexOf( "com.sun.star.report." ) == 0 )
{
if ( aServiceSpecifier == SERVICE_SHAPE )
- xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.CustomShape") ),uno::UNO_QUERY_THROW);
+ xShape.set(SvxUnoDrawMSFactory::createInstance( OUString("com.sun.star.drawing.CustomShape") ),uno::UNO_QUERY_THROW);
else if ( aServiceSpecifier == SERVICE_FORMATTEDFIELD
|| aServiceSpecifier == SERVICE_FIXEDTEXT
|| aServiceSpecifier == SERVICE_FIXEDLINE
|| aServiceSpecifier == SERVICE_IMAGECONTROL )
- xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.ControlShape") ),uno::UNO_QUERY_THROW);
+ xShape.set(SvxUnoDrawMSFactory::createInstance( OUString("com.sun.star.drawing.ControlShape") ),uno::UNO_QUERY_THROW);
else
- xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ),uno::UNO_QUERY_THROW);
+ xShape.set(SvxUnoDrawMSFactory::createInstance( OUString("com.sun.star.drawing.OLE2Shape") ),uno::UNO_QUERY_THROW);
}
else if ( aServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 )
{
@@ -2244,10 +2244,10 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
)
{
uno::Reference< style::XStyle> xStyle = new OStyle();
- xStyle->setName(::rtl::OUString("Default"));
+ xStyle->setName(OUString("Default"));
uno::Reference<beans::XPropertySet> xProp(xStyle,uno::UNO_QUERY);
- ::rtl::OUString sTray;
- xProp->getPropertyValue(::rtl::OUString("PrinterPaperTray"))>>= sTray;
+ OUString sTray;
+ xProp->getPropertyValue(OUString("PrinterPaperTray"))>>= sTray;
return xStyle.get();
}
@@ -2328,7 +2328,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.xml.NamespaceMap")) == 0 )
{
if ( !m_pImpl->m_xXMLNamespaceMap.is() )
- m_pImpl->m_xXMLNamespaceMap = comphelper::NameContainer_createInstance( ::getCppuType( (const ::rtl::OUString*) 0 ) ).get();
+ m_pImpl->m_xXMLNamespaceMap = comphelper::NameContainer_createInstance( ::getCppuType( (const OUString*) 0 ) ).get();
return m_pImpl->m_xXMLNamespaceMap;
}
else
@@ -2337,39 +2337,39 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
return m_pImpl->m_pReportModel->createShape(aServiceSpecifier,xShape);
}
//-----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableServiceNames(void) throw( uno::RuntimeException )
-{
- static const ::rtl::OUString aSvxComponentServiceNameList[] =
- {
- ::rtl::OUString("com.sun.star.form.component.FixedText"),
- ::rtl::OUString("com.sun.star.form.component.DatabaseImageControl"),
- ::rtl::OUString("com.sun.star.style.PageStyle"),
- ::rtl::OUString("com.sun.star.style.GraphicStyle"),
- ::rtl::OUString("com.sun.star.style.FrameStyle"),
- ::rtl::OUString("com.sun.star.drawing.Defaults"),
- ::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),
- ::rtl::OUString("com.sun.star.document.ExportEmbeddedObjectResolver"),
- ::rtl::OUString("com.sun.star.document.ImportGraphicObjectResolver"),
- ::rtl::OUString("com.sun.star.document.ExportGraphicObjectResolver"),
- ::rtl::OUString("com.sun.star.chart2.data.DataProvider"),
- ::rtl::OUString("com.sun.star.xml.NamespaceMap"),
- ::rtl::OUString("com.sun.star.document.Settings"),
- ::rtl::OUString("com.sun.star.drawing.GradientTable"),
- ::rtl::OUString("com.sun.star.drawing.HatchTable"),
- ::rtl::OUString("com.sun.star.drawing.BitmapTable"),
- ::rtl::OUString("com.sun.star.drawing.TransparencyGradientTable"),
- ::rtl::OUString("com.sun.star.drawing.DashTable"),
- ::rtl::OUString("com.sun.star.drawing.MarkerTable")
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames(void) throw( uno::RuntimeException )
+{
+ static const OUString aSvxComponentServiceNameList[] =
+ {
+ OUString("com.sun.star.form.component.FixedText"),
+ OUString("com.sun.star.form.component.DatabaseImageControl"),
+ OUString("com.sun.star.style.PageStyle"),
+ OUString("com.sun.star.style.GraphicStyle"),
+ OUString("com.sun.star.style.FrameStyle"),
+ OUString("com.sun.star.drawing.Defaults"),
+ OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),
+ OUString("com.sun.star.document.ExportEmbeddedObjectResolver"),
+ OUString("com.sun.star.document.ImportGraphicObjectResolver"),
+ OUString("com.sun.star.document.ExportGraphicObjectResolver"),
+ OUString("com.sun.star.chart2.data.DataProvider"),
+ OUString("com.sun.star.xml.NamespaceMap"),
+ OUString("com.sun.star.document.Settings"),
+ OUString("com.sun.star.drawing.GradientTable"),
+ OUString("com.sun.star.drawing.HatchTable"),
+ OUString("com.sun.star.drawing.BitmapTable"),
+ OUString("com.sun.star.drawing.TransparencyGradientTable"),
+ OUString("com.sun.star.drawing.DashTable"),
+ OUString("com.sun.star.drawing.MarkerTable")
};
static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] );
- uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount );
- ::rtl::OUString* pStrings = aSeq.getArray();
+ uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount );
+ OUString* pStrings = aSeq.getArray();
for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ )
pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
- uno::Sequence< ::rtl::OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
+ uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
return concatServiceNames( aParentSeq, aSeq );
}
// -----------------------------------------------------------------------------
@@ -2414,9 +2414,9 @@ void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize ) throw (beans:
// -----------------------------------------------------------------------------
// XShapeDescriptor
-::rtl::OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.drawing.OLE2Shape");
+ return OUString("com.sun.star.drawing.OLE2Shape");
}
// -----------------------------------------------------------------------------
typedef ::cppu::WeakImplHelper2< container::XNameContainer,
@@ -2424,7 +2424,7 @@ typedef ::cppu::WeakImplHelper2< container::XNameContainer,
> TStylesBASE;
class OStylesHelper : public ::cppu::BaseMutex, public TStylesBASE
{
- typedef ::std::map< ::rtl::OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements;
+ typedef ::std::map< OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements;
TStyleElements m_aElements;
::std::vector<TStyleElements::iterator> m_aElementsPos;
uno::Type m_aType;
@@ -2437,11 +2437,11 @@ public:
OStylesHelper(const uno::Type _aType = ::getCppuType(static_cast< uno::Reference< container::XElementAccess >* >(NULL)));
// 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 removeByName( const ::rtl::OUString& Name ) throw(container::NoSuchElementException, 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);
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException);
// 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);
// container::XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw(uno::RuntimeException);
@@ -2451,9 +2451,9 @@ public:
virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException);
// container::XNameAccess
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException);
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException);
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException);
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException);
};
OStylesHelper::OStylesHelper(const uno::Type _aType)
@@ -2490,7 +2490,7 @@ uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index ) throw(lang::Index
}
// -----------------------------------------------------------------------------
// container::XNameAccess
-uno::Any SAL_CALL OStylesHelper::getByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OStylesHelper::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
TStyleElements::iterator aFind = m_aElements.find(aName);
@@ -2499,12 +2499,12 @@ uno::Any SAL_CALL OStylesHelper::getByName( const ::rtl::OUString& aName ) throw
return uno::makeAny(aFind->second);
}
// -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OStylesHelper::getElementNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OStylesHelper::getElementNames( ) throw(uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
- uno::Sequence< ::rtl::OUString > aNameList(m_aElementsPos.size());
+ uno::Sequence< OUString > aNameList(m_aElementsPos.size());
- ::rtl::OUString* pStringArray = aNameList.getArray();
+ OUString* pStringArray = aNameList.getArray();
::std::vector<TStyleElements::iterator>::const_iterator aEnd = m_aElementsPos.end();
for(::std::vector<TStyleElements::iterator>::const_iterator aIter = m_aElementsPos.begin(); aIter != aEnd;++aIter,++pStringArray)
*pStringArray = (*aIter)->first;
@@ -2512,14 +2512,14 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStylesHelper::getElementNames( ) thr
return aNameList;
}
// -----------------------------------------------------------------------------
-sal_Bool SAL_CALL OStylesHelper::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL OStylesHelper::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aElements.find(aName) != m_aElements.end();
}
// -----------------------------------------------------------------------------
// XNameContainer
-void SAL_CALL OStylesHelper::insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
if ( m_aElements.find(aName) != m_aElements.end() )
@@ -2531,7 +2531,7 @@ void SAL_CALL OStylesHelper::insertByName( const ::rtl::OUString& aName, const u
m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(aName,aElement)).first);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OStylesHelper::removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException)
+void SAL_CALL OStylesHelper::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
TStyleElements::iterator aFind = m_aElements.find(aName);
@@ -2542,7 +2542,7 @@ void SAL_CALL OStylesHelper::removeByName( const ::rtl::OUString& aName ) throw(
}
// -----------------------------------------------------------------------------
// XNameReplace
-void SAL_CALL OStylesHelper::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OStylesHelper::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
TStyleElements::iterator aFind = m_aElements.find(aName);
@@ -2563,30 +2563,30 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam
uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY);
uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
- xStyles->insertByName(::rtl::OUString("PageStyles"),uno::makeAny(xPageStyles));
- uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString("com.sun.star.style.PageStyle")),uno::UNO_QUERY);
+ xStyles->insertByName(OUString("PageStyles"),uno::makeAny(xPageStyles));
+ uno::Reference< style::XStyle> xPageStyle(createInstance(OUString("com.sun.star.style.PageStyle")),uno::UNO_QUERY);
xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle));
uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
- xStyles->insertByName(::rtl::OUString("FrameStyles"),uno::makeAny(xFrameStyles));
- uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString("com.sun.star.style.FrameStyle")),uno::UNO_QUERY);
+ xStyles->insertByName(OUString("FrameStyles"),uno::makeAny(xFrameStyles));
+ uno::Reference< style::XStyle> xFrameStyle(createInstance(OUString("com.sun.star.style.FrameStyle")),uno::UNO_QUERY);
xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle));
uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL)));
- xStyles->insertByName(::rtl::OUString("graphics"),uno::makeAny(xGraphicStyles));
- uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString("com.sun.star.style.GraphicStyle")),uno::UNO_QUERY);
+ xStyles->insertByName(OUString("graphics"),uno::makeAny(xGraphicStyles));
+ uno::Reference< style::XStyle> xGraphicStyle(createInstance(OUString("com.sun.star.style.GraphicStyle")),uno::UNO_QUERY);
xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle));
}
return m_pImpl->m_xStyles;
}
-::rtl::OUString SAL_CALL OReportDefinition::getIdentifier( ) throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getIdentifier( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
return m_pImpl->m_sIdentifier;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setIdentifier( const ::rtl::OUString& Identifier ) throw (uno::RuntimeException)
+void SAL_CALL OReportDefinition::setIdentifier( const OUString& Identifier ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2640,13 +2640,13 @@ void SAL_CALL OReportDefinition::setActiveConnection( const uno::Reference< sdbc
set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_pImpl->m_xActiveConnection);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportDefinition::getDataSourceName() throw (uno::RuntimeException)
+OUString SAL_CALL OReportDefinition::getDataSourceName() throw (uno::RuntimeException)
{
osl::MutexGuard g(m_aMutex);
return m_pImpl->m_sDataSourceName;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportDefinition::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException)
+void SAL_CALL OReportDefinition::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException)
{
set(PROPERTY_DATASOURCENAME,the_value,m_pImpl->m_sDataSourceName);
}
@@ -2690,14 +2690,14 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel
m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW);
pHelper->setOwner (xThis);
- pHelper->setUntitledPrefix (::rtl::OUString(" : "));
+ pHelper->setUntitledPrefix (OUString(" : "));
}
return m_pImpl->m_xNumberedControllers;
}
// -----------------------------------------------------------------------------
// css.frame.XTitle
-::rtl::OUString SAL_CALL OReportDefinition::getTitle()
+OUString SAL_CALL OReportDefinition::getTitle()
throw (uno::RuntimeException)
{
// SYNCHRONIZED ->
@@ -2710,7 +2710,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel
}
// -----------------------------------------------------------------------------
// css.frame.XTitle
-void SAL_CALL OReportDefinition::setTitle( const ::rtl::OUString& sTitle )
+void SAL_CALL OReportDefinition::setTitle( const OUString& sTitle )
throw (uno::RuntimeException)
{
// SYNCHRONIZED ->
@@ -2792,7 +2792,7 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference
}
// -----------------------------------------------------------------------------
// css.frame.XUntitledNumbers
-::rtl::OUString SAL_CALL OReportDefinition::getUntitledPrefix()
+OUString SAL_CALL OReportDefinition::getUntitledPrefix()
throw (uno::RuntimeException)
{
// object already disposed?
@@ -2845,8 +2845,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe
{
uno::Sequence< datatransfer::DataFlavor > aRet(1);
- aRet[0] = datatransfer::DataFlavor( ::rtl::OUString("image/png"),
- ::rtl::OUString("PNG"),
+ aRet[0] = datatransfer::DataFlavor( OUString("image/png"),
+ OUString("PNG"),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
return aRet;
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 9a61db0f2439..e99d1440df61 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -64,7 +64,7 @@ DBG_NAME( rpt_OReportEngineJFree )
// -----------------------------------------------------------------------------
OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context)
:ReportEngineBase(m_aMutex)
-,ReportEnginePropertySet(context,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >())
+,ReportEnginePropertySet(context,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_xContext(context)
,m_nMaxRows(0)
{
@@ -87,20 +87,20 @@ void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException)
m_xActiveConnection.clear();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OReportEngineJFree::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OReportEngineJFree");
+ return OUString("com.sun.star.comp.report.OReportEngineJFree");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OReportEngineJFree::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OReportEngineJFree::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = OUString("com.sun.star.report.ReportEngine");
return aServices;
@@ -112,12 +112,12 @@ uno::Reference< uno::XInterface > OReportEngineJFree::create(uno::Reference< uno
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OReportEngineJFree::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -157,26 +157,26 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task
set(PROPERTY_STATUSINDICATOR,_statusindicator,m_StatusIndicator);
}
// -----------------------------------------------------------------------------
-::rtl::OUString OReportEngineJFree::getNewOutputName()
+OUString OReportEngineJFree::getNewOutputName()
{
- ::rtl::OUString sOutputName;
+ OUString sOutputName;
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportEngineBase::rBHelper.bDisposed);
if ( !m_xReport.is() || !m_xActiveConnection.is() )
throw lang::IllegalArgumentException();
- static const ::rtl::OUString s_sMediaType("MediaType");
+ static const OUString s_sMediaType("MediaType");
try
{
MimeConfigurationHelper aConfighelper(m_xContext);
- const ::rtl::OUString sMimeType = m_xReport->getMimeType();
+ const OUString sMimeType = m_xReport->getMimeType();
const SfxFilter* pFilter = SfxFilter::GetDefaultFilter( aConfighelper.GetDocServiceNameFromMediaType(sMimeType) );
String sExt;
if ( pFilter )
sExt = ::comphelper::string::stripStart(pFilter->GetDefaultExtension(), '*');
else
- sExt = rtl::OUString(".rpt");
+ sExt = OUString(".rpt");
uno::Reference< embed::XStorage > xTemp = OStorageHelper::GetTemporaryStorage(/*sFileTemp,embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE,*/ m_xContext);
utl::DisposableComponent aTemp(xTemp);
@@ -190,11 +190,11 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task
uno::Sequence< beans::NamedValue > aConvertedProperties(8);
sal_Int32 nPos = 0;
- aConvertedProperties[nPos].Name = ::rtl::OUString("InputStorage");
+ aConvertedProperties[nPos].Name = OUString("InputStorage");
aConvertedProperties[nPos++].Value <<= xTemp;
- aConvertedProperties[nPos].Name = ::rtl::OUString("OutputStorage");
+ aConvertedProperties[nPos].Name = OUString("OutputStorage");
- ::rtl::OUString sFileURL;
+ OUString sFileURL;
String sName = m_xReport->getCaption();
if ( !sName.Len() )
sName = m_xReport->getName();
@@ -231,19 +231,19 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task
// some meta data
SvtUserOptions aUserOpts;
- ::rtl::OUStringBuffer sAuthor(aUserOpts.GetFirstName());
+ OUStringBuffer sAuthor(aUserOpts.GetFirstName());
sAuthor.appendAscii(" ");
sAuthor.append(aUserOpts.GetLastName());
- static const ::rtl::OUString s_sAuthor("Author");
+ static const OUString s_sAuthor("Author");
aConvertedProperties[nPos].Name = s_sAuthor;
aConvertedProperties[nPos++].Value <<= sAuthor.makeStringAndClear();
- static const ::rtl::OUString s_sTitle("Title");
+ static const OUString s_sTitle("Title");
aConvertedProperties[nPos].Name = s_sTitle;
aConvertedProperties[nPos++].Value <<= m_xReport->getCaption();
// create job factory and initialize
- const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext);
+ const OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext);
uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(sReportEngineServiceName,m_xContext),uno::UNO_QUERY_THROW);
if ( !m_xReport->getCommand().isEmpty() )
{
@@ -284,7 +284,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
{
uno::Reference< frame::XModel > xModel;
- ::rtl::OUString sOutputName = getNewOutputName(); // starts implicite the report generator
+ OUString sOutputName = getNewOutputName(); // starts implicite the report generator
if ( !sOutputName.isEmpty() )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -294,7 +294,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
{
// if there is no frame given, find the right
xFrameLoad.set( frame::Desktop::create(m_xContext), uno::UNO_QUERY);
- ::rtl::OUString sTarget("_blank");
+ OUString sTarget("_blank");
sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE;
uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY)->findFrame(sTarget,nFrameSearchFlag);
xFrameLoad.set( xFrame,uno::UNO_QUERY);
@@ -304,22 +304,22 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
{
uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 );
sal_Int32 nLen = 0;
- aArgs[nLen].Name = ::rtl::OUString("AsTemplate");
+ aArgs[nLen].Name = OUString("AsTemplate");
aArgs[nLen++].Value <<= sal_False;
- aArgs[nLen].Name = ::rtl::OUString("ReadOnly");
+ aArgs[nLen].Name = OUString("ReadOnly");
aArgs[nLen++].Value <<= sal_True;
if ( _bHidden )
{
- aArgs[nLen].Name = ::rtl::OUString("Hidden");
+ aArgs[nLen].Name = OUString("Hidden");
aArgs[nLen++].Value <<= sal_True;
}
uno::Reference< lang::XMultiServiceFactory > xFac(m_xContext->getServiceManager(),uno::UNO_QUERY);
xModel.set( xFrameLoad->loadComponentFromURL(
sOutputName,
- ::rtl::OUString(), // empty frame name
+ OUString(), // empty frame name
0,
aArgs
),uno::UNO_QUERY);
@@ -353,32 +353,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportEngineJFree::getProper
return ReportEnginePropertySet::getPropertySetInfo();
}
// -------------------------------------------------------------------------
-void SAL_CALL OReportEngineJFree::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportEngineJFree::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportEnginePropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return ReportEnginePropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportEnginePropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportEnginePropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportEnginePropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
ReportEnginePropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 265ed3e6121b..931e1ecbc40f 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -45,22 +45,22 @@ namespace reportdesign
DBG_NAME( rpt_OSection )
// -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString> lcl_getGroupAbsent()
+uno::Sequence< OUString> lcl_getGroupAbsent()
{
- ::rtl::OUString pProps[] = {
+ OUString pProps[] = {
PROPERTY_CANGROW
,PROPERTY_CANSHRINK
};
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
// -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString> lcl_getAbsent(bool _bPageSection)
+uno::Sequence< OUString> lcl_getAbsent(bool _bPageSection)
{
if ( _bPageSection )
{
- ::rtl::OUString pProps[] = {
+ OUString pProps[] = {
PROPERTY_FORCENEWPAGE
,PROPERTY_NEWROWORCOL
,PROPERTY_KEEPTOGETHER
@@ -68,16 +68,16 @@ uno::Sequence< ::rtl::OUString> lcl_getAbsent(bool _bPageSection)
,PROPERTY_CANSHRINK
,PROPERTY_REPEATSECTION
};
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
- ::rtl::OUString pProps[] = {
+ OUString pProps[] = {
PROPERTY_CANGROW
,PROPERTY_CANSHRINK
,PROPERTY_REPEATSECTION
};
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
uno::Reference<report::XSection> OSection::createOSection(
@@ -106,7 +106,7 @@ uno::Reference<report::XSection> OSection::createOSection(
OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
,const uno::Reference< report::XGroup >& xParentGroup
,const uno::Reference< uno::XComponentContext >& context
- ,uno::Sequence< ::rtl::OUString> const& rStrings)
+ ,uno::Sequence< OUString> const& rStrings)
:SectionBase(m_aMutex)
,SectionPropertySet(context,SectionPropertySet::IMPLEMENTS_PROPERTY_SET,rStrings)
,m_aContainerListeners(m_aMutex)
@@ -175,24 +175,24 @@ void SAL_CALL OSection::disposing()
m_xContext.clear();
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.Section");
+ return OUString("com.sun.star.comp.report.Section");
}
//------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
+uno::Sequence< OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString> aSupported(1);
+ uno::Sequence< OUString> aSupported(1);
aSupported.getArray()[0] = SERVICE_SECTION;
return aSupported;
}
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException)
+uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
// -----------------------------------------------------------------------------
-sal_Bool SAL_CALL OSection::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::existsValue(_rServiceName,getSupportedServiceNames_Static());
}
@@ -233,13 +233,13 @@ void SAL_CALL OSection::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc
set(PROPERTY_VISIBLE,_visible,m_bVisible);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OSection::getName() throw (uno::RuntimeException)
+OUString SAL_CALL OSection::getName() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_sName;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OSection::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
+void SAL_CALL OSection::setName( const OUString& _name ) throw (uno::RuntimeException)
{
set(PROPERTY_NAME,_name,m_sName);
}
@@ -282,13 +282,13 @@ void SAL_CALL OSection::setBackTransparent( ::sal_Bool _backtransparent ) throw
set(PROPERTY_BACKCOLOR,static_cast<sal_Int32>(COL_TRANSPARENT),m_nBackgroundColor);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException)
+OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_sConditionalPrintExpression;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OSection::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (uno::RuntimeException)
+void SAL_CALL OSection::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (uno::RuntimeException)
{
set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_sConditionalPrintExpression);
}
@@ -317,7 +317,7 @@ void OSection::checkNotPageHeaderFooter()
void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage")
+ throwIllegallArgumentException(OUString("com::sun::star::report::ForceNewPage")
,*this
,1
,m_xContext);
@@ -335,7 +335,7 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang
void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION )
- throwIllegallArgumentException(::rtl::OUString("com::sun::star::report::ForceNewPage")
+ throwIllegallArgumentException(OUString("com::sun::star::report::ForceNewPage")
,*this
,1
,m_xContext);
@@ -422,26 +422,26 @@ uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefiniti
return xRet;
}
// -----------------------------------------------------------------------------
-const ::std::vector< ::rtl::OUString >& lcl_getControlModelMap()
+const ::std::vector< OUString >& lcl_getControlModelMap()
{
- static ::std::vector< ::rtl::OUString > s_sControlModels;
+ static ::std::vector< OUString > s_sControlModels;
if ( s_sControlModels.empty() )
{
- s_sControlModels.push_back( ::rtl::OUString("FixedText") );
- s_sControlModels.push_back( ::rtl::OUString("FixedLine") );
- s_sControlModels.push_back( ::rtl::OUString("ImageControl") );
- s_sControlModels.push_back( ::rtl::OUString("FormattedField") );
- s_sControlModels.push_back( ::rtl::OUString("Shape") );
+ s_sControlModels.push_back( OUString("FixedText") );
+ s_sControlModels.push_back( OUString("FixedLine") );
+ s_sControlModels.push_back( OUString("ImageControl") );
+ s_sControlModels.push_back( OUString("FormattedField") );
+ s_sControlModels.push_back( OUString("Shape") );
}
return s_sControlModels;
}
// -----------------------------------------------------------------------------
-uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const ::rtl::OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException)
+uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException)
{
::osl::ResettableMutexGuard aGuard(m_aMutex);
- const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap();
- ::std::vector< ::rtl::OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier);
+ const ::std::vector< OUString >& aRet = lcl_getControlModelMap();
+ ::std::vector< OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier);
if ( aFind == aRet.end() )
throw lang::IllegalArgumentException();
@@ -450,19 +450,19 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon
switch( aFind - aRet.begin() )
{
case 0:
- xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FixedText")),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(OUString("com.sun.star.form.component.FixedText")),uno::UNO_QUERY);
break;
case 1:
- xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(OUString("com.sun.star.awt.UnoControlFixedLineModel")),uno::UNO_QUERY);
break;
case 2:
- xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(OUString("com.sun.star.form.component.DatabaseImageControl")),uno::UNO_QUERY);
break;
case 3:
- xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.form.component.FormattedField")),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(OUString("com.sun.star.form.component.FormattedField")),uno::UNO_QUERY);
break;
case 4:
- xRet.set(xFac->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")),uno::UNO_QUERY);
+ xRet.set(xFac->createInstance(OUString("com.sun.star.drawing.ControlShape")),uno::UNO_QUERY);
break;
default:
break;
@@ -470,13 +470,13 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon
return xRet;
}
// -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
- const ::std::vector< ::rtl::OUString >& aRet = lcl_getControlModelMap();
- const ::rtl::OUString* pRet = aRet.empty() ? 0 : &aRet[0];
- return uno::Sequence< ::rtl::OUString >(pRet, aRet.size());
+ const ::std::vector< OUString >& aRet = lcl_getControlModelMap();
+ const OUString* pRet = aRet.empty() ? 0 : &aRet[0];
+ return uno::Sequence< OUString >(pRet, aRet.size());
}
// -----------------------------------------------------------------------------
// XChild
@@ -545,32 +545,32 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OSection::getPropertySetInfo(
return SectionPropertySet::getPropertySetInfo();
}
// -------------------------------------------------------------------------
-void SAL_CALL OSection::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OSection::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
SectionPropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OSection::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OSection::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return SectionPropertySet::getPropertyValue( PropertyName);
}
// -----------------------------------------------------------------------------
-void SAL_CALL OSection::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OSection::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
SectionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OSection::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OSection::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
SectionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OSection::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OSection::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
SectionPropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OSection::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OSection::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
}
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index c875df30e1a0..bd8295b6088c 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -41,14 +41,14 @@ namespace reportdesign
// =============================================================================
using namespace com::sun::star;
using namespace comphelper;
-uno::Sequence< ::rtl::OUString > lcl_getShapeOptionals()
+uno::Sequence< OUString > lcl_getShapeOptionals()
{
- ::rtl::OUString pProps[] = {
+ OUString pProps[] = {
PROPERTY_DATAFIELD
,PROPERTY_CONTROLBACKGROUND
,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
};
- return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
+ return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
DBG_NAME( rpt_OShape )
@@ -67,7 +67,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
,uno::Reference< drawing::XShape >& _xShape
- ,const ::rtl::OUString& _sServiceName)
+ ,const OUString& _sServiceName)
:ShapeBase(m_aMutex)
,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
@@ -118,20 +118,20 @@ void SAL_CALL OShape::dispose() throw(uno::RuntimeException)
cppu::WeakComponentImplHelperBase::dispose();
}
// -----------------------------------------------------------------------------
-::rtl::OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString OShape::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.Shape");
+ return OUString("com.sun.star.comp.report.Shape");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OShape::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL OShape::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > OShape::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OShape::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_SHAPE;
return aServices;
@@ -143,12 +143,12 @@ uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponent
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OShape::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL OShape::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return m_sServiceName == ServiceName || ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
@@ -200,7 +200,7 @@ cppu::IPropertyArrayHelper& OShape::getInfoHelper()
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::setPropertyValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
getInfoHelper();
if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY )
@@ -210,7 +210,7 @@ void SAL_CALL OShape::setPropertyValue( const ::rtl::OUString& aPropertyName, co
ShapePropertySet::setPropertyValue( aPropertyName, aValue );
}
// -----------------------------------------------------------------------------
-uno::Any SAL_CALL OShape::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
getInfoHelper();
if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY )
@@ -221,7 +221,7 @@ uno::Any SAL_CALL OShape::getPropertyValue( const ::rtl::OUString& PropertyName
return uno::Any();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
getInfoHelper();
if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || aPropertyName.isEmpty() )
@@ -231,7 +231,7 @@ void SAL_CALL OShape::addPropertyChangeListener( const ::rtl::OUString& aPropert
ShapePropertySet::addPropertyChangeListener( aPropertyName, xListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
getInfoHelper();
if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || aPropertyName.isEmpty() )
@@ -241,7 +241,7 @@ void SAL_CALL OShape::removePropertyChangeListener( const ::rtl::OUString& aProp
ShapePropertySet::removePropertyChangeListener( aPropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
getInfoHelper();
if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || PropertyName.isEmpty() )
@@ -251,7 +251,7 @@ void SAL_CALL OShape::addVetoableChangeListener( const ::rtl::OUString& Property
ShapePropertySet::addVetoableChangeListener( PropertyName, aListener );
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
getInfoHelper();
if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY || PropertyName.isEmpty() )
@@ -262,12 +262,12 @@ void SAL_CALL OShape::removeVetoableChangeListener( const ::rtl::OUString& Prope
}
// -----------------------------------------------------------------------------
// XReportControlModel
-::rtl::OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::setDataField( const ::rtl::OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OShape::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
{
throw beans::UnknownPropertyException();
}
@@ -283,13 +283,13 @@ void SAL_CALL OShape::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange
set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
+OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_aProps.aConditionalPrintExpression;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL OShape::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
}
@@ -412,9 +412,9 @@ void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVe
// -----------------------------------------------------------------------------
// XShapeDescriptor
-::rtl::OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException)
+OUString SAL_CALL OShape::getShapeType( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.drawing.CustomShape");
+ return OUString("com.sun.star.drawing.CustomShape");
}
// -----------------------------------------------------------------------------
::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException)
@@ -456,7 +456,7 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo
set(PROPERTY_TRANSFORMATION,_transformation,m_Transformation);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException)
+OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEENGINE) >>= m_CustomShapeEngine;
@@ -464,20 +464,20 @@ void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transfo
return m_CustomShapeEngine;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::setCustomShapeEngine( const ::rtl::OUString& _customshapeengine ) throw (uno::RuntimeException)
+void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine ) throw (uno::RuntimeException)
{
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::makeAny(_customshapeengine));
set(PROPERTY_CUSTOMSHAPEENGINE,_customshapeengine,m_CustomShapeEngine);
}
// -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException)
+OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEDATA) >>= m_CustomShapeData;
return m_CustomShapeData;
}
// -----------------------------------------------------------------------------
-void SAL_CALL OShape::setCustomShapeData( const ::rtl::OUString& _customshapedata ) throw (uno::RuntimeException)
+void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata ) throw (uno::RuntimeException)
{
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::makeAny(_customshapedata));
set(PROPERTY_CUSTOMSHAPEDATA,_customshapedata,m_CustomShapeData);
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index a1f13642b424..be6dacb58c6d 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -40,20 +40,20 @@ uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInt
return xRet;
}
// -----------------------------------------------------------------------------
-void throwIllegallArgumentException( const ::rtl::OUString& _sTypeName
+void throwIllegallArgumentException( const OUString& _sTypeName
,const uno::Reference< uno::XInterface >& ExceptionContext_
,const ::sal_Int16& ArgumentPosition_
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context_
)
{
- ::rtl::OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT,Context_->getServiceManager()));
+ OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT,Context_->getServiceManager()));
sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName);
throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_);
}
// -----------------------------------------------------------------------------
uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XReportComponent>& _xReportComponent
,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
- ,const ::rtl::OUString& _sServiceName)
+ ,const OUString& _sServiceName)
{
OSL_ENSURE(_xReportComponent.is() && _xFactory.is() ,"reportcomponent is null -> GPF");
uno::Reference< report::XReportComponent> xClone(_xFactory->createInstance(_sServiceName),uno::UNO_QUERY_THROW);
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index 70a0f912203c..30fff054dbec 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -55,7 +55,7 @@ namespace reportdesign
OFixedLine(const OFixedLine&);
OFixedLine& operator=(const OFixedLine&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -79,22 +79,22 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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);
// XReportComponent
REPORTCOMPONENT_HEADER()
@@ -103,7 +103,7 @@ namespace reportdesign
SHAPE_HEADER()
// XShapeDescriptor
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
// XReportControlModel
REPORTCONTROLMODEL_HEADER()
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index 2f7eece67fb5..f71a5fcb324e 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -45,12 +45,12 @@ namespace reportdesign
{
friend class OShapeHelper;
OReportControlModel m_aProps;
- ::rtl::OUString m_sLabel;
+ OUString m_sLabel;
private:
OFixedText(const OFixedText&);
OFixedText& operator=(const OFixedText&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -76,22 +76,22 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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);
// XReportComponent
REPORTCOMPONENT_HEADER()
@@ -99,7 +99,7 @@ namespace reportdesign
SHAPE_HEADER()
// XShapeDescriptor
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
// XReportControlModel
REPORTCONTROLMODEL_HEADER()
@@ -108,8 +108,8 @@ namespace reportdesign
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException);
// XFixedText
- virtual ::rtl::OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setLabel( const ::rtl::OUString& _label ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getLabel() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setLabel( const OUString& _label ) throw (::com::sun::star::uno::RuntimeException);
// ::com::sun::star::report::XReportControlFormat
REPORTCONTROLFORMAT_HEADER()
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index 143cb81ed5e8..3d983850cd4e 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -42,13 +42,13 @@ namespace reportdesign
public FormatConditionPropertySet
{
OFormatProperties m_aFormatProperties;
- ::rtl::OUString m_sFormula;
+ OUString m_sFormula;
sal_Bool m_bEnabled;
private:
OFormatCondition(const OFormatCondition&);
OFormatCondition& operator=(const OFormatCondition&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -68,28 +68,28 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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);
// XFormatCondition
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 getFormula() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setFormula( const ::rtl::OUString& _formula ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setFormula( const OUString& _formula ) throw (::com::sun::star::uno::RuntimeException);
// XReportControlFormat
REPORTCONTROLFORMAT_HEADER()
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index d44d3f46d72a..f902b13d7309 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -53,7 +53,7 @@ namespace reportdesign
OFormattedField(const OFormattedField&);
OFormattedField& operator=(const OFormattedField&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -79,22 +79,22 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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);
// XContainer
virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
@@ -122,7 +122,7 @@ namespace reportdesign
SHAPE_HEADER()
// XShapeDescriptor
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
// XReportControlModel
REPORTCONTROLMODEL_HEADER()
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index 036417044a8a..1e06a772b3fa 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -40,18 +40,18 @@ namespace reportdesign
public FunctionBase,
public FunctionPropertySet
{
- com::sun::star::beans::Optional< ::rtl::OUString> m_sInitialFormula;
+ com::sun::star::beans::Optional< OUString> m_sInitialFormula;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctions > m_xParent;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_sFormula;
+ OUString m_sName;
+ OUString m_sFormula;
::sal_Bool m_bPreEvaluated;
::sal_Bool m_bDeepTraversing;
private:
OFunction(const OFunction&);
OFunction& operator=(const OFunction&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -70,34 +70,34 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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::report::XFunction:
virtual ::sal_Bool SAL_CALL getPreEvaluated() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPreEvaluated(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getDeepTraversing() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDeepTraversing(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setFormula(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException);
- virtual com::sun::star::beans::Optional< ::rtl::OUString> SAL_CALL getInitialFormula() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setInitialFormula(const com::sun::star::beans::Optional< ::rtl::OUString> & the_value) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setFormula(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::beans::Optional< OUString> SAL_CALL getInitialFormula() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setInitialFormula(const com::sun::star::beans::Optional< OUString> & the_value) throw (::com::sun::star::uno::RuntimeException);
// XComponent
virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index f6b6f0bd2a1b..b13d12b58c47 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -54,7 +54,7 @@ namespace reportdesign
OGroup& operator=(const OGroup&);
OGroup(const OGroup&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -69,9 +69,9 @@ namespace reportdesign
}
l.notify();
}
- void setSection( const ::rtl::OUString& _sProperty
+ void setSection( const OUString& _sProperty
,const sal_Bool& _bOn
- ,const ::rtl::OUString& _sName
+ ,const OUString& _sName
,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
@@ -91,20 +91,20 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) 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);
// XGroup
virtual ::sal_Bool SAL_CALL getSortAscending() throw (::com::sun::star::uno::RuntimeException);
@@ -122,8 +122,8 @@ namespace reportdesign
virtual ::sal_Int16 SAL_CALL getKeepTogether() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setKeepTogether( ::sal_Int16 _keeptogether ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > SAL_CALL getGroups() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getExpression() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setExpression( const ::rtl::OUString& _expression ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getExpression() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setExpression( const OUString& _expression ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getStartNewColumn() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getResetPageNumber() throw (::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index eb7fa10fa451..6d0f8a43235a 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -43,14 +43,14 @@ namespace reportdesign
{
friend class OShapeHelper;
OReportControlModel m_aProps;
- ::rtl::OUString m_aImageURL;
+ OUString m_aImageURL;
sal_Int16 m_nScaleMode;
::sal_Bool m_bPreserveIRI;
private:
OImageControl(const OImageControl&);
OImageControl& operator=(const OImageControl&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -73,22 +73,22 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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);
// XReportComponent
REPORTCOMPONENT_HEADER()
@@ -96,7 +96,7 @@ namespace reportdesign
SHAPE_HEADER()
// XShapeDescriptor
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
// XReportControlModel
REPORTCONTROLMODEL_HEADER()
@@ -108,8 +108,8 @@ namespace reportdesign
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException);
// XImageControl
- 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 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 ::sal_Bool SAL_CALL getPreserveIRI() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPreserveIRI( ::sal_Bool _preserveiri ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getScaleMode() throw (::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx
index e42941f216be..36bd9b80e5d6 100644
--- a/reportdesign/source/core/inc/ReportComponent.hxx
+++ b/reportdesign/source/core/inc/ReportComponent.hxx
@@ -47,9 +47,9 @@ namespace reportdesign
::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields;
- ::rtl::OUString m_sName;
+ ::com::sun::star::uno::Sequence< OUString > m_aMasterFields;
+ ::com::sun::star::uno::Sequence< OUString > m_aDetailFields;
+ OUString m_sName;
::sal_Int32 m_nHeight;
::sal_Int32 m_nWidth;
::sal_Int32 m_nPosX;
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index 43a8f73f89ca..445d5abac624 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -55,13 +55,13 @@ namespace reportdesign
::sal_Int32 nTextLineColor;
::sal_Int32 nCharUnderlineColor;
::sal_Int32 nBackgroundColor;
- ::rtl::OUString sCharCombinePrefix;
- ::rtl::OUString sCharCombineSuffix;
- ::rtl::OUString sHyperLinkURL;
- ::rtl::OUString sHyperLinkTarget;
- ::rtl::OUString sHyperLinkName;
- ::rtl::OUString sVisitedCharStyleName;
- ::rtl::OUString sUnvisitedCharStyleName;
+ OUString sCharCombinePrefix;
+ OUString sCharCombineSuffix;
+ OUString sHyperLinkURL;
+ OUString sHyperLinkTarget;
+ OUString sHyperLinkName;
+ OUString sVisitedCharStyleName;
+ OUString sUnvisitedCharStyleName;
com::sun::star::style::VerticalAlignment aVerticalAlignment;
::sal_Int16 nCharEscapement;
::sal_Int16 nCharCaseMap;
@@ -89,8 +89,8 @@ namespace reportdesign
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> >
m_aFormatConditions;
osl::Mutex& m_rMutex;
- ::rtl::OUString aDataField;
- ::rtl::OUString aConditionalPrintExpression;
+ OUString aDataField;
+ OUString aConditionalPrintExpression;
sal_Bool bPrintWhenGroupChange;
OReportControlModel(osl::Mutex& _rMutex
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index ea4abcfab3fb..7dc478d2db22 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -41,7 +41,7 @@ namespace reportdesign
public ReportEngineBase,
public ReportEnginePropertySet
{
- typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap;
+ typedef ::std::multimap< OUString, ::com::sun::star::uno::Any , ::comphelper::UStringMixLess> TComponentMap;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport;
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> m_StatusIndicator;
@@ -50,7 +50,7 @@ namespace reportdesign
private:
OReportEngineJFree(const OReportEngineJFree&);
OReportEngineJFree& operator=(const OReportEngineJFree&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -67,7 +67,7 @@ namespace reportdesign
*
* \return The new file url.
*/
- ::rtl::OUString getNewOutputName();
+ OUString getNewOutputName();
protected:
// TODO: VirtualFunctionFinder: This is virtual function!
@@ -80,23 +80,23 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
private:
// 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);
// XReportEngine
// Attributes
diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx
index 1734998d3c95..2522e5a2d065 100644
--- a/reportdesign/source/core/inc/ReportHelperImpl.hxx
+++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx
@@ -20,12 +20,12 @@
#define INCLUDED_REPORTHELPERIMPL_HXX
// ::com::sun::star::report::XReportComponent:
#define REPORTCOMPONENT_IMPL3(clazz,arg) \
-::rtl::OUString SAL_CALL clazz::getName() throw (uno::RuntimeException) \
+OUString SAL_CALL clazz::getName() throw (uno::RuntimeException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return (arg).m_sName; \
} \
-void SAL_CALL clazz::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException,beans::PropertyVetoException) \
+void SAL_CALL clazz::setName( const OUString& _name ) throw (uno::RuntimeException,beans::PropertyVetoException) \
{ \
set(PROPERTY_NAME,_name,(arg).m_sName); \
} \
@@ -109,41 +109,41 @@ void SAL_CALL clazz::setControlBorderColor( ::sal_Int32 _bordercolor ) throw (un
}
#define REPORTCOMPONENT_MASTERDETAIL(clazz,arg) \
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \
+::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return (arg).m_aMasterFields; \
} \
-void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
set(PROPERTY_MASTERFIELDS,_masterfields,(arg).m_aMasterFields); \
} \
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return (arg).m_aDetailFields; \
} \
-void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
set(PROPERTY_DETAILFIELDS,_detailfields,(arg).m_aDetailFields); \
}
#define REPORTCOMPONENT_NOMASTERDETAIL(clazz) \
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \
+::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) \
{ \
throw ::com::sun::star::beans::UnknownPropertyException();\
} \
-void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
throw ::com::sun::star::beans::UnknownPropertyException();\
} \
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+::com::sun::star::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
throw ::com::sun::star::beans::UnknownPropertyException();\
} \
-void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
throw ::com::sun::star::beans::UnknownPropertyException();\
}
@@ -330,24 +330,24 @@ void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 _charemphasis ) throw (beans::
set(PROPERTY_CHAREMPHASIS,_charemphasis,varName.nFontEmphasisMark); \
} \
\
-::rtl::OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException) \
+OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.aFontDescriptor.Name; \
} \
\
-void SAL_CALL clazz::setCharFontName( const ::rtl::OUString& _charfontname ) throw (beans::UnknownPropertyException, uno::RuntimeException) \
+void SAL_CALL clazz::setCharFontName( const OUString& _charfontname ) throw (beans::UnknownPropertyException, uno::RuntimeException) \
{ \
set(PROPERTY_CHARFONTNAME,_charfontname,varName.aFontDescriptor.Name); \
} \
\
-::rtl::OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException) \
+OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.aFontDescriptor.StyleName; \
} \
\
-void SAL_CALL clazz::setCharFontStyleName( const ::rtl::OUString& _charfontstylename ) throw (beans::UnknownPropertyException, uno::RuntimeException) \
+void SAL_CALL clazz::setCharFontStyleName( const OUString& _charfontstylename ) throw (beans::UnknownPropertyException, uno::RuntimeException) \
{ \
set(PROPERTY_CHARFONTSTYLENAME,_charfontstylename,varName.aFontDescriptor.StyleName); \
} \
@@ -502,21 +502,21 @@ void SAL_CALL clazz::setCharCombineIsOn(::sal_Bool the_value) throw (uno::Runtim
{ \
set(PROPERTY_CHARCOMBINEISON,the_value,varName.bCharCombineIsOn); \
}\
-::rtl::OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sCharCombinePrefix; \
} \
-void SAL_CALL clazz::setCharCombinePrefix(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setCharCombinePrefix(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_CHARCOMBINEPREFIX,the_value,varName.sCharCombinePrefix); \
}\
-::rtl::OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sCharCombineSuffix; \
} \
-void SAL_CALL clazz::setCharCombineSuffix(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setCharCombineSuffix(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_CHARCOMBINESUFFIX,the_value,varName.sCharCombineSuffix); \
}\
@@ -547,48 +547,48 @@ void SAL_CALL clazz::setCharContoured(::sal_Bool the_value) throw (uno::RuntimeE
{ \
set(PROPERTY_CHARCONTOURED,the_value,varName.bCharContoured); \
}\
-::rtl::OUString SAL_CALL clazz::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sHyperLinkURL; \
} \
-void SAL_CALL clazz::setHyperLinkURL(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setHyperLinkURL(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_HYPERLINKURL,the_value,varName.sHyperLinkURL); \
}\
-::rtl::OUString SAL_CALL clazz::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sHyperLinkTarget; \
} \
-void SAL_CALL clazz::setHyperLinkTarget(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setHyperLinkTarget(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_HYPERLINKTARGET,the_value,varName.sHyperLinkTarget); \
}\
-::rtl::OUString SAL_CALL clazz::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sHyperLinkName; \
} \
-void SAL_CALL clazz::setHyperLinkName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setHyperLinkName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_HYPERLINKNAME,the_value,varName.sHyperLinkName); \
}\
-::rtl::OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sVisitedCharStyleName; \
} \
-void SAL_CALL clazz::setVisitedCharStyleName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setVisitedCharStyleName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_VISITEDCHARSTYLENAME,the_value,varName.sVisitedCharStyleName); \
}\
-::rtl::OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.sUnvisitedCharStyleName; \
} \
-void SAL_CALL clazz::setUnvisitedCharStyleName(const ::rtl::OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
set(PROPERTY_UNVISITEDCHARSTYLENAME,the_value,varName.sUnvisitedCharStyleName); \
}\
@@ -619,21 +619,21 @@ void SAL_CALL clazz::setCharWeightAsian( float the_value ) throw (::com::sun::st
{ \
set(PROPERTY_CHARWEIGHTASIAN,the_value,varName.aAsianFontDescriptor.Weight); \
}\
-::rtl::OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.aAsianFontDescriptor.Name; \
}\
-void SAL_CALL clazz::setCharFontNameAsian( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setCharFontNameAsian( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
set(PROPERTY_CHARFONTNAMEASIAN,the_value,varName.aAsianFontDescriptor.Name); \
}\
-::rtl::OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.aAsianFontDescriptor.StyleName; \
}\
-void SAL_CALL clazz::setCharFontStyleNameAsian( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
set(PROPERTY_CHARFONTSTYLENAMEASIAN,the_value,varName.aAsianFontDescriptor.StyleName); \
}\
@@ -711,21 +711,21 @@ void SAL_CALL clazz::setCharWeightComplex( float the_value ) throw (::com::sun::
{ \
set(PROPERTY_CHARWEIGHTCOMPLEX,the_value,varName.aComplexFontDescriptor.Weight); \
}\
-::rtl::OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.aComplexFontDescriptor.Name; \
}\
-void SAL_CALL clazz::setCharFontNameComplex( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setCharFontNameComplex( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
set(PROPERTY_CHARFONTNAMECOMPLEX,the_value,varName.aComplexFontDescriptor.Name); \
}\
-::rtl::OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
::osl::MutexGuard aGuard(m_aMutex); \
return varName.aComplexFontDescriptor.StyleName; \
}\
-void SAL_CALL clazz::setCharFontStyleNameComplex( const ::rtl::OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& the_value ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{ \
set(PROPERTY_CHARFONTSTYLENAMECOMPLEX,the_value,varName.aComplexFontDescriptor.StyleName); \
}\
@@ -884,19 +884,19 @@ void SAL_CALL clazz::setCharCombineIsOn(::sal_Bool /*the_value*/) throw (uno::Ru
{ \
throw beans::UnknownPropertyException();\
}\
-::rtl::OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
} \
-void SAL_CALL clazz::setCharCombinePrefix(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setCharCombinePrefix(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
}\
-::rtl::OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
} \
-void SAL_CALL clazz::setCharCombineSuffix(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setCharCombineSuffix(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
}\
@@ -924,19 +924,19 @@ void SAL_CALL clazz::setCharContoured(::sal_Bool /*the_value*/) throw (uno::Runt
{ \
throw beans::UnknownPropertyException();\
}\
-::rtl::OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
} \
-void SAL_CALL clazz::setVisitedCharStyleName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setVisitedCharStyleName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
}\
-::rtl::OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
+OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
} \
-void SAL_CALL clazz::setUnvisitedCharStyleName(const ::rtl::OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
+void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException) \
{ \
throw beans::UnknownPropertyException();\
}\
@@ -1038,22 +1038,22 @@ void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 /*_charemphasis*/ ) throw (bea
throw beans::UnknownPropertyException();\
}\
\
-::rtl::OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException)\
+OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
\
-void SAL_CALL clazz::setCharFontName( const ::rtl::OUString& /*_charfontname*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\
+void SAL_CALL clazz::setCharFontName( const OUString& /*_charfontname*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
\
-::rtl::OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException)\
+OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
\
-void SAL_CALL clazz::setCharFontStyleName( const ::rtl::OUString& /*_charfontstylename*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\
+void SAL_CALL clazz::setCharFontStyleName( const OUString& /*_charfontstylename*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
@@ -1143,19 +1143,19 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be
{\
throw beans::UnknownPropertyException();\
}\
- ::rtl::OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ OUString SAL_CALL clazz::getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
- void SAL_CALL clazz::setCharFontNameAsian( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL clazz::setCharFontNameAsian( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
- ::rtl::OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
- void SAL_CALL clazz::setCharFontStyleNameAsian( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
@@ -1215,19 +1215,19 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be
{\
throw beans::UnknownPropertyException();\
}\
- ::rtl::OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ OUString SAL_CALL clazz::getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
- void SAL_CALL clazz::setCharFontNameComplex( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL clazz::setCharFontNameComplex( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
- ::rtl::OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
- void SAL_CALL clazz::setCharFontStyleNameComplex( const ::rtl::OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)\
{\
throw beans::UnknownPropertyException();\
}\
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index c117126d1d27..f6311191bab7 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -61,8 +61,8 @@ namespace reportdesign
::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xDrawPage_Tunnel;
::com::sun::star::uno::WeakReference< ::com::sun::star::report::XGroup > m_xGroup;
::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xReportDefinition;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_sConditionalPrintExpression;
+ OUString m_sName;
+ OUString m_sConditionalPrintExpression;
::sal_uInt32 m_nHeight;
::sal_Int32 m_nBackgroundColor;
::sal_Int16 m_nForceNewPage;
@@ -80,7 +80,7 @@ namespace reportdesign
OSection(const OSection&);
OSection& operator=(const OSection&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -119,7 +119,7 @@ namespace reportdesign
OSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& xParentDef
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& xParentGroup
,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context,
- ::com::sun::star::uno::Sequence< ::rtl::OUString> const&);
+ ::com::sun::star::uno::Sequence< OUString> const&);
public:
static ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>
createOSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xParent
@@ -131,33 +131,33 @@ namespace reportdesign
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) 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);
// XSection
virtual ::sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getName() 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() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& _name ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_uInt32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setHeight( ::sal_uInt32 _height ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getBackColor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setBackColor( ::sal_Int32 _backgroundcolor ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getBackTransparent() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setBackTransparent( ::sal_Bool _backtransparent ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setConditionalPrintExpression( const ::rtl::OUString& _conditionalprintexpression ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getForceNewPage() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setForceNewPage( ::sal_Int16 _forcenewpage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getNewRowOrCol() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
@@ -173,8 +173,8 @@ namespace reportdesign
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const ::rtl::OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException);
// 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);
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 314c8381a301..463843f72bc6 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -50,9 +50,9 @@ namespace reportdesign
::sal_Int32 m_nZOrder;
::sal_Bool m_bOpaque;
- ::rtl::OUString m_sServiceName;
- ::rtl::OUString m_CustomShapeEngine;
- ::rtl::OUString m_CustomShapeData;
+ OUString m_sServiceName;
+ OUString m_CustomShapeEngine;
+ OUString m_CustomShapeData;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
m_CustomShapeGeometry;
@@ -60,7 +60,7 @@ namespace reportdesign
OShape(const OShape&);
OShape& operator=(const OShape&);
- template <typename T> void set( const ::rtl::OUString& _sProperty
+ template <typename T> void set( const OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -81,26 +81,26 @@ namespace reportdesign
explicit OShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory
,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape
- ,const ::rtl::OUString& _sServiceName);
+ ,const OUString& _sServiceName);
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::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);
- 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 & xContext);
// 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);
// XReportComponent
REPORTCOMPONENT_HEADER()
@@ -108,10 +108,10 @@ namespace reportdesign
// XShape
SHAPE_HEADER()
- virtual ::rtl::OUString SAL_CALL getCustomShapeEngine() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setCustomShapeEngine( const ::rtl::OUString& _customshapeengine ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCustomShapeData() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setCustomShapeData( const ::rtl::OUString& _customshapedata ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCustomShapeEngine() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setCustomShapeEngine( const OUString& _customshapeengine ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCustomShapeData() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setCustomShapeData( const OUString& _customshapedata ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCustomShapeGeometry() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setCustomShapeGeometry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _customshapegeometry ) throw (::com::sun::star::uno::RuntimeException);
@@ -119,7 +119,7 @@ namespace reportdesign
virtual void SAL_CALL setOpaque( ::sal_Bool _opaque ) 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);
// XReportControlModel
REPORTCONTROLMODEL_HEADER()
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 94d6a4d28a26..c9210ba61d3a 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -47,7 +47,7 @@ namespace reportdesign
*
* \return A sequence of all properties which should be removed for none char able implementations.
*/
- ::com::sun::star::uno::Sequence< ::rtl::OUString > lcl_getCharOptionals();
+ ::com::sun::star::uno::Sequence< OUString > lcl_getCharOptionals();
/** uses the XChild interface to get the section from any child of it.
*
@@ -63,7 +63,7 @@ namespace reportdesign
* \param ArgumentPosition_ The argument position.
* \param Context_ The context to get the factory service.
*/
- void throwIllegallArgumentException(const ::rtl::OUString& _sTypeName
+ void throwIllegallArgumentException(const OUString& _sTypeName
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& ExceptionContext_
,const ::sal_Int16& ArgumentPosition_
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context_);
@@ -78,7 +78,7 @@ namespace reportdesign
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > cloneObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xReportComponent
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xFactory
- ,const ::rtl::OUString& _sServiceName);
+ ,const OUString& _sServiceName);
class OShapeHelper
{
diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx
index 4508769a73fe..d679a26321ce 100644
--- a/reportdesign/source/core/inc/conditionupdater.hxx
+++ b/reportdesign/source/core/inc/conditionupdater.hxx
@@ -50,8 +50,8 @@ namespace rptui
void impl_adjustFormatConditions_nothrow(
const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel >& _rxRptControlModel,
- const ::rtl::OUString& _rOldDataSource,
- const ::rtl::OUString& _rNewDataSource
+ const OUString& _rOldDataSource,
+ const OUString& _rNewDataSource
);
private:
diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx
index 468cabb9fea3..80422e3c9200 100644
--- a/reportdesign/source/core/inc/core_resource.hxx
+++ b/reportdesign/source/core/inc/core_resource.hxx
@@ -59,7 +59,7 @@ namespace reportdesign
public:
/** loads the string with the specified resource id from the FormLayer resource file
*/
- static ::rtl::OUString loadString(sal_uInt16 _nResId,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM);
+ static OUString loadString(sal_uInt16 _nResId,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& _rM);
};
//.........................................................................
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index 8b3776c76a61..2a278a9a13fd 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -26,19 +26,19 @@ namespace rptui
// =============================================================================
// -----------------------------------------------------------------------------
ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern )
- :m_sPattern( ::rtl::OUString::createFromAscii( _pAsciiPattern ) )
+ :m_sPattern( OUString::createFromAscii( _pAsciiPattern ) )
{
}
// -----------------------------------------------------------------------------
- ::rtl::OUString ConditionalExpression::assembleExpression( const ::rtl::OUString& _rFieldDataSource, const ::rtl::OUString& _rLHS, const ::rtl::OUString& _rRHS ) const
+ OUString ConditionalExpression::assembleExpression( const OUString& _rFieldDataSource, const OUString& _rLHS, const OUString& _rRHS ) const
{
- ::rtl::OUString sExpression( m_sPattern );
+ OUString sExpression( m_sPattern );
sal_Int32 nPatternIndex = sExpression.indexOf( '$' );
while ( nPatternIndex > -1 )
{
- const ::rtl::OUString* pReplace = NULL;
+ const OUString* pReplace = NULL;
switch ( sExpression.getStr()[ nPatternIndex + 1 ] )
{
case '$': pReplace = &_rFieldDataSource; break;
@@ -60,7 +60,7 @@ namespace rptui
}
// -----------------------------------------------------------------------------
- bool ConditionalExpression::matchExpression( const ::rtl::OUString& _rExpression, const ::rtl::OUString& _rFieldDataSource, ::rtl::OUString& _out_rLHS, ::rtl::OUString& _out_rRHS ) const
+ bool ConditionalExpression::matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const
{
(void)_rExpression;
(void)_rFieldDataSource;
@@ -72,8 +72,8 @@ namespace rptui
// Unfortunately, we don't have such a regexp engine ...
// Okay, let's start with replacing all $$ in our pattern with the actual field data source
- ::rtl::OUString sMatchExpression( m_sPattern );
- const ::rtl::OUString sFieldDataPattern( "$$" );
+ OUString sMatchExpression( m_sPattern );
+ const OUString sFieldDataPattern( "$$" );
sal_Int32 nIndex( sMatchExpression.indexOf( sFieldDataPattern ) );
while ( nIndex != -1 )
{
@@ -81,8 +81,8 @@ namespace rptui
nIndex = sMatchExpression.indexOf( sFieldDataPattern, nIndex + _rFieldDataSource.getLength() );
}
- const ::rtl::OUString sLHSPattern( "$1" );
- const ::rtl::OUString sRHSPattern( "$2" );
+ const OUString sLHSPattern( "$1" );
+ const OUString sRHSPattern( "$2" );
sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) );
sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) );
@@ -99,8 +99,8 @@ namespace rptui
// must be identical
if ( _rExpression.getLength() < nLHSIndex )
return false;
- const ::rtl::OUString sExprPart1( _rExpression.copy( 0, nLHSIndex ) );
- const ::rtl::OUString sMatchExprPart1( sMatchExpression.copy( 0, nLHSIndex ) );
+ const OUString sExprPart1( _rExpression.copy( 0, nLHSIndex ) );
+ const OUString sMatchExprPart1( sMatchExpression.copy( 0, nLHSIndex ) );
if ( sExprPart1 != sMatchExprPart1 )
// the left-most expression parts do not match
return false;
@@ -109,11 +109,11 @@ namespace rptui
// must be identical, too
bool bHaveRHS( nRHSIndex != -1 );
sal_Int32 nRightMostIndex( bHaveRHS ? nRHSIndex : nLHSIndex );
- const ::rtl::OUString sMatchExprPart3( sMatchExpression.copy( nRightMostIndex + 2 ) );
+ const OUString sMatchExprPart3( sMatchExpression.copy( nRightMostIndex + 2 ) );
if ( _rExpression.getLength() < sMatchExprPart3.getLength() )
// the expression is not even long enough to hold the right-most part of the match expression
return false;
- const ::rtl::OUString sExprPart3( _rExpression.copy( _rExpression.getLength() - sMatchExprPart3.getLength() ) );
+ const OUString sExprPart3( _rExpression.copy( _rExpression.getLength() - sMatchExprPart3.getLength() ) );
if ( sExprPart3 != sMatchExprPart3 )
// the right-most expression parts do not match
return false;
@@ -127,12 +127,12 @@ namespace rptui
// strip the match expression by its right-most and left-most part, and by the placeholders $1 and $2
sal_Int32 nMatchExprPart2Start( nLHSIndex + sLHSPattern.getLength() );
- ::rtl::OUString sMatchExprPart2 = sMatchExpression.copy(
+ OUString sMatchExprPart2 = sMatchExpression.copy(
nMatchExprPart2Start,
sMatchExpression.getLength() - nMatchExprPart2Start - sMatchExprPart3.getLength() - 2
);
// strip the expression by its left-most and right-most part
- const ::rtl::OUString sExpression( _rExpression.copy(
+ const OUString sExpression( _rExpression.copy(
sExprPart1.getLength(),
_rExpression.getLength() - sExprPart1.getLength() - sExprPart3.getLength()
) );
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index 9a0456221dfe..b14d4ad2966b 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -58,7 +58,7 @@ namespace rptui
Reference< XReportControlModel > xRptControlModel( _rEvent.Source, UNO_QUERY );
if ( xRptControlModel.is() && _rEvent.PropertyName == "DataField" )
{
- ::rtl::OUString sOldDataSource, sNewDataSource;
+ OUString sOldDataSource, sNewDataSource;
OSL_VERIFY( _rEvent.OldValue >>= sOldDataSource );
OSL_VERIFY( _rEvent.NewValue >>= sNewDataSource );
impl_adjustFormatConditions_nothrow( xRptControlModel, sOldDataSource, sNewDataSource );
@@ -77,18 +77,18 @@ namespace rptui
//--------------------------------------------------------------------
void ConditionUpdater::impl_adjustFormatConditions_nothrow( const Reference< XReportControlModel >& _rxRptControlModel,
- const ::rtl::OUString& _rOldDataSource, const ::rtl::OUString& _rNewDataSource )
+ const OUString& _rOldDataSource, const OUString& _rNewDataSource )
{
try
{
ReportFormula aOldContentFormula( _rOldDataSource );
- ::rtl::OUString sOldUnprefixed( aOldContentFormula.getBracketedFieldOrExpression() );
+ OUString sOldUnprefixed( aOldContentFormula.getBracketedFieldOrExpression() );
ReportFormula aNewContentFormula( _rNewDataSource );
- ::rtl::OUString sNewUnprefixed( aNewContentFormula.getBracketedFieldOrExpression() );
+ OUString sNewUnprefixed( aNewContentFormula.getBracketedFieldOrExpression() );
sal_Int32 nCount( _rxRptControlModel->getCount() );
Reference< XFormatCondition > xFormatCondition;
- ::rtl::OUString sFormulaExpression, sLHS, sRHS;
+ OUString sFormulaExpression, sLHS, sRHS;
for ( sal_Int32 i=0; i<nCount; ++i )
{
xFormatCondition.set( _rxRptControlModel->getByIndex( i ), UNO_QUERY_THROW );
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index be73a0aa3be7..94158d8d00eb 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -31,18 +31,18 @@ namespace rptui
namespace
{
//----------------------------------------------------------------
- const ::rtl::OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL )
+ const OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL )
{
- static ::rtl::OUString s_sPrefix( "rpt:" );
+ static OUString s_sPrefix( "rpt:" );
if ( _pTakeLengthOrNull )
*_pTakeLengthOrNull = s_sPrefix.getLength();
return s_sPrefix;
}
//----------------------------------------------------------------
- const ::rtl::OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL )
+ const OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL )
{
- static ::rtl::OUString s_sPrefix( "field:" );
+ static OUString s_sPrefix( "field:" );
if ( _pTakeLengthOrNull )
*_pTakeLengthOrNull = s_sPrefix.getLength();
return s_sPrefix;
@@ -53,14 +53,14 @@ namespace rptui
//= ReportFormula
//====================================================================
//--------------------------------------------------------------------
- ReportFormula::ReportFormula( const ::rtl::OUString& _rFormula )
+ ReportFormula::ReportFormula( const OUString& _rFormula )
:m_eType( Invalid )
{
impl_construct( _rFormula );
}
//--------------------------------------------------------------------
- ReportFormula::ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression )
+ ReportFormula::ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression )
:m_eType( _eType )
{
switch ( m_eType )
@@ -76,7 +76,7 @@ namespace rptui
case Field:
{
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
aBuffer.append( lcl_getFieldPrefix() );
aBuffer.appendAscii( "[" );
aBuffer.append( _rFieldOrExpression );
@@ -96,7 +96,7 @@ namespace rptui
{
}
//--------------------------------------------------------------------
- void ReportFormula::impl_construct( const ::rtl::OUString& _rFormula )
+ void ReportFormula::impl_construct( const OUString& _rFormula )
{
m_sCompleteFormula = _rFormula;
@@ -127,10 +127,10 @@ namespace rptui
}
//--------------------------------------------------------------------
- ::rtl::OUString ReportFormula::getBracketedFieldOrExpression() const
+ OUString ReportFormula::getBracketedFieldOrExpression() const
{
bool bIsField = ( getType() == Field );
- ::rtl::OUStringBuffer aFieldContent;
+ OUStringBuffer aFieldContent;
if ( bIsField )
aFieldContent.appendAscii( "[" );
aFieldContent.append( getUndecoratedContent() );
@@ -140,11 +140,11 @@ namespace rptui
return aFieldContent.makeStringAndClear();
}
//--------------------------------------------------------------------
- const ::rtl::OUString& ReportFormula::getUndecoratedContent() const
+ const OUString& ReportFormula::getUndecoratedContent() const
{
return m_sUndecoratedContent;
}
- const ::rtl::OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; }
+ const OUString& ReportFormula::getCompleteFormula() const { return m_sCompleteFormula; }
bool ReportFormula::isValid() const { return getType() != Invalid; }
ReportFormula& ReportFormula::operator=(class ReportFormula const & _rHd)
{
@@ -156,9 +156,9 @@ namespace rptui
return *this;
}
//--------------------------------------------------------------------
- ::rtl::OUString ReportFormula::getEqualUndecoratedContent() const
+ OUString ReportFormula::getEqualUndecoratedContent() const
{
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
aBuffer.appendAscii( "=" );
aBuffer.append( getUndecoratedContent() );
return aBuffer.makeStringAndClear();
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 0abc584d5017..dab14578f8b3 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -59,9 +59,9 @@ namespace reportdesign
}
//------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId,const uno::Reference< lang::XMultiComponentFactory >& _rM)
+ OUString ResourceManager::loadString(sal_uInt16 _nResId,const uno::Reference< lang::XMultiComponentFactory >& _rM)
{
- ::rtl::OUString sReturn;
+ OUString sReturn;
ensureImplExists(_rM);
if (m_pImpl)
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 5c1ee6a8b10e..42abfe421be1 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -115,7 +115,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
else
{
TPropertyNamePair::iterator aFind = m_aNameMap.find(evt.PropertyName);
- ::rtl::OUString sPropName;
+ OUString sPropName;
if ( aFind != m_aNameMap.end() )
sPropName = aFind->second.first;
else
@@ -124,7 +124,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
m_aNameMap.begin(),
m_aNameMap.end(),
::o3tl::compose1(
- ::std::bind2nd(::std::equal_to< ::rtl::OUString >(), evt.PropertyName),
+ ::std::bind2nd(::std::equal_to< OUString >(), evt.PropertyName),
::o3tl::compose1(::o3tl::select1st<TPropertyConverter>(),::o3tl::select2nd<TPropertyNamePair::value_type>())
)
);
@@ -179,17 +179,17 @@ void SAL_CALL OPropertyMediator::disposing()
void OPropertyMediator::stopListening()
{
if ( m_xSource.is() )
- m_xSource->removePropertyChangeListener(::rtl::OUString(), this);
+ m_xSource->removePropertyChangeListener(OUString(), this);
if ( m_xDest.is() )
- m_xDest->removePropertyChangeListener(::rtl::OUString(), this);
+ m_xDest->removePropertyChangeListener(OUString(), this);
}
// -----------------------------------------------------------------------------
void OPropertyMediator::startListening()
{
if ( m_xSource.is() )
- m_xSource->addPropertyChangeListener(::rtl::OUString(), this);
+ m_xSource->addPropertyChangeListener(OUString(), this);
if ( m_xDest.is() )
- m_xDest->addPropertyChangeListener(::rtl::OUString(), this);
+ m_xDest->addPropertyChangeListener(OUString(), this);
}
// -----------------------------------------------------------------------------
//........................................................................
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 9e44dc25910c..b2cbb2160bea 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -69,7 +69,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
if ( xFactory.is() )
{
bool bChangeOrientation = false;
- ::rtl::OUString sServiceName = pBaseObj->getServiceName();
+ OUString sServiceName = pBaseObj->getServiceName();
OSL_ENSURE(!sServiceName.isEmpty(),"No Service Name given!");
if ( pObj->ISA(OUnoObject) )
@@ -101,10 +101,10 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
{
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
uno::Reference < embed::XEmbeddedObject > xObj;
- ::rtl::OUString sName;
+ OUString sName;
xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject(
::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation(
- ::rtl::OUString("80243D39-6741-46C5-926E-069164FF87BB")), sName );
+ OUString("80243D39-6741-46C5-926E-069164FF87BB")), sName );
OSL_ENSURE(xObj.is(),"Embedded Object could not be created!");
/**************************************************
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 1e7ddbfbf3a9..43600f3dfa59 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -151,7 +151,7 @@ uno::Reference< uno::XInterface > OReportModel::createUnoModel()
return uno::Reference< uno::XInterface >(getReportDefinition(),uno::UNO_QUERY);
}
// -----------------------------------------------------------------------------
-uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUString& aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation)
+uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation)
{
uno::Reference< uno::XInterface > xRet;
if ( _rShape.is() )
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 05af0253be91..43dc1817d423 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -99,7 +99,7 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo
return OBJ_DLG_IMAGECONTROL;
if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ))
return OBJ_DLG_FORMATTEDFIELD;
- if ( xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.drawing.OLE2Shape") ) )
+ if ( xServiceInfo->supportsService( OUString("com.sun.star.drawing.OLE2Shape") ) )
return OBJ_OLE2;
if ( xServiceInfo->supportsService( SERVICE_SHAPE ))
return OBJ_CUSTOMSHAPE;
@@ -119,7 +119,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
case OBJ_DLG_FIXEDTEXT:
{
OUnoObject* pUnoObj = new OUnoObject( _xComponent
- ,::rtl::OUString("com.sun.star.form.component.FixedText")
+ ,OUString("com.sun.star.form.component.FixedText")
,OBJ_DLG_FIXEDTEXT);
pNewObj = pUnoObj;
@@ -130,18 +130,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
break;
case OBJ_DLG_IMAGECONTROL:
pNewObj = new OUnoObject(_xComponent
- ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl")
+ ,OUString("com.sun.star.form.component.DatabaseImageControl")
,OBJ_DLG_IMAGECONTROL);
break;
case OBJ_DLG_FORMATTEDFIELD:
pNewObj = new OUnoObject( _xComponent
- ,::rtl::OUString("com.sun.star.form.component.FormattedField")
+ ,OUString("com.sun.star.form.component.FormattedField")
,OBJ_DLG_FORMATTEDFIELD);
break;
case OBJ_DLG_HFIXEDLINE:
case OBJ_DLG_VFIXEDLINE:
pNewObj = new OUnoObject( _xComponent
- ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel")
+ ,OUString("com.sun.star.awt.UnoControlFixedLineModel")
,nType);
break;
case OBJ_CUSTOMSHAPE:
@@ -176,7 +176,7 @@ namespace
class ParaAdjust : public AnyConverter
{
public:
- virtual ::com::sun::star::uno::Any operator() (const ::rtl::OUString& _sPropertyName,const ::com::sun::star::uno::Any& lhs) const
+ virtual ::com::sun::star::uno::Any operator() (const OUString& _sPropertyName,const ::com::sun::star::uno::Any& lhs) const
{
uno::Any aRet;
if (_sPropertyName.equalsAsciiL(PROPERTY_PARAADJUST.ascii, PROPERTY_PARAADJUST.length))
@@ -293,7 +293,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
if ( s_aNameMap.empty() )
{
::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
- s_aNameMap.insert(TPropertyNamePair::value_type(::rtl::OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)));
+ s_aNameMap.insert(TPropertyNamePair::value_type(OUString("FillColor"),TPropertyConverter(PROPERTY_CONTROLBACKGROUND,aNoConverter)));
s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter)));
}
return s_aNameMap;
@@ -315,7 +315,7 @@ OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComp
m_xReportComponent = _xComponent;
}
//----------------------------------------------------------------------------
-OObjectBase::OObjectBase(const ::rtl::OUString& _sComponentName)
+OObjectBase::OObjectBase(const OUString& _sComponentName)
:m_sComponentName(_sComponentName)
,m_bIsListening(sal_False)
{
@@ -363,7 +363,7 @@ void OObjectBase::StartListening()
{
m_xPropertyChangeListener = new OObjectListener( this );
// register listener to all properties
- m_xReportComponent->addPropertyChangeListener( ::rtl::OUString() , m_xPropertyChangeListener );
+ m_xReportComponent->addPropertyChangeListener( OUString() , m_xPropertyChangeListener );
}
}
}
@@ -382,7 +382,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
// remove listener
try
{
- m_xReportComponent->removePropertyChangeListener( ::rtl::OUString() , m_xPropertyChangeListener );
+ m_xReportComponent->removePropertyChangeListener( OUString() , m_xPropertyChangeListener );
}
catch(const uno::Exception &)
{
@@ -422,7 +422,7 @@ void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/)
}
//----------------------------------------------------------------------------
-sal_Bool OObjectBase::supportsService( const ::rtl::OUString& _sServiceName ) const
+sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const
{
DBG_CHKTHIS( rpt_OObjectBase,NULL);
sal_Bool bSupports = sal_False;
@@ -486,7 +486,7 @@ OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xCo
m_bIsListening = sal_True;
}
//----------------------------------------------------------------------------
-OCustomShape::OCustomShape(const ::rtl::OUString& _sComponentName)
+OCustomShape::OCustomShape(const OUString& _sComponentName)
:SdrObjCustomShape()
,OObjectBase(_sComponentName)
{
@@ -614,8 +614,8 @@ uno::Reference< uno::XInterface > OCustomShape::getUnoShape()
TYPEINIT1(OUnoObject, SdrUnoObj);
DBG_NAME( rpt_OUnoObject );
//----------------------------------------------------------------------------
-OUnoObject::OUnoObject(const ::rtl::OUString& _sComponentName
- ,const ::rtl::OUString& rModelName
+OUnoObject::OUnoObject(const OUString& _sComponentName
+ ,const OUString& rModelName
,sal_uInt16 _nObjectType)
:SdrUnoObj(rModelName, sal_True)
,OObjectBase(_sComponentName)
@@ -627,7 +627,7 @@ OUnoObject::OUnoObject(const ::rtl::OUString& _sComponentName
}
//----------------------------------------------------------------------------
OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xComponent
- ,const ::rtl::OUString& rModelName
+ ,const OUString& rModelName
,sal_uInt16 _nObjectType)
:SdrUnoObj(rModelName, sal_True)
,OObjectBase(_xComponent)
@@ -654,7 +654,7 @@ void OUnoObject::impl_initializeModel_nothrow()
if ( xFormatted.is() )
{
const Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
- const ::rtl::OUString sTreatAsNumberProperty = ::rtl::OUString( "TreatAsNumber" );
+ const OUString sTreatAsNumberProperty = OUString( "TreatAsNumber" );
xModelProps->setPropertyValue( sTreatAsNumberProperty, makeAny( sal_False ) );
xModelProps->setPropertyValue( PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN));
}
@@ -823,10 +823,10 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
return bResult;
}
//----------------------------------------------------------------------------
-::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
+OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
{
sal_uInt16 nResId = 0;
- ::rtl::OUString aDefaultName = ::rtl::OUString("HERE WE HAVE TO INSERT OUR NAME!");
+ OUString aDefaultName = OUString("HERE WE HAVE TO INSERT OUR NAME!");
if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) )
{
nResId = RID_STR_CLASS_FIXEDTEXT;
@@ -845,7 +845,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
}
if (nResId)
- aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) );
+ aDefaultName = OUString( String(ModuleRes(nResId)) );
return aDefaultName;
}
@@ -879,11 +879,11 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw
if ( xControlModel.is() && xControlModel->getPropertySetInfo()->hasPropertyByName(PROPERTY_NAME) )
{
// get old name
- ::rtl::OUString aOldName;
+ OUString aOldName;
evt.OldValue >>= aOldName;
// get new name
- ::rtl::OUString aNewName;
+ OUString aNewName;
evt.NewValue >>= aNewName;
if ( !aNewName.equals(aOldName) )
@@ -967,7 +967,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,
m_bIsListening = sal_True;
}
//----------------------------------------------------------------------------
-OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType)
+OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
:SdrOle2Obj()
,OObjectBase(_sComponentName)
,m_nType(_nType)
@@ -1191,7 +1191,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod
if( xReceiver.is() )
{
uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY);
- uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString("com.sun.star.chart2.data.DataProvider")),uno::UNO_QUERY);
+ uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(OUString("com.sun.star.chart2.data.DataProvider")),uno::UNO_QUERY);
xReceiver->attachDataProvider( xDataProvider.get() );
}
}
@@ -1214,7 +1214,7 @@ void OOle2Obj::initializeOle()
{
uno::Reference< beans::XPropertySet > xChartProps( xCompSupp->getComponent(), uno::UNO_QUERY );
if ( xChartProps.is() )
- xChartProps->setPropertyValue(::rtl::OUString("NullDate"),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900)));
+ xChartProps->setPropertyValue(OUString("NullDate"),uno::makeAny(util::DateTime(0,0,0,0,1,1,1900)));
}
}
}
@@ -1241,7 +1241,7 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj));
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) );
+ aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) );
aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
@@ -1255,12 +1255,12 @@ void OOle2Obj::initializeChart( const uno::Reference< frame::XModel>& _xModel)
uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XReportDefinition>& _xReport)
{
uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies();
- uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString("PageStyles")),uno::UNO_QUERY);
+ uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(OUString("PageStyles")),uno::UNO_QUERY);
uno::Reference< style::XStyle> xReturn;
- 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 && !xReturn.is() ;++pIter)
{
uno::Reference< style::XStyle> xStyle(xPageStyles->getByName(*pIter),uno::UNO_QUERY);
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index c6fc902a1ce7..943a5e30a656 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -390,11 +390,11 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
}
}
-rtl::OUString ORptUndoPropertyAction::GetComment() const
+OUString ORptUndoPropertyAction::GetComment() const
{
String aStr(ModuleRes(RID_STR_UNDO_PROPERTY).toString());
- aStr.SearchAndReplace(rtl::OUString('#'), m_aPropertyName);
+ aStr.SearchAndReplace(OUString('#'), m_aPropertyName);
return aStr;
}
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index ece3f15dba84..b924100ff6b6 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -77,7 +77,7 @@ struct PropertyInfo
}
};
-typedef ::boost::unordered_map< ::rtl::OUString, PropertyInfo, ::rtl::OUStringHash > PropertiesInfo;
+typedef ::boost::unordered_map< OUString, PropertyInfo, OUStringHash > PropertiesInfo;
struct ObjectInfo
{
@@ -545,9 +545,9 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > &
if (xSet.is())
{
if (!m_pImpl->m_bReadOnly)
- xSet->addPropertyChangeListener( ::rtl::OUString(), this );
+ xSet->addPropertyChangeListener( OUString(), this );
else
- xSet->removePropertyChangeListener( ::rtl::OUString(), this );
+ xSet->removePropertyChangeListener( OUString(), this );
}
}
@@ -602,9 +602,9 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec
if ( xProps.is() )
{
if ( _bStartListening )
- xProps->addPropertyChangeListener( ::rtl::OUString(), this );
+ xProps->addPropertyChangeListener( OUString(), this );
else
- xProps->removePropertyChangeListener( ::rtl::OUString(), this );
+ xProps->removePropertyChangeListener( OUString(), this );
}
}
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index b3f4d95bbf03..1032158af108 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -111,7 +111,7 @@ namespace rptui
}
//--------------------------------------------------------------------
- void FormatNormalizer::impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName )
+ void FormatNormalizer::impl_onDefinitionPropertyChange( const OUString& _rChangedPropName )
{
if ( _rChangedPropName != "Command" && _rChangedPropName != "CommandType" && _rChangedPropName != "EscapeProcessing" )
// nothing we're interested in
@@ -120,7 +120,7 @@ namespace rptui
}
//--------------------------------------------------------------------
- void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName )
+ void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const OUString& _rChangedPropName )
{
if ( _rChangedPropName != "DataField" )
// nothing we're interested in
@@ -145,10 +145,10 @@ namespace rptui
for ( sal_Int32 i=0; i<nCount; ++i )
{
xColumn.set( _rxColumns->getByIndex( i ), UNO_QUERY_THROW );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= aField.sName );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= aField.nDataType );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= aField.nScale );
- OSL_VERIFY( xColumn->getPropertyValue( ::rtl::OUString( "IsCurrency" ) ) >>= aField.bIsCurrency );
+ OSL_VERIFY( xColumn->getPropertyValue( OUString( "Name" ) ) >>= aField.sName );
+ OSL_VERIFY( xColumn->getPropertyValue( OUString( "Type" ) ) >>= aField.nDataType );
+ OSL_VERIFY( xColumn->getPropertyValue( OUString( "Scale" ) ) >>= aField.nScale );
+ OSL_VERIFY( xColumn->getPropertyValue( OUString( "IsCurrency" ) ) >>= aField.bIsCurrency );
_inout_rFields.push_back( aField );
}
}
@@ -221,8 +221,8 @@ namespace rptui
// it's not the "standard numeric" format -> not interested in
return;
- ::rtl::OUString sDataField( _rxFormatted->getDataField() );
- const ::rtl::OUString sFieldPrefix( "field:[" );
+ OUString sDataField( _rxFormatted->getDataField() );
+ const OUString sFieldPrefix( "field:[" );
if ( sDataField.indexOf( sFieldPrefix ) != 0 )
// not bound to a table field
// TODO: we might also do this kind of thing for functions and expressions ...
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index b23795218da9..877991ec9042 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -42,7 +42,7 @@ namespace rptui
public:
struct Field
{
- ::rtl::OUString sName;
+ OUString sName;
sal_Int32 nDataType;
sal_Int32 nScale;
sal_Bool bIsCurrency;
@@ -69,8 +69,8 @@ namespace rptui
private:
bool impl_lateInit();
- void impl_onDefinitionPropertyChange( const ::rtl::OUString& _rChangedPropName );
- void impl_onFormattedProperttyChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted, const ::rtl::OUString& _rChangedPropName );
+ void impl_onDefinitionPropertyChange( const OUString& _rChangedPropName );
+ void impl_onFormattedProperttyChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormattedField >& _rxFormatted, const OUString& _rChangedPropName );
bool impl_ensureUpToDateFieldList_nothrow();
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index 231c87f34759..dd4820b2f63b 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -45,17 +45,17 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
{
}
// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException)
+OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException)
{
::comphelper::SequenceAsHashMap aTemp(Descriptor);
- ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString("URL"),::rtl::OUString());
+ OUString sTemp = aTemp.getUnpackedValueOrDefault(OUString("URL"),OUString());
if ( !sTemp.isEmpty() )
{
INetURLObject aURL(sTemp);
if ( aURL.GetExtension().equalsIgnoreAsciiCase("orp") )
- return ::rtl::OUString("StarBaseReport");
+ return OUString("StarBaseReport");
else
{
try
@@ -63,10 +63,10 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
Reference<XPropertySet> xProp(::comphelper::OStorageHelper::GetStorageFromURL(sTemp,ElementModes::READ, m_xContext),UNO_QUERY);
if ( xProp.is() )
{
- ::rtl::OUString sMediaType;
- xProp->getPropertyValue( ::rtl::OUString("MediaType") ) >>= sMediaType;
+ OUString sMediaType;
+ xProp->getPropertyValue( OUString("MediaType") ) >>= sMediaType;
if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
- return ::rtl::OUString("StarBaseReport");
+ return OUString("StarBaseReport");
::comphelper::disposeComponent(xProp);
}
}
@@ -75,7 +75,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
}
}
}
- return ::rtl::OUString();
+ return OUString();
}
// -------------------------------------------------------------------------
Reference< XInterface > SAL_CALL
@@ -85,29 +85,29 @@ Reference< XInterface > SAL_CALL
}
// -------------------------------------------------------------------------
// XServiceInfo
-::rtl::OUString SAL_CALL ORptTypeDetection::getImplementationName() throw( )
+OUString SAL_CALL ORptTypeDetection::getImplementationName() throw( )
{
return getImplementationName_Static();
}
// -------------------------------------------------------------------------
// XServiceInfo
-sal_Bool SAL_CALL ORptTypeDetection::supportsService(const ::rtl::OUString& ServiceName) throw( )
+sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName) throw( )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
// -------------------------------------------------------------------------
// XServiceInfo
-Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw( )
+Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw( )
{
return getSupportedServiceNames_Static();
}
// -------------------------------------------------------------------------
// ORegistryServiceManager_Static
-Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException )
+Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
- Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExtendedTypeDetection");
+ Sequence< OUString > aSNS( 1 );
+ aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection");
return aSNS;
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 33dcfe8769f5..a7e6d037b4b1 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -73,20 +73,20 @@ public:
ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
// XServiceInfo
- ::rtl::OUString SAL_CALL getImplementationName() throw( );
- sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
+ OUString SAL_CALL getImplementationName() throw( );
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( );
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( );
// 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 )
{
- return ::rtl::OUString("com.sun.star.comp.report.ORptTypeDetection");
+ return OUString("com.sun.star.comp.report.ORptTypeDetection");
}
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_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 ::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);
- virtual ::rtl::OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
};
}
#endif
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index faf0d94fdea3..9b511bdca622 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -49,7 +49,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
{
case CTF_RPT_NUMBERFORMAT :
{
- rtl::OUString sAttrValue;
+ OUString sAttrValue;
if ( i->maValue >>= sAttrValue )
{
if ( !sAttrValue.isEmpty() )
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 18a6cb857b28..57ac5aaecbff 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -51,7 +51,7 @@ DBG_NAME( rpt_OXMLCell )
OXMLCell::OXMLCell( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,OXMLTable* _pContainer
,OXMLCell* _pCell) :
@@ -72,10 +72,10 @@ OXMLCell::OXMLCell( ORptFilter& rImport
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -101,14 +101,14 @@ OXMLCell::~OXMLCell()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLCell::CreateChildContext(
sal_uInt16 _nPrefix,
- const ::rtl::OUString& _rLocalName,
+ const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap();
Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
- static const ::rtl::OUString s_sStringConcat(" & ");
+ static const OUString s_sStringConcat(" & ");
const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName );
switch( nToken )
@@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
}
break;
case XML_TOK_PAGE_NUMBER:
- m_sText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
+ m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
break;
case XML_TOK_PAGE_COUNT:
- m_sText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
+ m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
break;
case XML_TOK_FORMATTED_TEXT:
{
@@ -204,7 +204,7 @@ void OXMLCell::EndElement()
Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
- xControl->setDataField(::rtl::OUString("rpt:") + m_sText);
+ xControl->setDataField(OUString("rpt:") + m_sText);
OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
setComponent(xControl.get());
@@ -254,14 +254,14 @@ void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _x
m_xComponent = _xComponent;
}
// -----------------------------------------------------------------------------
-void OXMLCell::Characters( const ::rtl::OUString& rChars )
+void OXMLCell::Characters( const OUString& rChars )
{
if ( !rChars.isEmpty() )
{
- static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
if ( !m_sText.isEmpty() )
{
- static const ::rtl::OUString s_sStringConcat(" & ");
+ static const OUString s_sStringConcat(" & ");
m_sText += s_sStringConcat;
}
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index 48338307c536..abdce954d017 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -31,8 +31,8 @@ namespace rptxml
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent;
OXMLTable* m_pContainer;
OXMLCell* m_pCell;
- ::rtl::OUString m_sStyleName;
- ::rtl::OUString m_sText;
+ OUString m_sStyleName;
+ OUString m_sText;
sal_Int32 m_nCurrentCount;
bool m_bContainsShape;
@@ -43,17 +43,17 @@ namespace rptxml
OXMLCell( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& rLName
+ ,const OUString& rLName
,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList
,OXMLTable* _pContainer
,OXMLCell* _pCell = NULL);
virtual ~OXMLCell();
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 setComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent);
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 3f4eb4ca4c19..ddc053a87591 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -47,7 +47,7 @@ DBG_NAME( rpt_OXMLRowColumn )
OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,OXMLTable* _pContainer
) :
@@ -62,10 +62,10 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -86,7 +86,7 @@ OXMLRowColumn::~OXMLRowColumn()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLRowColumn::CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
@@ -123,7 +123,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext(
return pContext;
}
// -----------------------------------------------------------------------------
-void OXMLRowColumn::fillStyle(const ::rtl::OUString& _sStyleName)
+void OXMLRowColumn::fillStyle(const OUString& _sStyleName)
{
if ( !_sStyleName.isEmpty() )
{
diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx
index bb5088d505b2..2366abcb82da 100644
--- a/reportdesign/source/filter/xml/xmlColumn.hxx
+++ b/reportdesign/source/filter/xml/xmlColumn.hxx
@@ -31,21 +31,21 @@ namespace rptxml
ORptFilter& GetOwnImport();
- void fillStyle(const ::rtl::OUString& _sStyleName);
+ void fillStyle(const OUString& _sStyleName);
OXMLRowColumn(const OXMLRowColumn&);
void operator =(const OXMLRowColumn&);
public:
OXMLRowColumn( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& rLName
+ ,const OUString& rLName
,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList
,OXMLTable* _pContainer
);
virtual ~OXMLRowColumn();
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/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index 39d7968db555..b41313653af9 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -45,7 +45,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLComponent )
OXMLComponent::OXMLComponent( ORptFilter& _rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,const Reference< XReportComponent > & _xComponent
) :
@@ -65,10 +65,10 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
{
try
{
- ::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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx
index 21f91e661a50..40915d4482fe 100644
--- a/reportdesign/source/filter/xml/xmlComponent.hxx
+++ b/reportdesign/source/filter/xml/xmlComponent.hxx
@@ -30,8 +30,8 @@ namespace rptxml
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_sTextStyleName;
+ OUString m_sName;
+ OUString m_sTextStyleName;
OXMLComponent(const OXMLComponent&);
OXMLComponent& operator =(const OXMLComponent&);
@@ -39,7 +39,7 @@ namespace rptxml
OXMLComponent( ORptFilter& 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::report::XReportComponent >& _xComponent
);
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index b3fb83285d0c..07a1f7945f1a 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -37,7 +37,7 @@ DBG_NAME( rpt_OXMLCondPrtExpr )
OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
sal_uInt16 nPrfx
- ,const ::rtl::OUString& rLName
+ ,const OUString& rLName
,const uno::Reference< xml::sax::XAttributeList > & _xAttrList
,const Reference< XPropertySet > & _xComponent ) :
SvXMLImportContext( _rImport, nPrfx, rLName )
@@ -53,10 +53,10 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -83,7 +83,7 @@ OXMLCondPrtExpr::~OXMLCondPrtExpr()
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
-void OXMLCondPrtExpr::Characters( const ::rtl::OUString& rChars )
+void OXMLCondPrtExpr::Characters( const OUString& rChars )
{
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(rChars));
}
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
index cb0042405803..5c8a61d17c14 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
@@ -34,14 +34,14 @@ namespace rptxml
OXMLCondPrtExpr( ORptFilter& _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 >& _xComponent);
virtual ~OXMLCondPrtExpr();
// 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 );
};
// -----------------------------------------------------------------------------
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index b5a021c96e01..aca8453b511d 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -49,7 +49,7 @@ DBG_NAME( rpt_OXMLControlProperty )
OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,const Reference< XPropertySet >& _xControl
,OXMLControlProperty* _pContainer) :
@@ -71,10 +71,10 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -90,7 +90,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& 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_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) );
@@ -122,7 +122,7 @@ OXMLControlProperty::~OXMLControlProperty()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLControlProperty::CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
@@ -166,13 +166,13 @@ void OXMLControlProperty::EndElement()
}
}
// -----------------------------------------------------------------------------
-void OXMLControlProperty::Characters( const ::rtl::OUString& rChars )
+void OXMLControlProperty::Characters( const OUString& rChars )
{
if ( m_pContainer )
m_pContainer->addValue(rChars);
}
// -----------------------------------------------------------------------------
-void OXMLControlProperty::addValue(const ::rtl::OUString& _sValue)
+void OXMLControlProperty::addValue(const OUString& _sValue)
{
Any aValue;
if( TypeClass_VOID != m_aPropType.getTypeClass() )
@@ -193,7 +193,7 @@ ORptFilter& OXMLControlProperty::GetOwnImport()
return static_cast<ORptFilter&>(GetImport());
}
// -----------------------------------------------------------------------------
-Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const ::rtl::OUString& _rReadCharacters)
+Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters)
{
Any aReturn;
switch (_rExpectedType.getTypeClass())
@@ -206,8 +206,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif
::sax::Converter::convertBool(bValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
- ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
- append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+ OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+ append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
append("\" into a boolean!").getStr());
aReturn <<= bValue;
}
@@ -221,8 +221,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif
::sax::Converter::convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
- ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
- append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+ OStringBuffer("OXMLControlProperty::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;
@@ -243,8 +243,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif
::sax::Converter::convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
- ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
- append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+ OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+ append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
append("\" into a double!").getStr());
aReturn <<= (double)nValue;
}
@@ -274,8 +274,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif
::sax::Converter::convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
- ::rtl::OStringBuffer("OPropertyImport::convertString: could not convert \"").
- append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+ OStringBuffer("OPropertyImport::convertString: could not convert \"").
+ append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
append("\" into a double!").getStr());
// then convert it into the target type
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 4261441fea35..696a5ac48c3e 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -39,33 +39,33 @@ namespace rptxml
sal_Bool m_bIsList;
ORptFilter& 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);
OXMLControlProperty(const OXMLControlProperty&);
void operator =(const OXMLControlProperty&);
public:
OXMLControlProperty( ORptFilter& 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 >& _xControl
,OXMLControlProperty* _pContainer = NULL);
virtual ~OXMLControlProperty();
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);
private:
static ::com::sun::star::util::Time implGetTime(double _nValue);
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 7a3c0e019bb9..a4e03b563cc9 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -76,15 +76,15 @@ namespace rptxml
return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_SETTINGS ));
}
//---------------------------------------------------------------------
- ::rtl::OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString ORptExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.XMLSettingsExporter");
+ return OUString("com.sun.star.comp.report.XMLSettingsExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
//---------------------------------------------------------------------
@@ -93,15 +93,15 @@ namespace rptxml
return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_CONTENT ));
}
//---------------------------------------------------------------------
- ::rtl::OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString ORptContentExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.XMLContentExporter");
+ return OUString("com.sun.star.comp.report.XMLContentExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -112,15 +112,15 @@ namespace rptxml
EXPORT_FONTDECLS|EXPORT_OASIS ));
}
//---------------------------------------------------------------------
- ::rtl::OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString ORptStylesExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.XMLStylesExporter");
+ return OUString("com.sun.star.comp.report.XMLStylesExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -130,15 +130,15 @@ namespace rptxml
return static_cast< XServiceInfo* >(new ORptExport(xContext, EXPORT_META ));
}
//---------------------------------------------------------------------
- ::rtl::OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString ORptMetaExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.XMLMetaExporter");
+ return OUString("com.sun.star.comp.report.XMLMetaExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -148,15 +148,15 @@ namespace rptxml
return static_cast< XServiceInfo* >(new ORptExport(xContext,EXPORT_ALL));
}
//---------------------------------------------------------------------
- ::rtl::OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
+ OUString ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.XMLFullExporter");
+ return OUString("com.sun.star.comp.report.XMLFullExporter");
}
//---------------------------------------------------------------------
- Sequence< ::rtl::OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+ Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.document.ExportFilter");
return aSupported;
}
@@ -288,19 +288,19 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt
UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA ));
m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper);
- ::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
- ::rtl::OUString aPrefix( 'P');
+ OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
+ OUString aPrefix( 'P');
GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily,
m_xParaPropMapper, aPrefix );
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)),
- m_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)),
- m_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)),
- m_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)),
- m_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)),
+ m_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)),
+ m_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)),
+ m_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)),
+ m_xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)));
}
// -----------------------------------------------------------------------------
Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext)
@@ -309,31 +309,31 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const
}
// -----------------------------------------------------------------------------
-::rtl::OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString ORptExport::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.ExportFilter");
+ return OUString("com.sun.star.comp.report.ExportFilter");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ORptExport::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL ORptExport::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
- aServices.getArray()[0] = ::rtl::OUString("com.sun.star.document.ExportFilter");
+ uno::Sequence< OUString > aServices(1);
+ aServices.getArray()[0] = OUString("com.sun.star.document.ExportFilter");
return aServices;
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL ORptExport::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ORptExport::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL ORptExport::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL ORptExport::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -352,7 +352,7 @@ void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions)
void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction)
{
exportFormula(XML_FORMULA,_xFunction->getFormula());
- beans::Optional< ::rtl::OUString> aInitial = _xFunction->getInitialFormula();
+ beans::Optional< OUString> aInitial = _xFunction->getInitialFormula();
if ( aInitial.IsPresent && !aInitial.Value.isEmpty() )
exportFormula(XML_INITIAL_FORMULA ,aInitial.Value );
AddAttribute( XML_NAMESPACE_REPORT, XML_NAME , _xFunction->getName() );
@@ -366,17 +366,17 @@ void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction)
// -----------------------------------------------------------------------------
void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet)
{
- const uno::Sequence< ::rtl::OUString> aMasterFields = _xReportComponet->getMasterFields();
+ const uno::Sequence< OUString> aMasterFields = _xReportComponet->getMasterFields();
if ( aMasterFields.getLength() )
{
SvXMLElementExport aElement(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELDS, sal_True, sal_True);
- const uno::Sequence< ::rtl::OUString> aDetailFields = _xReportComponet->getDetailFields();
+ const uno::Sequence< OUString> aDetailFields = _xReportComponet->getDetailFields();
OSL_ENSURE(aDetailFields.getLength() == aMasterFields.getLength(),"not equal length for master and detail fields!");
- const ::rtl::OUString* pDetailFieldsIter = aDetailFields.getConstArray();
- const ::rtl::OUString* pIter = aMasterFields.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aMasterFields.getLength();
+ const OUString* pDetailFieldsIter = aDetailFields.getConstArray();
+ const OUString* pIter = aMasterFields.getConstArray();
+ const OUString* pEnd = pIter + aMasterFields.getLength();
for(;pIter != pEnd;++pIter,++pDetailFieldsIter)
{
AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter );
@@ -401,7 +401,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
}
if ( _xReportDefinition->getPageHeaderOn() )
{
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
sal_uInt16 nRet = _xReportDefinition->getPageHeaderOption();
const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions();
if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) )
@@ -415,7 +415,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
if ( _xReportDefinition->getPageFooterOn() )
{
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
sal_uInt16 nRet = _xReportDefinition->getPageFooterOption();
const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions();
if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_EnumMap ) )
@@ -481,7 +481,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep
exportFormatConditions(_xReportElement);
}
- ::rtl::OUString sExpr = _xReportElement->getConditionalPrintExpression();
+ OUString sExpr = _xReportElement->getConditionalPrintExpression();
if ( !sExpr.isEmpty() )
{
exportFormula(XML_FORMULA,sExpr);
@@ -719,7 +719,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr
void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader)
{
OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF");
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
AddAttribute(XML_NAMESPACE_TABLE, XML_NAME,_xSection->getName());
if ( !_xSection->getVisible() )
@@ -744,7 +744,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader
/// TODO export as table layout
SvXMLElementExport aComponents(*this,XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True);
- ::rtl::OUString sExpr = _xSection->getConditionalPrintExpression();
+ OUString sExpr = _xSection->getConditionalPrintExpression();
if ( !sExpr.isEmpty() )
{
exportFormula(XML_FORMULA,sExpr);
@@ -852,7 +852,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
{
XMLNumberFormatAttributesExportHelper aHelper(GetNumberFormatsSupplier(),*this);
bool bIsStandard = false;
- ::rtl::OUString sEmpty;
+ OUString sEmpty;
if ( util::NumberFormat::TEXT == aHelper.GetCellType(nFormatKey,bIsStandard) )
aHelper.SetNumberFormatAttributes(sEmpty, sEmpty);
else
@@ -896,14 +896,14 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
else if ( xElement->supportsService(SERVICE_IMAGECONTROL) )
{
eToken = XML_IMAGE;
- ::rtl::OUString sTargetLocation = xImage->getImageURL();
+ OUString sTargetLocation = xImage->getImageURL();
if ( !sTargetLocation.isEmpty() )
{
sTargetLocation = GetRelativeReference(sTargetLocation);
AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation);
}
bExportData = sal_True;
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions();
if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) )
AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, sValue.makeStringAndClear() );
@@ -1012,19 +1012,19 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
}
}
// -----------------------------------------------------------------------------
-::rtl::OUString ORptExport::convertFormula(const ::rtl::OUString& _sFormula)
+OUString ORptExport::convertFormula(const OUString& _sFormula)
{
- ::rtl::OUString sFormula = _sFormula;
+ OUString sFormula = _sFormula;
if ( _sFormula.equalsAsciiL("rpt:",4) )
- sFormula = ::rtl::OUString();
+ sFormula = OUString();
return sFormula;
}
// -----------------------------------------------------------------------------
-bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula)
+bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula)
{
- const ::rtl::OUString sFieldData = convertFormula(_sFormula);
- static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
- static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ const OUString sFieldData = convertFormula(_sFormula);
+ static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
+ static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount);
bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1;
@@ -1034,7 +1034,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::
return bRet;
}
// -----------------------------------------------------------------------------
-void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName)
+void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName)
{
Reference<XPropertySet> xFind(_xProp);
TPropertyStyleMap::iterator aFind = m_aAutoStyleNames.find(xFind);
@@ -1078,30 +1078,30 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
if ( xGroup->getResetPageNumber() )
AddAttribute(XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER, XML_TRUE );
- const ::rtl::OUString sField = xGroup->getExpression();
- ::rtl::OUString sExpression = sField;
+ const OUString sField = xGroup->getExpression();
+ OUString sExpression = sField;
if ( !sExpression.isEmpty() )
{
- static ::rtl::OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
+ static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
sal_Int32 nIndex = sExpression.indexOf('"');
while ( nIndex > -1 )
{
sExpression = sExpression.replaceAt(nIndex,1,s_sQuote);
nIndex = sExpression.indexOf('"',nIndex+2);
}
- ::rtl::OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
+ OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup);
if ( aGroupFind != m_aGroupFunctionMap.end() )
sExpression = aGroupFind->second->getName();
sFormula += sExpression;
- sFormula += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\")"));
+ sFormula += OUString(RTL_CONSTASCII_USTRINGPARAM("\")"));
sExpression = sFormula;
}
AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField);
AddAttribute(XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION,sExpression);
sal_Int16 nRet = xGroup->getKeepTogether();
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
const SvXMLEnumMapEntry* aXML_KeepTogetherEnumMap = OXMLHelper::GetKeepTogetherOptions();
if ( SvXMLUnitConverter::convertEnum( sValue, nRet,aXML_KeepTogetherEnumMap ) )
AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear());
@@ -1179,23 +1179,23 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
awt::Size aSize = xFixedLine->getSize();
sal_Int32 nSectionHeight = xFixedLine->getSection()->getHeight();
- ::rtl::OUString sBorderProp;
- ::std::vector< ::rtl::OUString> aProps;
+ OUString sBorderProp;
+ ::std::vector< OUString> aProps;
if ( xFixedLine->getOrientation() == 1 ) // vertical
{
// check if border should be left
if ( !aPos.X )
{
sBorderProp = PROPERTY_BORDERLEFT;
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERRIGHT));
}
else
{
sBorderProp = PROPERTY_BORDERRIGHT;
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERLEFT));
}
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP));
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERTOP));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERBOTTOM));
}
else // horizontal
{
@@ -1203,15 +1203,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
if ( (aPos.Y + aSize.Height) == nSectionHeight )
{
sBorderProp = PROPERTY_BORDERBOTTOM;
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERTOP));
}
else
{
sBorderProp = PROPERTY_BORDERTOP;
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERBOTTOM));
}
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT));
- aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERRIGHT));
+ aProps.push_back(static_cast<const OUString&>(PROPERTY_BORDERLEFT));
}
xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue));
@@ -1265,16 +1265,16 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe
{
if ( _xReport.is() )
{
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
const SvXMLEnumMapEntry* aXML_CommnadTypeEnumMap = OXMLHelper::GetCommandTypeOptions();
if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(_xReport->getCommandType()),aXML_CommnadTypeEnumMap ) )
AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND_TYPE,sValue.makeStringAndClear());
- ::rtl::OUString sComamnd = _xReport->getCommand();
+ OUString sComamnd = _xReport->getCommand();
if ( !sComamnd.isEmpty() )
AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND, sComamnd);
- ::rtl::OUString sFilter( _xReport->getFilter() );
+ OUString sFilter( _xReport->getFilter() );
if ( !sFilter.isEmpty() )
AddAttribute( XML_NAMESPACE_REPORT, XML_FILTER, sFilter );
@@ -1284,7 +1284,7 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe
if ( !bEscapeProcessing )
AddAttribute( XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, ::xmloff::token::GetXMLToken( XML_FALSE ) );
- ::rtl::OUString sName = _xReport->getCaption();
+ OUString sName = _xReport->getCaption();
if ( !sName.isEmpty() )
AddAttribute(XML_NAMESPACE_OFFICE, XML_CAPTION,sName);
sName = _xReport->getName();
@@ -1381,9 +1381,9 @@ sal_uInt32 ORptExport::exportDoc(enum ::xmloff::token::XMLTokenEnum eClass)
return SvXMLExport::exportDoc( eClass );
}
// -----------------------------------------------------------------------------
-::rtl::OUString ORptExport::implConvertNumber(sal_Int32 _nValue)
+OUString ORptExport::implConvertNumber(sal_Int32 _nValue)
{
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
::sax::Converter::convertNumber(aBuffer, _nValue);
return aBuffer.makeStringAndClear();
}
@@ -1420,10 +1420,10 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_False, sal_False);
if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() )
{
- ::rtl::OUString sFieldData = _xReportElement->getDataField();
- static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
- static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
- static const ::rtl::OUString s_sReportPrefix("rpt:");
+ OUString sFieldData = _xReportElement->getDataField();
+ static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
+ static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ static const OUString s_sReportPrefix("rpt:");
sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength());
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
if ( nPageNumberIndex != -1 )
@@ -1431,21 +1431,21 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
sal_Int32 nIndex = 0;
do
{
- ::rtl::OUString sToken = sFieldData.getToken( 0, '&', nIndex );
+ OUString sToken = sFieldData.getToken( 0, '&', nIndex );
sToken = sToken.trim();
if ( !sToken.isEmpty() )
{
if ( sToken == s_sPageNumber )
{
- static const ::rtl::OUString s_sCurrent("current");
+ static const OUString s_sCurrent("current");
AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent );
SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, sal_False, sal_False);
- Characters(::rtl::OUString("1"));
+ Characters(OUString("1"));
}
else if ( sToken == s_sPageCount )
{
SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_COUNT, sal_False, sal_False);
- Characters(::rtl::OUString("1"));
+ Characters(OUString("1"));
}
else
{
@@ -1464,7 +1464,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
Reference< XFixedText > xFT(_xReportElement,UNO_QUERY);
if ( xFT.is() )
{
- ::rtl::OUString sExpr = xFT->getLabel();
+ OUString sExpr = xFT->getLabel();
bool bPrevCharIsSpace = false;
GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace);
}
@@ -1497,7 +1497,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLElementExport> pSubDocument;
SAL_WNODEPRECATED_DECLARATIONS_POP
- uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString("Model")),uno::UNO_QUERY);
+ uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(OUString("Model")),uno::UNO_QUERY);
if ( xModel.is() ) // special handling for chart object
{
pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, sal_False, sal_False));
@@ -1524,62 +1524,62 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
if ( nGroupOn != report::GroupOn::DEFAULT )
{
uno::Reference< XFunction> xFunction = xFunctions->createFunction();
- ::rtl::OUString sFunction,sPrefix,sPostfix;
- ::rtl::OUString sExpression = xGroup->getExpression();
- ::rtl::OUString sFunctionName;
- ::rtl::OUString sInitialFormula;
+ OUString sFunction,sPrefix,sPostfix;
+ OUString sExpression = xGroup->getExpression();
+ OUString sFunctionName;
+ OUString sInitialFormula;
switch(nGroupOn)
{
case report::GroupOn::PREFIX_CHARACTERS:
- sFunction = ::rtl::OUString("LEFT");
- sPrefix = ::rtl::OUString(";") + ::rtl::OUString::valueOf(xGroup->getGroupInterval());
+ sFunction = OUString("LEFT");
+ sPrefix = OUString(";") + OUString::valueOf(xGroup->getGroupInterval());
break;
case report::GroupOn::YEAR:
- sFunction = ::rtl::OUString("YEAR");
+ sFunction = OUString("YEAR");
break;
case report::GroupOn::QUARTAL:
- sFunction = ::rtl::OUString("INT((MONTH");
- sPostfix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1"));
- sFunctionName = ::rtl::OUString("QUARTAL_") + sExpression;
+ sFunction = OUString("INT((MONTH");
+ sPostfix = OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1"));
+ sFunctionName = OUString("QUARTAL_") + sExpression;
break;
case report::GroupOn::MONTH:
- sFunction = ::rtl::OUString("MONTH");
+ sFunction = OUString("MONTH");
break;
case report::GroupOn::WEEK:
- sFunction = ::rtl::OUString("WEEK");
+ sFunction = OUString("WEEK");
break;
case report::GroupOn::DAY:
- sFunction = ::rtl::OUString("DAY");
+ sFunction = OUString("DAY");
break;
case report::GroupOn::HOUR:
- sFunction = ::rtl::OUString("HOUR");
+ sFunction = OUString("HOUR");
break;
case report::GroupOn::MINUTE:
- sFunction = ::rtl::OUString("MINUTE");
+ sFunction = OUString("MINUTE");
break;
case report::GroupOn::INTERVAL:
{
- sFunction = ::rtl::OUString("INT");
+ sFunction = OUString("INT");
uno::Reference< XFunction> xCountFunction = xFunctions->createFunction();
- xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString("rpt:0")));
- ::rtl::OUString sCountName = sFunction + ::rtl::OUString("_count_") + sExpression;
+ xCountFunction->setInitialFormula(beans::Optional< OUString>(sal_True,OUString("rpt:0")));
+ OUString sCountName = sFunction + OUString("_count_") + sExpression;
xCountFunction->setName(sCountName);
- xCountFunction->setFormula(::rtl::OUString("rpt:[") + sCountName + ::rtl::OUString("] + 1"));
+ xCountFunction->setFormula(OUString("rpt:[") + sCountName + OUString("] + 1"));
exportFunction(xCountFunction);
sExpression = sCountName;
// The reference to sCountName in the formula of sFunctionName refers to the *old* value
// so we need to expand the the formula of sCountName
- sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval());
- sFunctionName = sFunction + ::rtl::OUString("_") + sExpression;
- sFunction = sFunction + ::rtl::OUString("(");
- sInitialFormula = ::rtl::OUString("rpt:0");
+ sPrefix = OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + OUString::valueOf(xGroup->getGroupInterval());
+ sFunctionName = sFunction + OUString("_") + sExpression;
+ sFunction = sFunction + OUString("(");
+ sInitialFormula = OUString("rpt:0");
}
break;
default:
;
}
if ( sFunctionName.isEmpty() )
- sFunctionName = sFunction + ::rtl::OUString("_") + sExpression;
+ sFunctionName = sFunction + OUString("_") + sExpression;
if ( !sFunction.isEmpty() )
{
sal_Unicode pReplaceChars[] = { '(',')',';',',','+','-','[',']','/','*'};
@@ -1588,15 +1588,15 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
xFunction->setName(sFunctionName);
if ( !sInitialFormula.isEmpty() )
- xFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True, sInitialFormula));
- sFunction = ::rtl::OUString("rpt:") + sFunction;
- sFunction += ::rtl::OUString("([");
+ xFunction->setInitialFormula(beans::Optional< OUString>(sal_True, sInitialFormula));
+ sFunction = OUString("rpt:") + sFunction;
+ sFunction += OUString("([");
sFunction += sExpression;
- sFunction += ::rtl::OUString("]");
+ sFunction += OUString("]");
if ( !sPrefix.isEmpty() )
sFunction += sPrefix;
- sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ sFunction += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
if ( !sPostfix.isEmpty() )
sFunction += sPostfix;
xFunction->setFormula(sFunction);
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 8e048cc5d94b..d5f23258eff6 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -95,16 +95,16 @@ public:
,bSet(true)
{}
};
- typedef ::std::pair< ::rtl::OUString ,::rtl::OUString> TStringPair;
+ typedef ::std::pair< OUString ,OUString> TStringPair;
typedef struct
{
- ::rtl::OUString sText;
- ::rtl::OUString sField;
- ::rtl::OUString sDecimal;
- ::rtl::OUString sThousand;
+ OUString sText;
+ OUString sField;
+ OUString sDecimal;
+ OUString sThousand;
} TDelimiter;
- typedef ::std::vector< ::rtl::OUString> TStringVec;
- typedef ::std::map< Reference<XPropertySet> ,::rtl::OUString > TPropertyStyleMap;
+ typedef ::std::vector< OUString> TStringVec;
+ typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap;
typedef ::std::map< Reference<XPropertySet> , TStringVec> TGridStyleMap;
typedef ::std::vector< TCell > TRow;
typedef ::std::vector< ::std::pair< sal_Bool, TRow > > TGrid;
@@ -121,10 +121,10 @@ private:
TGridStyleMap m_aRowStyleNames;
TGroupFunctionMap m_aGroupFunctionMap;
- ::rtl::OUString m_sCharSet;
- ::rtl::OUString m_sTableStyle;
- ::rtl::OUString m_sCellStyle;
- ::rtl::OUString m_sColumnStyle;
+ OUString m_sCharSet;
+ OUString m_sTableStyle;
+ OUString m_sCellStyle;
+ OUString m_sColumnStyle;
Any m_aPreviewMode;
UniReference < SvXMLExportPropertyMapper> m_xExportHelper;
UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper;
@@ -148,7 +148,7 @@ private:
void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet);
void exportComponent(const Reference<XReportComponent>& _xReportComponent);
sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False);
- void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName);
+ void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName);
void exportSection(const Reference<XSection>& _xProp,bool bHeader = false);
void exportContainer(const Reference< XSection>& _xSection);
void exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph = true);
@@ -162,11 +162,11 @@ private:
void collectComponentStyles();
void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames);
void exportParagraph(const Reference< XReportControlModel >& _xReportElement);
- bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula);
+ bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula);
void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups);
- ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula);
+ OUString convertFormula(const OUString& _sFormula);
- ::rtl::OUString implConvertNumber(sal_Int32 _nValue);
+ OUString implConvertNumber(sal_Int32 _nValue);
private:
ORptExport();
@@ -187,12 +187,12 @@ public:
ORptExport(const Reference< XComponentContext >& _rxContext, sal_uInt16 nExportFlag = (EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS));
// 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);
- 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 & xContext);
@@ -211,8 +211,8 @@ public:
class ORptExportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -224,8 +224,8 @@ public:
class ORptContentExportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -237,8 +237,8 @@ public:
class ORptStylesExportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -250,8 +250,8 @@ public:
class ORptMetaExportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -262,8 +262,8 @@ public:
class ODBFullExportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index b32245c1931e..a990058c3799 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -43,14 +43,14 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler >
SvtSaveOptions aSaveOpt;
if ( aSaveOpt.IsPrettyPrinting() )
{
- static const ::rtl::OUString s_sWhitespaces(" ");
+ static const OUString s_sWhitespaces(" ");
_xDelegatee->ignorableWhitespace(s_sWhitespaces);
}
}
-::rtl::OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute)
+OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute)
{
- ::rtl::OUStringBuffer sQName;
+ OUStringBuffer sQName;
// ...if it's in our map, make the prefix
sQName.append ( xmloff::token::GetXMLToken(_eNamespace) );
sQName.append ( sal_Unicode(':') );
@@ -58,15 +58,15 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler >
return sQName.makeStringAndClear();
}
-void lcl_correctCellAddress(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs)
+void lcl_correctCellAddress(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs)
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
- ::rtl::OUString sCellAddress = pList->getValueByName(_sName);
+ OUString sCellAddress = pList->getValueByName(_sName);
const sal_Int32 nPos = sCellAddress.lastIndexOf('$');
if ( nPos != -1 )
{
sCellAddress = sCellAddress.copy(0,nPos);
- sCellAddress += ::rtl::OUString("$65535");
+ sCellAddress += OUString("$65535");
pList->RemoveAttribute(_sName);
pList->AddAttribute(_sName,sCellAddress);
}
@@ -94,37 +94,37 @@ ExportDocumentHandler::~ExportDocumentHandler()
IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler)
IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE )
//------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//------------------------------------------------------------------------
-sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
}
//------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSupported;
+ uno::Sequence< OUString > aSupported;
if ( m_xServiceInfo.is() )
aSupported = m_xServiceInfo->getSupportedServiceNames();
return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
}
//------------------------------------------------------------------------
-::rtl::OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString ExportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.ExportDocumentHandler");
+ return OUString("com.sun.star.comp.report.ExportDocumentHandler");
}
//------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.report.ExportDocumentHandler");
+ uno::Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.report.ExportDocumentHandler");
return aSupported;
}
@@ -144,14 +144,14 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException,
m_xDelegatee->endDocument();
}
-void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
{
bool bExport = true;
if ( _sName == "office:chart" )
{
SvXMLAttributeList* pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
- ::rtl::OUStringBuffer sValue;
+ OUStringBuffer sValue;
static SvXMLEnumMapEntry aXML_CommnadTypeEnumMap[] =
{
{ XML_TABLE, sdb::CommandType::TABLE },
@@ -162,11 +162,11 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND_TYPE),sValue.makeStringAndClear());
}
- const ::rtl::OUString sComamnd = m_xDatabaseDataProvider->getCommand();
+ const OUString sComamnd = m_xDatabaseDataProvider->getCommand();
if ( !sComamnd.isEmpty() )
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND),sComamnd);
- const ::rtl::OUString sFilter( m_xDatabaseDataProvider->getFilter() );
+ const OUString sFilter( m_xDatabaseDataProvider->getFilter() );
if ( !sFilter.isEmpty() )
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_FILTER),sFilter);
@@ -178,13 +178,13 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs);
- const ::rtl::OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS);
+ const OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS);
m_xDelegatee->startElement(sTableCalc,NULL);
pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNullAttr = pList;
- pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),::rtl::OUString("1900-01-01"));
+ pList->AddAttribute(lcl_createAttribute(XML_NP_TABLE,XML_DATE_VALUE),OUString("1900-01-01"));
- const ::rtl::OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE);
+ const OUString sNullDate = lcl_createAttribute(XML_NP_TABLE,XML_NULL_DATE);
m_xDelegatee->startElement(sNullDate,xNullAttr);
m_xDelegatee->endElement(sNullDate);
m_xDelegatee->endElement(sTableCalc);
@@ -216,22 +216,22 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
else if ( _sName == "chart:plot-area" )
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
- pList->RemoveAttribute(::rtl::OUString("table:cell-range-address"));
+ pList->RemoveAttribute(OUString("table:cell-range-address"));
}
else if ( _sName == "chart:categories" )
{
- static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
+ static OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
}
else if ( _sName == "chart:series" )
{
- static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));
+ static OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
}
else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) )
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
- static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE));
+ static OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE));
pList->RemoveAttribute(s_sValue);
}
else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) )
@@ -242,10 +242,10 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->startElement(_sName,xAttribs);
}
// -----------------------------------------------------------------------------
-void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)
{
bool bExport = true;
- ::rtl::OUString sNewName = _sName;
+ OUString sNewName = _sName;
if ( _sName == "office:chart" )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);
@@ -275,7 +275,7 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName)
m_xDelegatee->endElement(sNewName);
}
-void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ExportDocumentHandler::characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException)
{
if ( !(m_bTableRowsStarted || m_bFirstRowExported) )
{
@@ -283,17 +283,17 @@ void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars)
}
else if ( m_bExportChar )
{
- static const ::rtl::OUString s_sZero("0");
+ static const OUString s_sZero("0");
m_xDelegatee->characters(s_sZero);
}
}
-void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException)
{
m_xDelegatee->ignorableWhitespace(aWhitespaces);
}
-void SAL_CALL ExportDocumentHandler::processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ExportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException)
{
m_xDelegatee->processingInstruction(aTarget,aData);
}
@@ -306,8 +306,8 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
{
::osl::MutexGuard aGuard(m_aMutex);
comphelper::SequenceAsHashMap aArgs(_aArguments);
- m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee);
- m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel);
+ m_xDelegatee = aArgs.getUnpackedValueOrDefault(OUString("DocumentHandler"),m_xDelegatee);
+ m_xModel = aArgs.getUnpackedValueOrDefault(OUString("Model"),m_xModel);
OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!");
if ( !m_xDelegatee.is() || !m_xModel.is() )
@@ -325,7 +325,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
// set ourself as delegator
m_xProxy->setDelegator( *this );
- const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand();
+ const OUString sCommand = m_xDatabaseDataProvider->getCommand();
if ( !sCommand.isEmpty() )
m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection()
,m_xDatabaseDataProvider->getCommandType()
@@ -335,7 +335,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
if ( xDataProvider.is() )
{
m_aColumns.realloc(1);
- uno::Sequence< ::rtl::OUString > aColumnNames = xDataProvider->getColumnDescriptions();
+ uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions();
for(sal_Int32 i = 0 ; i < aColumnNames.getLength();++i)
{
if ( !aColumnNames[i].isEmpty() )
@@ -366,28 +366,28 @@ uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes( ) throw (u
// -----------------------------------------------------------------------------
void ExportDocumentHandler::exportTableRows()
{
- const ::rtl::OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) );
+ const OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) );
m_xDelegatee->startElement(sRow,NULL);
- const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) );
+ const OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) );
- const static ::rtl::OUString s_sFieldPrefix("field:[");
- const static ::rtl::OUString s_sFieldPostfix("]");
- const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) );
- const ::rtl::OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) );
- const ::rtl::OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) );
- const ::rtl::OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) );
- const ::rtl::OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ;
- const ::rtl::OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) );
- const static ::rtl::OUString s_sString("string");
- const static ::rtl::OUString s_sFloat("float");
+ const static OUString s_sFieldPrefix("field:[");
+ const static OUString s_sFieldPostfix("]");
+ const OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) );
+ const OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) );
+ const OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) );
+ const OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) );
+ const OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ;
+ const OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) );
+ const static OUString s_sString("string");
+ const static OUString s_sFloat("float");
SvXMLAttributeList* pCellAtt = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt;
pCellAtt->AddAttribute(sValueType,s_sString);
bool bRemoveString = true;
- ::rtl::OUString sFormula;
+ OUString sFormula;
const sal_Int32 nCount = m_aColumns.getLength();
if ( m_nColumnCount > nCount )
{
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index eb39242a3072..9a079697307b 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -40,8 +40,8 @@ class ExportDocumentHandler : public ExportDocumentHandler_BASE
{
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 >&);
public:
@@ -49,9 +49,9 @@ public:
private:
// 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);
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
@@ -59,11 +59,11 @@ private:
// ::com::sun::star::xml::sax::XDocumentHandler:
virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
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 & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL endElement(const ::rtl::OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ 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::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
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);
@@ -83,7 +83,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aColumns;
+ ::com::sun::star::uno::Sequence< OUString > m_aColumns;
sal_Int32 m_nCurrentCellIndex;
sal_Int32 m_nColumnCount;
bool m_bTableRowsStarted;
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index a62125b682cf..2a89840d0a7b 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -47,7 +47,7 @@ public:
SvXMLImport& rImport,
OXMLFixedContent* _pFixedContent,
sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Unicode c,
sal_Bool bCount );
@@ -55,18 +55,18 @@ public:
SvXMLImport& rImport,
OXMLFixedContent* _pFixedContent,
sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Int16 nControl );
virtual void InsertControlCharacter(sal_Int16 _nControl);
- virtual void InsertString(const ::rtl::OUString& _sString);
+ virtual void InsertString(const OUString& _sString);
};
OXMLCharContent::OXMLCharContent(
SvXMLImport& rImport,
OXMLFixedContent* _pFixedContent,
sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Unicode c,
sal_Bool bCount )
@@ -79,7 +79,7 @@ OXMLCharContent::OXMLCharContent(
SvXMLImport& rImport,
OXMLFixedContent* _pFixedContent,
sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Int16 nControl )
: XMLCharContext(rImport,nPrfx,rLName,xAttrList,nControl)
@@ -92,7 +92,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl)
switch( _nControl )
{
case ControlCharacter::LINE_BREAK:
- m_pFixedContent->Characters(::rtl::OUString("\n"));
+ m_pFixedContent->Characters(OUString("\n"));
break;
default:
OSL_FAIL("Not supported control character");
@@ -100,7 +100,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl)
}
}
// -----------------------------------------------------------------------------
-void OXMLCharContent::InsertString(const ::rtl::OUString& _sString)
+void OXMLCharContent::InsertString(const OUString& _sString)
{
m_pFixedContent->Characters(_sString);
}
@@ -109,7 +109,7 @@ void OXMLCharContent::InsertString(const ::rtl::OUString& _sString)
DBG_NAME( rpt_OXMLFixedContent )
OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName
+ sal_uInt16 nPrfx, const OUString& rLName
,OXMLCell& _rCell
,OXMLTable* _pContainer
,OXMLFixedContent* _pInP) :
@@ -131,14 +131,14 @@ OXMLFixedContent::~OXMLFixedContent()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(nPrefix,rLocalName,xAttrList);
if ( pContext )
return pContext;
- static const ::rtl::OUString s_sStringConcat(" & ");
+ static const OUString s_sStringConcat(" & ");
const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap();
Reference<XComponentContext> xContext = m_rImport.GetComponentContext();
@@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
0x0020, sal_True );
break;
case XML_TOK_PAGE_NUMBER:
- m_sPageText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
+ m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
m_bFormattedField = true;
break;
case XML_TOK_PAGE_COUNT:
- m_sPageText += s_sStringConcat + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
+ m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
m_bFormattedField = true;
break;
default:
@@ -189,7 +189,7 @@ void OXMLFixedContent::EndElement()
{
uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
- xControl->setDataField(::rtl::OUString("rpt:") + m_sPageText);
+ xControl->setDataField(OUString("rpt:") + m_sPageText);
OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
m_pInP->m_xComponent = xControl.get();
m_xComponent = xControl.get();
@@ -210,15 +210,15 @@ void OXMLFixedContent::EndElement()
}
}
// -----------------------------------------------------------------------------
-void OXMLFixedContent::Characters( const ::rtl::OUString& rChars )
+void OXMLFixedContent::Characters( const OUString& rChars )
{
m_sLabel += rChars;
if ( !rChars.isEmpty() )
{
- static const ::rtl::OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
if ( !m_sPageText.isEmpty() )
{
- static const ::rtl::OUString s_sStringConcat(" & ");
+ static const OUString s_sStringConcat(" & ");
m_sPageText += s_sStringConcat;
}
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index f6076e9d658d..04e8ae4b1ab0 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -29,15 +29,15 @@ namespace rptxml
class OXMLCell;
class OXMLFixedContent : public OXMLReportElementBase
{
- ::rtl::OUString m_sPageText; // page count and page number
- ::rtl::OUString m_sLabel;
+ OUString m_sPageText; // page count and page number
+ OUString m_sLabel;
OXMLCell& m_rCell;
OXMLFixedContent* m_pInP; // if set than we are in text-p element
bool m_bFormattedField;
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 );
private:
OXMLFixedContent(const OXMLFixedContent&);
@@ -45,7 +45,7 @@ namespace rptxml
public:
OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName
+ const OUString& rLName
,OXMLCell& _rCell
,OXMLTable* _pContainer
,OXMLFixedContent* _pInP = NULL);
@@ -53,7 +53,7 @@ namespace rptxml
// 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 );
virtual void EndElement();
};
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 612fda8cd41c..e50edf70fb8c 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -44,7 +44,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLFormatCondition )
OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+ sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & _xAttrList
,const Reference< XFormatCondition > & _xComponent ) :
SvXMLImportContext( rImport, nPrfx, rLName )
@@ -56,16 +56,16 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetFormatElemTokenMap();
- static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+ static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
try
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
index a25bd6022de6..93e0c79f81ba 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
@@ -28,14 +28,14 @@ namespace rptxml
class OXMLFormatCondition : public SvXMLImportContext
{
ORptFilter& m_rImport;
- ::rtl::OUString m_sStyleName;
+ OUString m_sStyleName;
::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent;
OXMLFormatCondition(const OXMLFormatCondition&);
void operator =(const OXMLFormatCondition&);
public:
OXMLFormatCondition( ORptFilter& 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::report::XFormatCondition >& _xComponent
);
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 503c27aeebae..7e074d05c0e5 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -37,7 +37,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLFormattedField )
OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName
+ sal_uInt16 nPrfx, const OUString& rLName
,const uno::Reference< xml::sax::XAttributeList > & _xAttrList
,const uno::Reference< XFormattedField > & _xComponent
,OXMLTable* _pContainer
@@ -54,10 +54,10 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -66,7 +66,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
break;
case XML_TOK_SELECT_PAGE:
{
- static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()"));
+ static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()"));
_xComponent->setDataField(s_sPageNumber);
}
break;
@@ -76,7 +76,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
}
if ( _bPageCount )
{
- static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()"));
+ static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()"));
_xComponent->setDataField(s_sPageNumber);
}
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx
index 26def541a358..6298d3d70396 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.hxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx
@@ -33,7 +33,7 @@ namespace rptxml
OXMLFormattedField( ORptFilter& 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::report::XFormattedField >& _xComponent
,OXMLTable* _pContainer
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index 9b1ddfe6f7b8..923847f6cbfb 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -37,7 +37,7 @@ DBG_NAME( rpt_OXMLFunction )
OXMLFunction::OXMLFunction( ORptFilter& _rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,const Reference< XFunctionsSupplier >& _xFunctions
,bool _bAddToReport
@@ -57,13 +57,13 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
const SvXMLTokenMap& rTokenMap = _rImport.GetFunctionElemTokenMap();
const 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;
- 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 );
try
{
@@ -80,7 +80,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
break;
case XML_TOK_INITIAL_FORMULA:
if ( !sValue.isEmpty() )
- m_xFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,ORptFilter::convertFormula(sValue)));
+ m_xFunction->setInitialFormula(beans::Optional< OUString>(sal_True,ORptFilter::convertFormula(sValue)));
break;
case XML_TOK_DEEP_TRAVERSING:
m_xFunction->setDeepTraversing(sValue == s_sTRUE);
diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx
index c90b37a77dc0..1319b241be6a 100644
--- a/reportdesign/source/filter/xml/xmlFunction.hxx
+++ b/reportdesign/source/filter/xml/xmlFunction.hxx
@@ -43,7 +43,7 @@ namespace rptxml
OXMLFunction( ORptFilter& 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::report::XFunctionsSupplier >& _xFunctions
,bool _bAddToReport = false
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 240a03830c16..9a521952b0c5 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -39,7 +39,7 @@ namespace rptxml
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::xml::sax;
- sal_uInt16 lcl_getKeepTogetherOption(const ::rtl::OUString& _sValue)
+ sal_uInt16 lcl_getKeepTogetherOption(const OUString& _sValue)
{
sal_uInt16 nRet = report::KeepTogether::NO;
const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetKeepTogetherOptions();
@@ -50,7 +50,7 @@ DBG_NAME( rpt_OXMLGroup )
OXMLGroup::OXMLGroup( ORptFilter& _rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
) :
SvXMLImportContext( _rImport, nPrfx, _sLocalName )
@@ -67,13 +67,13 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
const SvXMLTokenMap& rTokenMap = _rImport.GetGroupElemTokenMap();
m_xGroup->setSortAscending(sal_False);// the default value has to be set
const 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;
- const ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+ OUString sLocalName;
+ const OUString sAttrName = _xAttrList->getNameByIndex( i );
const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
- ::rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+ OUString sValue = _xAttrList->getValueByIndex( i );
try
{
@@ -94,15 +94,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
if ( nLen )
{
- const static ::rtl::OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
+ const static OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
sal_Int32 nPos = sValue.indexOf(s_sChanged);
if ( nPos == -1 )
nPos = 5;
else
{
nPos = s_sChanged.getLength();
- static ::rtl::OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
- static ::rtl::OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
+ static OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
sal_Int32 nIndex = sValue.indexOf(s_sQuote,nPos);
while ( nIndex > -1 )
{
@@ -117,49 +117,49 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
if ( aFind != aFunctions.end() )
{
sal_Int32 nIndex = 0;
- const ::rtl::OUString sCompleteFormula = aFind->second->getFormula();
- ::rtl::OUString sExpression = sCompleteFormula.getToken(1,'[',nIndex);
+ const OUString sCompleteFormula = aFind->second->getFormula();
+ OUString sExpression = sCompleteFormula.getToken(1,'[',nIndex);
nIndex = 0;
sExpression = sExpression.getToken(0,']',nIndex);
nIndex = 0;
- const ::rtl::OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex);
+ const OUString sFormula = sCompleteFormula.getToken(0,'(',nIndex);
::sal_Int16 nGroupOn = report::GroupOn::DEFAULT;
- if ( sFormula ==::rtl::OUString("rpt:LEFT"))
+ if ( sFormula ==OUString("rpt:LEFT"))
{
nGroupOn = report::GroupOn::PREFIX_CHARACTERS;
- ::rtl::OUString sInterval = sCompleteFormula.getToken(1,';',nIndex);
+ OUString sInterval = sCompleteFormula.getToken(1,';',nIndex);
nIndex = 0;
sInterval = sInterval.getToken(0,')',nIndex);
m_xGroup->setGroupInterval(sInterval.toInt32());
}
- else if ( sFormula == ::rtl::OUString("rpt:YEAR"))
+ else if ( sFormula == OUString("rpt:YEAR"))
nGroupOn = report::GroupOn::YEAR;
- else if ( sFormula == ::rtl::OUString("rpt:MONTH"))
+ else if ( sFormula == OUString("rpt:MONTH"))
{
nGroupOn = report::GroupOn::MONTH;
}
- else if ( sCompleteFormula.matchIgnoreAsciiCase(::rtl::OUString("rpt:INT((MONTH"),0)
+ else if ( sCompleteFormula.matchIgnoreAsciiCase(OUString("rpt:INT((MONTH"),0)
&& sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) )
{
nGroupOn = report::GroupOn::QUARTAL;
}
- else if ( sFormula ==::rtl::OUString("rpt:WEEK"))
+ else if ( sFormula ==OUString("rpt:WEEK"))
nGroupOn = report::GroupOn::WEEK;
- else if ( sFormula ==::rtl::OUString("rpt:DAY"))
+ else if ( sFormula ==OUString("rpt:DAY"))
nGroupOn = report::GroupOn::DAY;
- else if ( sFormula ==::rtl::OUString("rpt:HOUR"))
+ else if ( sFormula ==OUString("rpt:HOUR"))
nGroupOn = report::GroupOn::HOUR;
- else if ( sFormula ==::rtl::OUString("rpt:MINUTE"))
+ else if ( sFormula ==OUString("rpt:MINUTE"))
nGroupOn = report::GroupOn::MINUTE;
- else if ( sFormula ==::rtl::OUString("rpt:INT"))
+ else if ( sFormula ==OUString("rpt:INT"))
{
nGroupOn = report::GroupOn::INTERVAL;
_rImport.removeFunction(sExpression);
- sExpression = sExpression.copy(::rtl::OUString("INT_count_").getLength());
+ sExpression = sExpression.copy(OUString("INT_count_").getLength());
nIndex = 0;
- ::rtl::OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex);
+ OUString sInterval = sCompleteFormula.getToken(1,'/',nIndex);
nIndex = 0;
sInterval = sInterval.getToken(0,')',nIndex);
m_xGroup->setGroupInterval(sInterval.toInt32());
@@ -197,7 +197,7 @@ OXMLGroup::~OXMLGroup()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLGroup::CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx
index 9fe76b18cf9b..869d9d02b7b6 100644
--- a/reportdesign/source/filter/xml/xmlGroup.hxx
+++ b/reportdesign/source/filter/xml/xmlGroup.hxx
@@ -40,13 +40,13 @@ namespace rptxml
OXMLGroup( ORptFilter& 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 ~OXMLGroup();
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/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 1aec99ae2cb6..8cfd55e11cd0 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -251,7 +251,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions()
#define PROPERTY_ID_FONTKERNING 14
#define PROPERTY_ID_FONTWORDLINEMODE 15
#define PROPERTY_ID_FONTTYPE 16
-void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp)
+void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const uno::Reference<beans::XPropertySet>& _xProp)
{
if ( !_xProp.is() || _sStyleName.isEmpty() || !_pAutoStyles )
return;
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index f1c55a1d1696..6cc32dcf3a1f 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -69,7 +69,7 @@ namespace rptxml
static const XMLPropertyMapEntry* GetRowStyleProps();
- static void copyStyleElements(const bool _bOld,const ::rtl::OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp);
+ static void copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& _xProp);
static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> createBorderPropertySet();
static SvXMLTokenMap* GetReportElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index ca9e02f7b1e2..724689e00d9a 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -43,7 +43,7 @@ DBG_NAME( rpt_OXMLImage )
// -----------------------------------------------------------------------------
OXMLImage::OXMLImage( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+ sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & _xAttrList
,const Reference< XImageControl > & _xComponent
,OXMLTable* _pContainer) :
@@ -54,17 +54,17 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = m_rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap();
- static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+ static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
try
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx
index 8fad8dd899c9..57de9de5dfb1 100644
--- a/reportdesign/source/filter/xml/xmlImage.hxx
+++ b/reportdesign/source/filter/xml/xmlImage.hxx
@@ -32,7 +32,7 @@ namespace rptxml
public:
OXMLImage( ORptFilter& 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::report::XImageControl >& _xComponent
,OXMLTable* _pContainer);
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 64ed6651078c..2f46b990a0bd 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -45,7 +45,7 @@ namespace rptxml
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-::rtl::OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute);
+OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute);
ImportDocumentHandler::ImportDocumentHandler(uno::Reference< uno::XComponentContext > const & context)
:m_bImportedChart( false )
@@ -64,37 +64,37 @@ ImportDocumentHandler::~ImportDocumentHandler()
IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler)
IMPLEMENT_FORWARD_REFCOUNT( ImportDocumentHandler, ImportDocumentHandler_BASE )
//------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//------------------------------------------------------------------------
-sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
}
//------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSupported;
+ uno::Sequence< OUString > aSupported;
if ( m_xServiceInfo.is() )
aSupported = m_xServiceInfo->getSupportedServiceNames();
return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
}
//------------------------------------------------------------------------
-::rtl::OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString ImportDocumentHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.ImportDocumentHandler");
+ return OUString("com.sun.star.comp.report.ImportDocumentHandler");
}
//------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString("com.sun.star.report.ImportDocumentHandler");
+ uno::Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString("com.sun.star.report.ImportDocumentHandler");
return aSupported;
}
@@ -117,7 +117,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
{
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", ::rtl::OUString("all") );
+ aArgs.put( "CellRangeRepresentation", OUString("all") );
aArgs.put( "HasCategories", uno::makeAny( sal_True ) );
aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
@@ -125,7 +125,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY);
if ( xDataProvider.is() )
{
- const uno::Sequence< ::rtl::OUString > aColumnNames = xDataProvider->getColumnDescriptions();
+ const uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions();
aArgs.put( "ColumnDescriptions", uno::makeAny( aColumnNames ) );
}
@@ -134,26 +134,26 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
}
}
-void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException)
{
uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList;
bool bExport = true;
if ( _sName == "office:report" )
{
const 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);
try
{
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_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') );
if( -1L == nColonPos )
sLocalName = sAttrName;
else
sLocalName = sAttrName.copy( nColonPos + 1L );
- const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+ const OUString sValue = _xAttrList->getValueByIndex( i );
switch( m_pReportElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) )
{
@@ -194,17 +194,17 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
SAL_WNODEPRECATED_DECLARATIONS_POP
try
{
- ::rtl::OUString sMasterField,sDetailField;
+ OUString sMasterField,sDetailField;
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_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') );
if( -1L == nColonPos )
sLocalName = sAttrName;
else
sLocalName = sAttrName.copy( nColonPos + 1L );
- const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+ const OUString sValue = _xAttrList->getValueByIndex( i );
switch( pMasterElemTokenMap->Get( XML_NAMESPACE_REPORT, sLocalName ) )
{
@@ -242,8 +242,8 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
SAL_WNODEPRECATED_DECLARATIONS_POP
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_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') );
if( -1L == nColonPos )
sLocalName = sAttrName;
@@ -251,7 +251,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
sLocalName = sAttrName.copy( nColonPos + 1L );
if ( sLocalName == "data-source-has-labels" )
{
- const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+ const OUString sValue = _xAttrList->getValueByIndex( i );
bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both"));
break;
}
@@ -270,7 +270,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
SvXMLAttributeList* pList = new SvXMLAttributeList();
xNewAttribs = pList;
pList->AppendAttributeList(_xAttrList);
- pList->AddAttribute(::rtl::OUString("table:cell-range-address"),::rtl::OUString("local-table.$A$1:.$Z$65536"));
+ pList->AddAttribute(OUString("table:cell-range-address"),OUString("local-table.$A$1:.$Z$65536"));
}
@@ -278,10 +278,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->startElement(_sName,xNewAttribs);
}
-void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ImportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)
{
bool bExport = true;
- ::rtl::OUString sNewName = _sName;
+ OUString sNewName = _sName;
if ( _sName == "office:report" )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART);
@@ -289,9 +289,9 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
else if ( _sName == "rpt:master-detail-fields" )
{
if ( !m_aMasterFields.empty() )
- m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
+ m_xDatabaseDataProvider->setMasterFields(uno::Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
if ( !m_aDetailFields.empty() )
- m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
+ m_xDatabaseDataProvider->setDetailFields(uno::Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
bExport = false;
}
else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail"))
@@ -305,17 +305,17 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
m_xDelegatee->endElement(sNewName);
}
-void SAL_CALL ImportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ImportDocumentHandler::characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException)
{
m_xDelegatee->characters(aChars);
}
-void SAL_CALL ImportDocumentHandler::ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ImportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException)
{
m_xDelegatee->ignorableWhitespace(aWhitespaces);
}
-void SAL_CALL ImportDocumentHandler::processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException)
+void SAL_CALL ImportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException)
{
m_xDelegatee->processingInstruction(aTarget,aData);
}
@@ -328,8 +328,8 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
{
::osl::MutexGuard aGuard(m_aMutex);
comphelper::SequenceAsHashMap aArgs(_aArguments);
- m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString("DocumentHandler"),m_xDelegatee);
- m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString("Model"),m_xModel);
+ m_xDelegatee = aArgs.getUnpackedValueOrDefault(OUString("DocumentHandler"),m_xDelegatee);
+ m_xModel = aArgs.getUnpackedValueOrDefault(OUString("Model"),m_xModel);
OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!");
if ( !m_xDelegatee.is() || !m_xModel.is() )
@@ -338,7 +338,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY);
if ( !m_xDatabaseDataProvider.is() )
{
- const static ::rtl::OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider");
+ const static OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider");
m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider
,m_xContext),uno::UNO_QUERY);
if ( !m_xDatabaseDataProvider.is() )
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index a890f6266d36..3d26a62b2530 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -42,8 +42,8 @@ class ImportDocumentHandler : public ImportDocumentHandler_BASE
{
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 >&);
public:
@@ -51,9 +51,9 @@ public:
private:
// 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);
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
@@ -61,11 +61,11 @@ private:
// ::com::sun::star::xml::sax::XDocumentHandler:
virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
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 & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL endElement(const ::rtl::OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
- virtual void SAL_CALL processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ 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::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+ virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
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);
@@ -78,8 +78,8 @@ private:
::osl::Mutex m_aMutex;
bool m_bImportedChart;
- ::std::vector< ::rtl::OUString> m_aMasterFields;
- ::std::vector< ::rtl::OUString> m_aDetailFields;
+ ::std::vector< OUString> m_aMasterFields;
+ ::std::vector< OUString> m_aDetailFields;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aArguments;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xDelegatee;
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 591650fc0cc6..18549f93c008 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -35,7 +35,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLMasterFields )
OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+ sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & _xAttrList
,IMasterDetailFieds* _pReport
) :
@@ -47,14 +47,14 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetSubDocumentElemTokenMap();
- ::rtl::OUString sMasterField,sDetailField;
+ OUString sMasterField,sDetailField;
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -71,7 +71,7 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
if ( sDetailField.isEmpty() )
sDetailField = sMasterField;
if ( !sMasterField.isEmpty() )
- m_pReport->addMasterDetailPair(::std::pair< ::rtl::OUString,::rtl::OUString >(sMasterField,sDetailField));
+ m_pReport->addMasterDetailPair(::std::pair< OUString,OUString >(sMasterField,sDetailField));
}
// -----------------------------------------------------------------------------
@@ -83,7 +83,7 @@ OXMLMasterFields::~OXMLMasterFields()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLMasterFields::CreateChildContext(
sal_uInt16 _nPrefix,
- const ::rtl::OUString& _rLocalName,
+ const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx
index f4a1d0364560..605815ac3aba 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.hxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx
@@ -32,13 +32,13 @@ namespace rptxml
public:
OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
+ const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList
,IMasterDetailFieds* _pReport);
virtual ~OXMLMasterFields();
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/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 0fe6a3787366..d2362235b92c 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -40,7 +40,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLReport )
OXMLReport::OXMLReport( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+ sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & _xAttrList
,const uno::Reference< report::XReportDefinition >& _xComponent
,OXMLTable* _pContainer) :
@@ -56,15 +56,15 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap();
const 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);
try
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -133,7 +133,7 @@ void OXMLReport::impl_initRuntimeDefaults() const
SvXMLImportContext* OXMLReport::CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList);
@@ -212,12 +212,12 @@ void OXMLReport::EndElement()
xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(aIter->second));
if ( !m_aMasterFields.empty() )
- m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
+ m_xComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
if ( !m_aDetailFields.empty() )
- m_xComponent->setDetailFields(Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
+ m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
}
// -----------------------------------------------------------------------------
-void OXMLReport::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair)
+void OXMLReport::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair)
{
m_aMasterFields.push_back(_aPair.first);
m_aDetailFields.push_back(_aPair.second);
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index b6cc9ca8dc2b..ffcf432f1de9 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -28,26 +28,26 @@ namespace rptxml
class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
{
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent;
- ::std::vector< ::rtl::OUString> m_aMasterFields;
- ::std::vector< ::rtl::OUString> m_aDetailFields;
+ ::std::vector< OUString> m_aMasterFields;
+ ::std::vector< OUString> m_aDetailFields;
OXMLReport(const OXMLReport&);
void operator =(const OXMLReport&);
public:
OXMLReport( ORptFilter& 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::report::XReportDefinition >& _xComponent
,OXMLTable* _pContainer);
virtual ~OXMLReport();
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 addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair);
+ virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair);
private:
/** initializes our object's properties whose runtime (API) default is different from the file
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 2c4d6c893feb..738691f8b394 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -37,7 +37,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLReportElement )
OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+ sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & _xAttrList
,const Reference< XReportControlModel > & _xComponent) :
SvXMLImportContext( rImport, nPrfx, rLName )
@@ -49,16 +49,16 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetReportElementElemTokenMap();
- static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+ static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
try
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -89,7 +89,7 @@ OXMLReportElement::~OXMLReportElement()
SvXMLImportContext* OXMLReportElement::CreateChildContext(
sal_uInt16 _nPrefix,
- const ::rtl::OUString& _rLocalName,
+ const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx
index 7634abe8a5a1..ccf980bc4c81 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.hxx
@@ -34,13 +34,13 @@ namespace rptxml
public:
OXMLReportElement( ORptFilter& 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::report::XReportControlModel >& _xComponent);
virtual ~OXMLReportElement();
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/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 9579f63753ef..18e5dc45822e 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -32,7 +32,7 @@ namespace rptxml
OXMLReportElementBase::OXMLReportElementBase( ORptFilter& rImport
,sal_uInt16 nPrfx
- , const ::rtl::OUString& rLName
+ , const OUString& rLName
,const Reference< XReportComponent > & _xComponent
,OXMLTable* _pContainer) :
SvXMLImportContext( rImport, nPrfx, rLName )
@@ -49,7 +49,7 @@ OXMLReportElementBase::~OXMLReportElementBase()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLReportElementBase::CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = _CreateChildContext(nPrefix,rLocalName,xAttrList);
@@ -60,7 +60,7 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext(
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLReportElementBase::_CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index c9401c056be2..1ceda231e425 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -31,7 +31,7 @@ namespace rptxml
class SAL_NO_VTABLE IMasterDetailFieds
{
public:
- virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair) = 0;
+ virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) = 0;
protected:
~IMasterDetailFieds() {}
@@ -47,19 +47,19 @@ namespace rptxml
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > m_xComponent;
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:
OXMLReportElementBase( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& rLName
+ ,const OUString& rLName
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent
,OXMLTable* _pContainer);
virtual ~OXMLReportElementBase();
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/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index 8f89bf7d9e75..ce99996c7c2a 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -42,7 +42,7 @@ DBG_NAME( rpt_OXMLRow )
OXMLRow::OXMLRow( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,OXMLTable* _pContainer) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
@@ -58,10 +58,10 @@ OXMLRow::OXMLRow( ORptFilter& rImport
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -86,7 +86,7 @@ OXMLRow::~OXMLRow()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLRow::CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 23870a685d9f..b51186ee9766 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -41,7 +41,7 @@ namespace rptxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
- sal_uInt16 lcl_getReportPrintOption(const ::rtl::OUString& _sValue)
+ sal_uInt16 lcl_getReportPrintOption(const OUString& _sValue)
{
sal_uInt16 nRet = report::ReportPrintOption::ALL_PAGES;
const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetReportPrintOptions();
@@ -53,7 +53,7 @@ namespace rptxml
DBG_NAME( rpt_OXMLSection )
OXMLSection::OXMLSection( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName,
+ sal_uInt16 nPrfx, const OUString& _sLocalName,
const uno::Reference< xml::sax::XAttributeList > & _xAttrList
,const uno::Reference< report::XSection >& _xSection
,sal_Bool _bPageHeader)
@@ -68,15 +68,15 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap();
const sal_Int16 nLength = (m_xSection.is() && _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);
try
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -110,7 +110,7 @@ OXMLSection::~OXMLSection()
SvXMLImportContext* OXMLSection::CreateChildContext(
sal_uInt16 _nPrefix,
- const ::rtl::OUString& _rLocalName,
+ const OUString& _rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 647f100a9b6b..b425aad9ad90 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -39,14 +39,14 @@ namespace rptxml
OXMLSection( ORptFilter& 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::report::XSection >& _xSection
,sal_Bool _bPageHeader = sal_True);
virtual ~OXMLSection();
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/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 14d8a4ee9f56..1898e502ce1b 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -60,7 +60,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
{
@@ -74,11 +74,11 @@ TYPEINIT1( OReportStylesContext, SvXMLStylesContext );
DBG_NAME( rpt_OControlStyleContext )
OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
- sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+ sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
- sNumberFormat(rtl::OUString("NumberFormat")),
+ sNumberFormat(OUString("NumberFormat")),
pStyles(&rStyles),
m_nNumberFormat(-1),
m_rImport(rImport),
@@ -142,8 +142,8 @@ void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::An
}
// -----------------------------------------------------------------------------
void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
- const ::rtl::OUString& rLocalName,
- const ::rtl::OUString& rValue )
+ const OUString& rLocalName,
+ const OUString& rValue )
{
// TODO: use a map here
if( IsXMLToken(rLocalName, XML_DATA_STYLE_NAME ) )
@@ -163,14 +163,14 @@ DBG_NAME( rpt_OReportStylesContext )
OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
sal_uInt16 nPrfx ,
- const ::rtl::OUString& rLName ,
+ const OUString& rLName ,
const Reference< XAttributeList > & xAttrList,
const sal_Bool bTempAutoStyles ) :
SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
- m_sTableStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))),
- m_sColumnStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))),
- m_sRowStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))),
- m_sCellStyleFamilyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))),
+ m_sTableStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))),
+ m_sColumnStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))),
+ m_sRowStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))),
+ m_sCellStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))),
m_rImport(rImport),
m_nNumberFormatIndex(-1),
bAutoStyles(bTempAutoStyles)
@@ -255,7 +255,7 @@ UniReference < SvXMLImportPropertyMapper >
}
// -----------------------------------------------------------------------------
SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLStyleContext *pStyle = 0;
@@ -278,7 +278,7 @@ SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext(
}
// ----------------------------------------------------------------------------
SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext(
- sal_uInt16 nFamily, sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLStyleContext *pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( nFamily, nPrefix,
@@ -310,7 +310,7 @@ Reference < XNameContainer >
Reference < XNameContainer > xStyles(SvXMLStylesContext::GetStylesContainer(nFamily));
if (!xStyles.is())
{
- ::rtl::OUString sName;
+ OUString sName;
switch( nFamily )
{
case XML_STYLE_FAMILY_TABLE_TABLE:
@@ -319,7 +319,7 @@ Reference < XNameContainer >
xStyles.set(m_xTableStyles);
else
sName =
- ::rtl::OUString( rtl::OUString( "TableStyles" ));
+ OUString( OUString( "TableStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -328,7 +328,7 @@ Reference < XNameContainer >
xStyles.set(m_xCellStyles);
else
sName =
- ::rtl::OUString( rtl::OUString( "CellStyles" ));
+ OUString( OUString( "CellStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_COLUMN:
@@ -337,7 +337,7 @@ Reference < XNameContainer >
xStyles.set(m_xColumnStyles);
else
sName =
- ::rtl::OUString( rtl::OUString( "ColumnStyles" ));
+ OUString( OUString( "ColumnStyles" ));
}
break;
case XML_STYLE_FAMILY_TABLE_ROW:
@@ -346,7 +346,7 @@ Reference < XNameContainer >
xStyles.set(m_xRowStyles);
else
sName =
- ::rtl::OUString( rtl::OUString( "RowStyles" ));
+ OUString( OUString( "RowStyles" ));
}
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
@@ -390,9 +390,9 @@ Reference < XNameContainer >
}
// -----------------------------------------------------------------------------
-::rtl::OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const
+OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const
{
- rtl::OUString sServiceName = SvXMLStylesContext::GetServiceName(nFamily);
+ OUString sServiceName = SvXMLStylesContext::GetServiceName(nFamily);
if (sServiceName.isEmpty())
{
switch( nFamily )
@@ -434,7 +434,7 @@ ORptFilter& OReportStylesContext::GetOwnImport() const
return m_rImport;
}
// -----------------------------------------------------------------------------
-sal_uInt16 OReportStylesContext::GetFamily( const ::rtl::OUString& rFamily ) const
+sal_uInt16 OReportStylesContext::GetFamily( const OUString& rFamily ) const
{
sal_uInt16 nFamily = SvXMLStylesContext::GetFamily(rFamily);
return nFamily;
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index aa8b6e6e2b6d..656513146ae7 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -38,9 +38,9 @@ namespace rptxml
class OControlStyleContext : public XMLPropStyleContext
{
- ::rtl::OUString m_sDataStyleName;
- ::rtl::OUString sPageStyle;
- const rtl::OUString sNumberFormat;
+ OUString m_sDataStyleName;
+ OUString sPageStyle;
+ const OUString sNumberFormat;
SvXMLStylesContext* pStyles;
// std::vector<ScXMLMapContent> aMaps;
com::sun::star::uno::Any aConditionalFormat;
@@ -56,15 +56,15 @@ namespace rptxml
protected:
virtual void SetAttribute( sal_uInt16 nPrefixKey,
- const ::rtl::OUString& rLocalName,
- const ::rtl::OUString& rValue );
+ const OUString& rLocalName,
+ const OUString& rValue );
public:
TYPEINFO();
OControlStyleContext( ORptFilter& 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 );
@@ -83,10 +83,10 @@ namespace rptxml
class OReportStylesContext : public SvXMLStylesContext
{
- const ::rtl::OUString m_sTableStyleFamilyName;
- const ::rtl::OUString m_sColumnStyleFamilyName;
- const ::rtl::OUString m_sRowStyleFamilyName;
- const ::rtl::OUString m_sCellStyleFamilyName;
+ const OUString m_sTableStyleFamilyName;
+ const OUString m_sColumnStyleFamilyName;
+ const OUString m_sRowStyleFamilyName;
+ const OUString m_sCellStyleFamilyName;
ORptFilter& m_rImport;
sal_Int32 m_nNumberFormatIndex;
sal_Int32 nMasterPageNameIndex;
@@ -117,12 +117,12 @@ namespace rptxml
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 );
@@ -131,7 +131,7 @@ namespace rptxml
TYPEINFO();
OReportStylesContext( ORptFilter& 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 ~OReportStylesContext();
@@ -143,8 +143,8 @@ namespace rptxml
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 sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const;
+ virtual OUString GetServiceName( sal_uInt16 nFamily ) const;
+ virtual sal_uInt16 GetFamily( const OUString& rFamily ) const;
sal_Int32 GetIndex(const sal_Int16 nContextID);
};
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index c59810f4fcc0..49ae6e0ed4da 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -39,7 +39,7 @@ DBG_NAME( rpt_OXMLSubDocument )
OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport,
sal_uInt16 nPrfx
- ,const ::rtl::OUString& rLName
+ ,const OUString& rLName
,const Reference< XReportComponent > & _xComponent
,OXMLTable* _pContainer
,OXMLCell* _pCellParent) :
@@ -62,7 +62,7 @@ OXMLSubDocument::~OXMLSubDocument()
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLSubDocument::_CreateChildContext(
sal_uInt16 _nPrefix,
- const ::rtl::OUString& _rLocalName,
+ const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = OXMLReportElementBase::_CreateChildContext(_nPrefix,_rLocalName,xAttrList);
@@ -111,9 +111,9 @@ void OXMLSubDocument::EndElement()
if ( m_xComponent.is() )
{
if ( !m_aMasterFields.empty() )
- m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
+ m_xComponent->setMasterFields(Sequence< OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
if ( !m_aDetailFields.empty() )
- m_xComponent->setDetailFields(Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
+ m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
m_xComponent->setName(m_xFake->getName());
m_xComponent->setPrintRepeatedValues(m_xFake->getPrintRepeatedValues());
@@ -142,7 +142,7 @@ void OXMLSubDocument::EndElement()
}
}
// -----------------------------------------------------------------------------
-void OXMLSubDocument::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair)
+void OXMLSubDocument::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair)
{
m_aMasterFields.push_back(_aPair.first);
m_aDetailFields.push_back(_aPair.second);
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index e74d98650baa..f0dd87458536 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -31,8 +31,8 @@ namespace rptxml
{
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent;
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake;
- ::std::vector< ::rtl::OUString> m_aMasterFields;
- ::std::vector< ::rtl::OUString> m_aDetailFields;
+ ::std::vector< OUString> m_aMasterFields;
+ ::std::vector< OUString> m_aDetailFields;
OXMLCell* m_pCellParent;
sal_Int32 m_nCurrentCount;
bool m_bContainsShape;
@@ -41,20 +41,20 @@ namespace rptxml
void operator =(const OXMLSubDocument&);
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:
OXMLSubDocument( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& rLName
+ ,const OUString& rLName
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent
,OXMLTable* _pContainer
,OXMLCell* _pCellParent);
virtual ~OXMLSubDocument();
virtual void EndElement();
- virtual void addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::OUString >& _aPair);
+ virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair);
};
// -----------------------------------------------------------------------------
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index d380cf6c30e2..29e525867aa5 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -46,7 +46,7 @@ namespace rptxml
using namespace ::com::sun::star::xml::sax;
using ::com::sun::star::xml::sax::XAttributeList;
- sal_uInt16 lcl_getForceNewPageOption(const ::rtl::OUString& _sValue)
+ sal_uInt16 lcl_getForceNewPageOption(const OUString& _sValue)
{
sal_uInt16 nRet = report::ForceNewPage::NONE;
const SvXMLEnumMapEntry* aXML_EnumMap = OXMLHelper::GetForceNewPageOptions();
@@ -57,7 +57,7 @@ DBG_NAME( rpt_OXMLTable )
OXMLTable::OXMLTable( ORptFilter& rImport
,sal_uInt16 nPrfx
- ,const ::rtl::OUString& _sLocalName
+ ,const OUString& _sLocalName
,const Reference< XAttributeList > & _xAttrList
,const uno::Reference< report::XSection >& _xSection
)
@@ -74,15 +74,15 @@ OXMLTable::OXMLTable( ORptFilter& rImport
const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap();
const sal_Int16 nLength = (m_xSection.is() && _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);
try
{
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 );
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
@@ -123,7 +123,7 @@ OXMLTable::~OXMLTable()
SvXMLImportContext* OXMLTable::CreateChildContext(
sal_uInt16 _nPrefix,
- const ::rtl::OUString& _rLocalName,
+ const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index daebbec01f8b..d7e44d48efad 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -43,7 +43,7 @@ namespace rptxml
::std::vector<sal_Int32> m_aHeight;
::std::vector<sal_Int32> m_aWidth;
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
- ::rtl::OUString m_sStyleName;
+ OUString m_sStyleName;
sal_Int32 m_nColSpan;
sal_Int32 m_nRowSpan;
sal_Int32 m_nRowIndex;
@@ -56,14 +56,14 @@ namespace rptxml
OXMLTable( ORptFilter& 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::report::XSection >& _xSection
);
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/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 4b5d6ea96f80..fa83c1668f55 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -92,7 +92,7 @@ public:
RptMLMasterStylesContext_Impl(
ORptFilter& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName ,
+ const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~RptMLMasterStylesContext_Impl();
virtual void EndElement();
@@ -102,7 +102,7 @@ TYPEINIT1( RptMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
DBG_NAME(rpt_RptMLMasterStylesContext_Impl)
RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
ORptFilter& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName ,
+ const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList ) :
XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList )
,m_rImport(rImport)
@@ -170,9 +170,9 @@ sal_Int32 ReadThroughComponent(
catch (const SAXParseException& r)
{
#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));
aError.append(r.LineNumber);
aError.append(',');
@@ -213,7 +213,7 @@ sal_Int32 ReadThroughComponent(
const uno::Reference<XComponentContext> & rxContext,
const Reference< document::XGraphicObjectResolver > & _xGraphicObjectResolver,
const Reference<document::XEmbeddedObjectResolver>& _xEmbeddedObjectResolver,
- const ::rtl::OUString& _sFilterName
+ const OUString& _sFilterName
,const uno::Reference<beans::XPropertySet>& _xProp)
{
OSL_ENSURE( xStorage.is(), "Need storage!");
@@ -227,7 +227,7 @@ sal_Int32 ReadThroughComponent(
try
{
// open stream (and set parser input)
- ::rtl::OUString sStreamName = ::rtl::OUString::createFromAscii(pStreamName);
+ OUString sStreamName = OUString::createFromAscii(pStreamName);
if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) )
{
// stream name not found! Then try the compatibility name.
@@ -238,7 +238,7 @@ sal_Int32 ReadThroughComponent(
return 0;
// if so, does the stream exist?
- sStreamName = ::rtl::OUString::createFromAscii(pCompatibilityStreamName);
+ sStreamName = OUString::createFromAscii(pCompatibilityStreamName);
if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) )
return 0;
}
@@ -247,7 +247,7 @@ sal_Int32 ReadThroughComponent(
xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ );
uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW );
- xProps->getPropertyValue( ::rtl::OUString("Encrypted") ) >>= bEncrypted;
+ xProps->getPropertyValue( OUString("Encrypted") ) >>= bEncrypted;
}
catch (const packages::WrongPasswordException&)
{
@@ -299,14 +299,14 @@ uno::Reference< uno::XInterface > ORptImportHelper::create(uno::Reference< uno::
return static_cast< XServiceInfo* >(new ORptFilter(xContext, IMPORT_SETTINGS ));
}
//---------------------------------------------------------------------
-::rtl::OUString ORptImportHelper::getImplementationName_Static( ) throw (RuntimeException)
+OUString ORptImportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(SERVICE_SETTINGSIMPORTER);
+ return OUString(SERVICE_SETTINGSIMPORTER);
}
//---------------------------------------------------------------------
-Sequence< ::rtl::OUString > ORptImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+Sequence< OUString > ORptImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
+ Sequence< OUString > aSupported(1);
aSupported[0] = SERVICE_IMPORTFILTER;
return aSupported;
}
@@ -317,14 +317,14 @@ Reference< XInterface > ORptContentImportHelper::create(const Reference< XCompon
IMPORT_FONTDECLS ));
}
//---------------------------------------------------------------------
-::rtl::OUString ORptContentImportHelper::getImplementationName_Static( ) throw (RuntimeException)
+OUString ORptContentImportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(SERVICE_CONTENTIMPORTER);
+ return OUString(SERVICE_CONTENTIMPORTER);
}
//---------------------------------------------------------------------
-Sequence< ::rtl::OUString > ORptContentImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
+ Sequence< OUString > aSupported(1);
aSupported[0] = SERVICE_IMPORTFILTER;
return aSupported;
}
@@ -337,14 +337,14 @@ Reference< XInterface > ORptStylesImportHelper::create(Reference< XComponentCont
IMPORT_FONTDECLS ));
}
//---------------------------------------------------------------------
-::rtl::OUString ORptStylesImportHelper::getImplementationName_Static( ) throw (RuntimeException)
+OUString ORptStylesImportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(SERVICE_STYLESIMPORTER);
+ return OUString(SERVICE_STYLESIMPORTER);
}
//---------------------------------------------------------------------
-Sequence< ::rtl::OUString > ORptStylesImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
+ Sequence< OUString > aSupported(1);
aSupported[0] = SERVICE_IMPORTFILTER;
return aSupported;
}
@@ -356,14 +356,14 @@ Reference< XInterface > ORptMetaImportHelper::create(Reference< XComponentContex
IMPORT_META));
}
//---------------------------------------------------------------------
-::rtl::OUString ORptMetaImportHelper::getImplementationName_Static( ) throw (RuntimeException)
+OUString ORptMetaImportHelper::getImplementationName_Static( ) throw (RuntimeException)
{
- return ::rtl::OUString(SERVICE_METAIMPORTER);
+ return OUString(SERVICE_METAIMPORTER);
}
//---------------------------------------------------------------------
-Sequence< ::rtl::OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
+Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(1);
+ Sequence< OUString > aSupported(1);
aSupported[0] = SERVICE_IMPORTFILTER;
return aSupported;
}
@@ -378,11 +378,11 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sa
DBG_CTOR(rpt_ORptFilter,NULL);
GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_100TH);
GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
- GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ),
+ GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ),
GetXMLToken(XML_N_RPT),
XML_NAMESPACE_REPORT );
- GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np___rpt) ),
+ GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np___rpt) ),
GetXMLToken(XML_N_RPT_OASIS),
XML_NAMESPACE_REPORT );
@@ -406,32 +406,32 @@ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContex
}
// -----------------------------------------------------------------------------
-::rtl::OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString ORptFilter::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString("com.sun.star.comp.report.OReportFilter");
+ return OUString("com.sun.star.comp.report.OReportFilter");
}
//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ORptFilter::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL ORptFilter::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > ORptFilter::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);
+ uno::Sequence< OUString > aServices(1);
aServices.getArray()[0] = SERVICE_IMPORTFILTER;
return aServices;
}
//--------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL ORptFilter::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ORptFilter::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_Static();
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL ORptFilter::supportsService(const ::rtl::OUString& ServiceName) throw( uno::RuntimeException )
+sal_Bool SAL_CALL ORptFilter::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static());
}
@@ -457,7 +457,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
- ::rtl::OUString sFileName;
+ OUString sFileName;
uno::Reference< embed::XStorage > xStorage;
uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier;
@@ -515,9 +515,9 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
#if OSL_DEBUG_LEVEL > 1
uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY );
- uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames();
- const ::rtl::OUString* pDebugIter = aSeq.getConstArray();
- const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength();
+ uno::Sequence< OUString> aSeq = xAccess->getElementNames();
+ const OUString* pDebugIter = aSeq.getConstArray();
+ const OUString* pDebugEnd = pDebugIter + aSeq.getLength();
for(;pDebugIter != pDebugEnd;++pDebugIter)
{
(void)*pDebugIter;
@@ -535,29 +535,29 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::UNO_QUERY );
uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory( m_xReportDefinition, uno::UNO_QUERY);
- aArgs[0] <<= beans::NamedValue(::rtl::OUString("Storage"),uno::makeAny(xStorage));
- xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(::rtl::OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY);
+ aArgs[0] <<= beans::NamedValue(OUString("Storage"),uno::makeAny(xStorage));
+ xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY);
- static const ::rtl::OUString s_sOld("OldFormat");
+ static const OUString s_sOld("OldFormat");
static comphelper::PropertyMapEntry pMap[] =
{
{ MAP_LEN( "OldFormat" ), 1, &::getCppuType((const sal_Bool*)0), beans::PropertyAttribute::BOUND, 0 },
- { MAP_LEN( "StreamName"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
{ MAP_LEN("PrivateData"), 0, &::getCppuType( (uno::Reference<XInterface> *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "BaseURI"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
- { MAP_LEN( "StreamRelPath"), 0, &::getCppuType( (::rtl::OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
::comphelper::MediaDescriptor aDescriptor(rDescriptor);
uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
- const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) );
- xProp->setPropertyValue(rtl::OUString("BaseURI"), uno::makeAny(sVal));
- const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString("HierarchicalDocumentName"),::rtl::OUString()) );
- xProp->setPropertyValue(rtl::OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName));
+ const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) );
+ xProp->setPropertyValue(OUString("BaseURI"), uno::makeAny(sVal));
+ const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),OUString()) );
+ xProp->setPropertyValue(OUString("StreamRelPath"), uno::makeAny(sHierarchicalDocumentName));
uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY);
- static const ::rtl::OUString s_sMeta("meta.xml");
- static const rtl::OUString s_sStreamName("StreamName");
+ static const OUString s_sMeta("meta.xml");
+ static const OUString s_sStreamName("StreamName");
xProp->setPropertyValue(s_sStreamName, uno::makeAny(s_sMeta));
sal_Int32 nRet = ReadThroughComponent( xStorage
,xModel
@@ -582,7 +582,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
if ( nRet == 0 )
{
- xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("settings.xml")));
+ xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString("settings.xml")));
nRet = ReadThroughComponent( xStorage
,xModel
,"settings.xml"
@@ -596,7 +596,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
}
if ( nRet == 0 )
{
- xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("styles.xml")));
+ xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString("styles.xml")));
nRet = ReadThroughComponent(xStorage
,xModel
,"styles.xml"
@@ -610,7 +610,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
if ( nRet == 0 )
{
- xProp->setPropertyValue(s_sStreamName, uno::makeAny(::rtl::OUString("content.xml")));
+ xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString("content.xml")));
nRet = ReadThroughComponent( xStorage
,xModel
,"content.xml"
@@ -656,7 +656,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
}
// -----------------------------------------------------------------------------
SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext *pContext = 0;
@@ -674,7 +674,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
const SvXMLStylesContext* pAutoStyles = GetAutoStyles();
if ( pAutoStyles )
{
- XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,::rtl::OUString("pm1")));
+ XMLPropStyleContext* pAutoStyle = PTR_CAST(XMLPropStyleContext,pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_PAGE_MASTER,OUString("pm1")));
if ( pAutoStyle )
{
pAutoStyle->FillPropertySet(getReportDefinition().get());
@@ -963,7 +963,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
return *m_pCellElemTokenMap;
}
// -----------------------------------------------------------------------------
-SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLocalName,
+SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName,
const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle )
{
SvXMLImportContext* pContext = bIsAutoStyle ? GetAutoStyles() : GetStyles();
@@ -992,7 +992,7 @@ void ORptFilter::leaveEventContext()
}
// -----------------------------------------------------------------------------
SvXMLImportContext *ORptFilter::CreateFontDeclsContext(
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
XMLFontStylesContext *pFSContext =
@@ -1014,7 +1014,7 @@ void ORptFilter::FinishStyles()
GetStyles()->FinishStyles( sal_True );
}
// -----------------------------------------------------------------------------
-::rtl::OUString ORptFilter::convertFormula(const ::rtl::OUString& _sFormula)
+OUString ORptFilter::convertFormula(const OUString& _sFormula)
{
return _sFormula;
}
@@ -1052,7 +1052,7 @@ void ORptFilter::endDocument( void )
SvXMLImport::endDocument();
}
// -----------------------------------------------------------------------------
-void ORptFilter::removeFunction(const ::rtl::OUString& _sFunctionName)
+void ORptFilter::removeFunction(const OUString& _sFunctionName)
{
m_aFunctions.erase(_sFunctionName);
}
@@ -1062,7 +1062,7 @@ void ORptFilter::insertFunction(const ::com::sun::star::uno::Reference< ::com::s
m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction));
}
// -----------------------------------------------------------------------------
-SvXMLImportContext* ORptFilter::CreateMetaContext(const ::rtl::OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&)
+SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&)
{
SvXMLImportContext* pContext = NULL;
@@ -1080,7 +1080,7 @@ sal_Bool ORptFilter::isOldFormat() const
uno::Reference<beans::XPropertySet> xProp = getImportInfo();
if ( xProp.is() )
{
- const static ::rtl::OUString s_sOld("OldFormat");
+ const static OUString s_sOld("OldFormat");
if ( xProp->getPropertySetInfo()->hasPropertyByName(s_sOld))
{
xProp->getPropertyValue(s_sOld) >>= bOldFormat;
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index c2327d2c8883..b31940d074ab 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -103,16 +103,16 @@ private:
sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
- SvXMLImportContext* CreateStylesContext(const ::rtl::OUString& rLocalName,
+ SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle );
- 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* CreateFontDeclsContext(const ::rtl::OUString& rLocalName,
+ SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
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 XMLShapeImportHelper* CreateShapeImport();
@@ -126,12 +126,12 @@ public:
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
// ::com::sun::star::lang::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);
- 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 & xContext);
@@ -167,13 +167,13 @@ public:
inline UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return m_xColumnStylesPropertySetMapper; }
inline UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return m_xRowStylesPropertySetMapper; }
inline UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return m_xTableStylesPropertySetMapper; }
- static ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula);
+ static OUString convertFormula(const OUString& _sFormula);
/** inserts a new function
*
* \param _xFunction
*/
void insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction);
- void removeFunction(const ::rtl::OUString& _sFunctionName);
+ void removeFunction(const OUString& _sFunctionName);
inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; }
virtual SvXMLImport& getGlobalContext();
@@ -191,8 +191,8 @@ public:
class ORptImportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -204,8 +204,8 @@ public:
class ORptContentImportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -217,8 +217,8 @@ public:
class ORptStylesImportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
@@ -230,8 +230,8 @@ public:
class ORptMetaImportHelper
{
public:
- static ::rtl::OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
- static Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static Sequence< OUString > getSupportedServiceNames_Static( ) 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 & xContext);
};
diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx
index 6b524c833b39..8ecac5ebe36a 100644
--- a/reportdesign/source/inc/GroupProperties.hxx
+++ b/reportdesign/source/inc/GroupProperties.hxx
@@ -26,7 +26,7 @@ namespace rptshared
struct GroupProperties
{
::sal_Int32 m_nGroupInterval;
- ::rtl::OUString m_sExpression;
+ OUString m_sExpression;
::sal_Int16 m_nGroupOn;
::sal_Int16 m_nKeepTogether;
::sal_Bool m_eSortAscending;
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 681023fb232c..54ff5c2f7e58 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -276,22 +276,22 @@ void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt )
//-----------------------------------------------------------------------
namespace
{
- void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< ::rtl::OUString >& _rEntries )
+ void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< OUString >& _rEntries )
{
- const ::rtl::OUString* pEntries = _rEntries.getConstArray();
+ const OUString* pEntries = _rEntries.getConstArray();
sal_Int32 nEntries = _rEntries.getLength();
for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries )
_rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries) );
}
void lcl_addToList( OAddFieldWindowListBox& _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(PROPERTY_LABEL) )
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
if ( !sLabel.isEmpty() )
@@ -324,10 +324,10 @@ void OAddFieldWindow::Update()
SetText(aTitle);
if ( m_xRowSet.is() )
{
- ::rtl::OUString sCommand( m_aCommandName );
+ OUString sCommand( m_aCommandName );
sal_Int32 nCommandType( m_nCommandType );
sal_Bool bEscapeProcessing( m_bEscapeProcessing );
- ::rtl::OUString sFilter( m_sFilter );
+ OUString sFilter( m_sFilter );
OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand );
OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType );
@@ -353,7 +353,7 @@ void OAddFieldWindow::Update()
// add the parameter columns to the list
uno::Reference< ::com::sun::star::sdbc::XRowSet > xRowSet(m_xRowSet,uno::UNO_QUERY);
- Sequence< ::rtl::OUString > aParamNames( getParameterNames( xRowSet ) );
+ Sequence< OUString > aParamNames( getParameterNames( xRowSet ) );
lcl_addToList( *m_pListBox, aParamNames );
// set title
@@ -454,11 +454,11 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent
{
if ( m_pListBox.get() )
{
- ::rtl::OUString sName;
+ OUString sName;
if ( (_rEvent.Accessor >>= sName) && m_xColumns->hasByName(sName) )
{
uno::Reference< beans::XPropertySet> xColumn(m_xColumns->getByName(sName),UNO_QUERY_THROW);
- ::rtl::OUString sLabel;
+ OUString sLabel;
if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) )
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
if ( !sLabel.isEmpty() )
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index fa4fb8b99413..5839248267ed 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -213,7 +213,7 @@ namespace rptui
if ( bLastCondition )
{
Reference< XFormatCondition > xFormatCondition( m_xCopy->getByIndex( 0 ), UNO_QUERY_THROW );
- xFormatCondition->setFormula( ::rtl::OUString() );
+ xFormatCondition->setFormula( OUString() );
(*pos)->setCondition( xFormatCondition );
}
else
@@ -429,9 +429,9 @@ namespace rptui
}
// -----------------------------------------------------------------------------
- ::rtl::OUString ConditionalFormattingDialog::getDataField() const
+ OUString ConditionalFormattingDialog::getDataField() const
{
- ::rtl::OUString sDataField;
+ OUString sDataField;
try
{
sDataField = m_xFormatConditions->getDataField();
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 2d6ad039369a..eee8c29e0762 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -63,7 +63,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed
m_pSubEdit->EnableRTL( sal_False );
m_pSubEdit->SetPosPixel( Point() );
- m_aFormula.SetText(::rtl::OUString("..."));
+ m_aFormula.SetText(OUString("..."));
m_aFormula.SetClickHdl( LINK( this, ConditionField, OnFormula ) );
m_aFormula.Show();
m_pSubEdit->Show();
@@ -88,7 +88,7 @@ void ConditionField::Resize()
// -----------------------------------------------------------------------------
IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ )
{
- ::rtl::OUString sFormula(m_pSubEdit->GetText());
+ OUString sFormula(m_pSubEdit->GetText());
const sal_Int32 nLen = sFormula.getLength();
if ( nLen )
{
@@ -569,21 +569,21 @@ void Condition::impl_layoutOperands()
}
// -----------------------------------------------------------------------------
-void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula )
+void Condition::impl_setCondition( const OUString& _rConditionFormula )
{
// determine the condition's type and comparison operation
ConditionType eType( eFieldValueComparison );
ComparisonOperation eOperation( eBetween );
// LHS and RHS, matched below
- ::rtl::OUString sLHS, sRHS;
+ OUString sLHS, sRHS;
if ( !_rConditionFormula.isEmpty() )
{
// the unprefixed expression which forms the condition
ReportFormula aFormula( _rConditionFormula );
OSL_ENSURE( aFormula.getType() == ReportFormula::Expression, "Condition::setCondition: illegal formula!" );
- ::rtl::OUString sExpression;
+ OUString sExpression;
if ( aFormula.getType() == ReportFormula::Expression )
sExpression = aFormula.getExpression();
// as fallback, if the below matching does not succeed, assume
@@ -593,7 +593,7 @@ void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula )
// the data field (or expression) to which our control is bound
const ReportFormula aFieldContentFormula( m_rAction.getDataField() );
- const ::rtl::OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() );
+ const OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() );
// check whether one of the Field Value Expression Factories recognizes the expression
for ( ConditionalExpressions::const_iterator exp = m_aConditionalExpressions.begin();
@@ -627,7 +627,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >&
if ( !_rxCondition.is() )
return;
- ::rtl::OUString sConditionFormula;
+ OUString sConditionFormula;
try
{
if ( _rxCondition.is() )
@@ -678,15 +678,15 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi
const ConditionType eType( impl_getCurrentConditionType() );
const ComparisonOperation eOperation( impl_getCurrentComparisonOperation() );
- const ::rtl::OUString sLHS( m_aCondLHS.GetText() );
- const ::rtl::OUString sRHS( m_aCondRHS.GetText() );
+ const OUString sLHS( m_aCondLHS.GetText() );
+ const OUString sRHS( m_aCondRHS.GetText() );
- ::rtl::OUString sUndecoratedFormula( sLHS );
+ OUString sUndecoratedFormula( sLHS );
if ( eType == eFieldValueComparison )
{
ReportFormula aFieldContentFormula( m_rAction.getDataField() );
- ::rtl::OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() );
+ OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() );
PConditionalExpression pFactory( m_aConditionalExpressions[ eOperation ] );
sUndecoratedFormula = pFactory->assembleExpression( sUnprefixedFieldContent, sLHS, sRHS );
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index b46b2e768915..321baefd8089 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -159,7 +159,7 @@ namespace rptui
inline ComparisonOperation
impl_getCurrentComparisonOperation() const;
- void impl_setCondition( const ::rtl::OUString& _rConditionFormula );
+ void impl_setCondition( const OUString& _rConditionFormula );
private:
DECL_LINK( OnTypeSelected, ListBox* );
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index aa393881f7c2..e2574d109280 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -177,12 +177,12 @@ short ODateTimeDialog::Execute()
return nRet;
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime)
+OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime)
{
uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey);
OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
- ::rtl::OUString sFormat;
- xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat;
+ OUString sFormat;
+ xFormSet->getPropertyValue(OUString("FormatString")) >>= sFormat;
double nValue = 0;
if ( _bTime )
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 61b9dcbc3293..abbed45b6655 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -45,7 +45,7 @@ namespace rptui
FormulaDialog::FormulaDialog(Window* pParent
, const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory
, const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr
- , const ::rtl::OUString& _sFormula
+ , const OUString& _sFormula
, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet)
: FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this)
,m_aFunctionManager(_pFunctionMgr)
@@ -53,7 +53,7 @@ FormulaDialog::FormulaDialog(Window* pParent
,m_pAddField(NULL)
,m_xRowSet(_xRowSet)
,m_pEdit(NULL)
- ,m_sFormula(::rtl::OUString("="))
+ ,m_sFormula(OUString("="))
,m_nStart(0)
,m_nEnd(1)
{
@@ -64,7 +64,7 @@ FormulaDialog::FormulaDialog(Window* pParent
else
m_sFormula = _sFormula;
}
- m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY);
+ m_xParser.set(_xServiceFactory->createInstance(OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY);
if ( m_xParser.is() )
m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper();
fill();
@@ -86,8 +86,8 @@ FormulaDialog::~FormulaDialog()
{
if ( m_pAddField )
{
- SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) );
- aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
+ SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) );
+ aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
boost::scoped_ptr<Window> aTemp2(m_pAddField);
m_pAddField = NULL;
@@ -198,10 +198,10 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
{
m_pAddField = new OAddFieldWindow(this,m_xRowSet);
m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) );
- SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) );
+ SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) );
if ( aDlgOpt.Exists() )
{
- m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
+ m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
}
@@ -221,11 +221,11 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg)
uno::Sequence< beans::PropertyValue > aValue;
aArgs[0].Value >>= aValue;
::svx::ODataAccessDescriptor aDescriptor(aValue);
- ::rtl::OUString sName;
+ OUString sName;
aDescriptor[ ::svx::daColumnName ] >>= sName;
if ( !sName.isEmpty() )
{
- sName = ::rtl::OUString("[") + sName + ::rtl::OUString("]");
+ sName = OUString("[") + sName + OUString("]");
m_pEdit->SetText(sName);
}
}
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index eb127406bb75..06753d8d7653 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -31,7 +31,7 @@ namespace rptui
static sal_uInt32 s_nReportFormat = (sal_uInt32)-1;
if ( (sal_uInt32)-1 == s_nReportFormat )
{
- s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" ));
+ s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" ));
OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "Bad exchange id!");
}
return s_nReportFormat;
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index d8b950fb1ac6..201093267276 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -59,13 +59,13 @@ using namespace ::comphelper;
void lcl_addToList_throw( ComboBoxControl& _rListBox, ::std::vector<ColumnInfo>& o_aColumnList,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::UNO_QUERY_THROW);
- ::rtl::OUString sLabel;
+ OUString sLabel;
if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) )
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
o_aColumnList.push_back( ColumnInfo(*pEntries,sLabel) );
@@ -357,7 +357,7 @@ void OFieldExpressionControl::lateInit()
aFont.SetWeight( WEIGHT_LIGHT );
SetFont(aFont);
- InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */);
+ InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */);
InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100);
m_pComboCell = new ComboBoxControl( &GetDataWindow() );
@@ -455,7 +455,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
if ( xGroup.is() )
{
sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos();
- ::rtl::OUString sExpression;
+ OUString sExpression;
if ( COMBOBOX_ENTRY_NOTFOUND == nPos )
sExpression = m_pComboCell->GetText();
else
@@ -499,7 +499,7 @@ String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ )
try
{
uno::Reference< report::XGroup> xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]);
- ::rtl::OUString sExpression = xGroup->getExpression();
+ OUString sExpression = xGroup->getExpression();
for(::std::vector<ColumnInfo>::const_iterator aIter = m_aColumnInfo.begin(); aIter != m_aColumnInfo.end();++aIter)
{
@@ -1116,7 +1116,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
}
// -----------------------------------------------------------------------------
-sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColumnName)
+sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName)
{
sal_Int32 nDataType = sdbc::DataType::VARCHAR;
try
@@ -1344,7 +1344,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
nPos = 0;
}
m_aGroupOnLst.SelectEntryPos(nPos);
- m_aGroupIntervalEd.SetText(rtl::OUString::valueOf(_xGroup->getGroupInterval()));
+ m_aGroupIntervalEd.SetText(OUString::valueOf(_xGroup->getGroupInterval()));
m_aGroupIntervalEd.SaveValue();
m_aGroupIntervalEd.Enable( nPos != 0 );
m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether());
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 9680fb8584ca..b37468cc4be5 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -79,17 +79,17 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle
return nId;
}
// -----------------------------------------------------------------------------
-::rtl::OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement)
+OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement)
{
OSL_ENSURE(_xElement.is(),"Found report element which is NULL!");
- ::rtl::OUString sTempName;
+ OUString sTempName;
_xElement->getPropertyValue(PROPERTY_NAME) >>= sTempName;
- ::rtl::OUStringBuffer sName = sTempName;
+ OUStringBuffer sName = sTempName;
uno::Reference< report::XFixedText> xFixedText(_xElement,uno::UNO_QUERY);
uno::Reference< report::XReportControlModel> xReportModel(_xElement,uno::UNO_QUERY);
if ( xFixedText.is() )
{
- sName.append(::rtl::OUString(" : "));
+ sName.append(OUString(" : "));
sName.append(xFixedText->getLabel());
}
else if ( xReportModel.is() && _xElement->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) )
@@ -97,7 +97,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle
ReportFormula aFormula( xReportModel->getDataField() );
if ( aFormula.isValid() )
{
- sName.append(::rtl::OUString(" : "));
+ sName.append(OUString(" : "));
sName.append( aFormula.getUndecoratedContent() );
}
}
@@ -151,7 +151,7 @@ class NavigatorTree : public ::cppu::BaseMutex
::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener;
unsigned short m_nTimerCounter;
- SvTreeListEntry* insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData);
+ SvTreeListEntry* insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData);
void traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND);
void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent);
@@ -500,7 +500,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (
m_pSelectionListener->unlock();
}
// -----------------------------------------------------------------------------
-SvTreeListEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData)
+SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData)
{
SvTreeListEntry* pEntry = NULL;
if ( _nImageId )
@@ -676,7 +676,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent )
{
SvTreeListEntry* pEntry = find(_rEvent.Source);
uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW);
- ::rtl::OUString sName;
+ OUString sName;
uno::Reference< beans::XPropertySetInfo> xInfo = xProp->getPropertySetInfo();
if ( xInfo.is() )
{
@@ -725,7 +725,7 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent )
UserData* pData = static_cast<UserData*>(pEntry->GetUserData());
xProp.set(_rEvent.Element,uno::UNO_QUERY);
pData->setContent(xProp);
- ::rtl::OUString sName;
+ OUString sName;
xProp->getPropertyValue(PROPERTY_NAME) >>= sName;
SetEntryText(pEntry,sName);
}
@@ -828,7 +828,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
}
else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName)
{
- ::rtl::OUString sNewName;
+ OUString sNewName;
_rEvent.NewValue >>= sNewName;
m_pTree->SetEntryText(pEntry,sNewName);
}
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 07db3b7e1373..bee27840d260 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -62,8 +62,8 @@ class OAddFieldWindow :public FloatingWindow
PushButton m_aInsertButton;
Link m_aCreateLink;
- ::rtl::OUString m_aCommandName;
- ::rtl::OUString m_sFilter;
+ OUString m_aCommandName;
+ OUString m_sFilter;
sal_Int32 m_nCommandType;
sal_Bool m_bEscapeProcessing;
::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener;
@@ -84,7 +84,7 @@ public:
virtual void GetFocus();
virtual long PreNotify( NotifyEvent& _rNEvt );
- inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; }
+ inline const OUString& GetCommand() const { return m_aCommandName; }
inline sal_Int32 GetCommandType() const { return m_nCommandType; }
inline sal_Bool GetEscapeProcessing() const { return m_bEscapeProcessing; }
inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; }
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 97a5331f4ce7..10142e381d85 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -36,7 +36,7 @@ namespace rptui
Link m_aCollapsedLink;
svtools::ColorConfig m_aColorConfig;
svtools::ExtendedColorConfig m_aExtendedColorConfig;
- ::rtl::OUString m_sColorEntry;
+ OUString m_sColorEntry;
sal_Int32 m_nColor;
sal_Int32 m_nTextBoundaries;
sal_Bool m_bCollapsed;
@@ -46,7 +46,7 @@ namespace rptui
protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
- OColorListener(Window* _pParent,const ::rtl::OUString& _sColorEntry);
+ OColorListener(Window* _pParent,const OUString& _sColorEntry);
virtual ~OColorListener();
using Window::Notify;
diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx
index a0cf8be24112..4a3a64e10291 100644
--- a/reportdesign/source/ui/inc/ColumnInfo.hxx
+++ b/reportdesign/source/ui/inc/ColumnInfo.hxx
@@ -25,16 +25,16 @@ namespace rptui
{
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)
{
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 465f02aebd63..4d8fa7c515cd 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -55,7 +55,7 @@ namespace rptui
virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) = 0;
virtual void moveConditionUp( size_t _nCondIndex ) = 0;
virtual void moveConditionDown( size_t _nCondIndex ) = 0;
- virtual ::rtl::OUString getDataField() const = 0;
+ virtual OUString getDataField() const = 0;
protected:
~IConditionalFormatAction() {}
@@ -107,7 +107,7 @@ namespace rptui
virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor );
virtual void moveConditionUp( size_t _nCondIndex );
virtual void moveConditionDown( size_t _nCondIndex );
- virtual ::rtl::OUString getDataField() const;
+ virtual OUString getDataField() const;
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index 102b52c6aa4d..f24d1f58e024 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -51,8 +51,8 @@ namespace rptui
{
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 >&);
@@ -60,9 +60,9 @@ namespace rptui
private:
// 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::XComponent:
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException);
@@ -70,20 +70,20 @@ namespace rptui
// ::com::sun::star::inspection::XPropertyHandler:
virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
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 ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
- virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
+ 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 ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
+ virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException);
protected:
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index ae709eec530a..6d2e16612080 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -68,7 +68,7 @@ class ODateTimeDialog : public ModalDialog
* \param _bTime
* \return
*/
- ::rtl::OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime);
+ OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime);
/** returns the number format key
@param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 7efd3f8a563f..e108a0e9968e 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -59,9 +59,9 @@ namespace rptui
virtual ~DefaultComponentInspectorModel();
// 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);
// XObjectInspectorModel
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException);
@@ -72,15 +72,15 @@ namespace rptui
virtual void SAL_CALL setIsReadOnly( ::sal_Bool _isreadonly ) 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/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index efaae2c8bafd..d0bd083cc181 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -114,9 +114,9 @@ namespace rptui
inline OReportController& getController() const { return m_rReportController; }
void SetMode( DlgEdMode m_eMode );
- void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
+ void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
sal_uInt16 GetInsertObj() const;
- rtl::OUString GetInsertObjString() const;
+ OUString GetInsertObjString() const;
DlgEdMode GetMode() const { return m_eMode; }
/** cuts the current selection in this section
@@ -168,7 +168,7 @@ namespace rptui
If the position is grater than the current elements, the section will be appended.
*/
void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
- ,const ::rtl::OUString& _sColorEntry
+ ,const OUString& _sColorEntry
,sal_uInt16 _nPosition = USHRT_MAX);
inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; }
@@ -231,8 +231,8 @@ namespace rptui
*/
void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections);
- ::rtl::OUString getCurrentPage() const;
- void setCurrentPage(const ::rtl::OUString& _sLastActivePage);
+ OUString getCurrentPage() const;
+ void setCurrentPage(const OUString& _sLastActivePage);
/** checks if the keycode is known by the child windows
@param _rCode the keycode
diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx
index cfd340cb4c97..6cd3f195fd38 100644
--- a/reportdesign/source/ui/inc/EndMarker.hxx
+++ b/reportdesign/source/ui/inc/EndMarker.hxx
@@ -33,7 +33,7 @@ namespace rptui
protected:
virtual void ImplInitSettings();
public:
- OEndMarker(Window* _pParent,const ::rtl::OUString& _sColorEntry);
+ OEndMarker(Window* _pParent,const OUString& _sColorEntry);
virtual ~OEndMarker();
// windows
diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
index ba75b9274b93..b32b90395df4 100644
--- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
+++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
@@ -40,7 +40,7 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent) throw(::com::sun::star::uno::RuntimeException);
void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
- void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText );
+ void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText );
sal_Int32 getTextColor();
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index 8bb6a5238b66..fcfbc6c82e62 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -56,7 +56,7 @@ public:
FormulaDialog( Window* pParent
, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory
, const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
- , const ::rtl::OUString& _sFormula
+ , const OUString& _sFormula
, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet);
virtual ~FormulaDialog();
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index df42f61bfd98..99dbd351a40d 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -49,7 +49,7 @@ public:
virtual sal_uInt32 getCount() const;
virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const;
virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const;
- virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const;
+ virtual const formula::IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const;
virtual sal_Unicode getSingleToken(const EToken _eToken) const;
::boost::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const;
@@ -64,18 +64,18 @@ public:
FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription);
virtual ~FunctionDescription(){}
- virtual ::rtl::OUString getFunctionName() const ;
+ virtual OUString getFunctionName() const ;
virtual const formula::IFunctionCategory* getCategory() const ;
- virtual ::rtl::OUString getDescription() const ;
+ virtual OUString getDescription() const ;
virtual xub_StrLen getSuppressedArgumentCount() const ;
- virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ;
+ virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ;
virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ;
virtual void initArgumentInfo() const;
- virtual ::rtl::OUString getSignature() const ;
- virtual rtl::OString getHelpId() const ;
+ virtual OUString getSignature() const ;
+ virtual OString getHelpId() const ;
virtual sal_uInt32 getParameterCount() const ;
- virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ;
- virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ;
+ virtual OUString getParameterName(sal_uInt32 _nPos) const ;
+ virtual OUString getParameterDescription(sal_uInt32 _nPos) const ;
virtual bool isParameterOptional(sal_uInt32 _nPos) const ;
};
//============================================================================
@@ -94,7 +94,7 @@ public:
virtual const formula::IFunctionDescription* getFunction(sal_uInt32 _nPos) const;
virtual sal_uInt32 getNumber() const;
virtual const formula::IFunctionManager* getFunctionManager() const;
- virtual ::rtl::OUString getName() const;
+ virtual OUString getName() const;
};
// =============================================================================
} // rptui
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index bdef435806c2..ef9bfcfb1bcb 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -44,19 +44,19 @@ namespace rptui
struct DefaultFunction
{
- com::sun::star::beans::Optional< ::rtl::OUString> m_sInitialFormula;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_sSearchString;
- ::rtl::OUString m_sFormula;
+ com::sun::star::beans::Optional< OUString> m_sInitialFormula;
+ OUString m_sName;
+ OUString m_sSearchString;
+ OUString m_sFormula;
::sal_Bool m_bPreEvaluated;
::sal_Bool m_bDeepTraversing;
- inline ::rtl::OUString getName() const { return m_sName; }
+ inline OUString getName() const { return m_sName; }
} ;
class OPropertyInfoService;
typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>, ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> > TFunctionPair;
- typedef ::std::multimap< ::rtl::OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions;
+ typedef ::std::multimap< OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions;
typedef ::comphelper::OSimpleListenerContainer < ::com::sun::star::beans::XPropertyChangeListener
, ::com::sun::star::beans::PropertyChangeEvent
> PropertyChangeListeners;
@@ -81,17 +81,17 @@ namespace rptui
@return
<TRUE/> if and only if the user successfully chose a clause
*/
- bool impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const;
+ bool impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const;
/** returns the data field type depending on the data field of the report control
*
* \param _sDataField if the data field is not empty it will be used as data field, otherwise the data field will be used.
* \return the data field type
*/
- sal_uInt32 impl_getDataFieldType_throw(const ::rtl::OUString& _sDataField = ::rtl::OUString()) const;
+ sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const;
- ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const ::rtl::OUString& _sConstantName,const ::rtl::OUString & PropertyName );
- ::com::sun::star::beans::Property getProperty(const ::rtl::OUString & PropertyName);
+ ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
+ ::com::sun::star::beans::Property getProperty(const OUString & PropertyName);
void implCreateListLikeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
,::com::sun::star::inspection::LineDescriptor & out_Descriptor
@@ -102,16 +102,16 @@ namespace rptui
void implCreateListLikeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
,::com::sun::star::inspection::LineDescriptor & out_Descriptor
- ,const ::std::vector< ::rtl::OUString>& _aEntries
+ ,const ::std::vector< OUString>& _aEntries
,sal_Bool _bReadOnlyControl
,sal_Bool _bTrueIfListBoxFalseIfComboBox
);
void checkPosAndSize( const ::com::sun::star::awt::Point& _aNewPos,
const ::com::sun::star::awt::Size& _aSize);
- ::rtl::OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue );
+ OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue );
- void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rFieldNames ) const;
+ void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< OUString >& _rFieldNames ) const;
/** Creates the function defined by the function template
*
@@ -119,7 +119,7 @@ namespace rptui
* \param _sDataField the data field
* \param _aFunction the function template
*/
- void impl_createFunction(const ::rtl::OUString& _sFunctionName,const ::rtl::OUString& _sDataField,const DefaultFunction& _aFunction);
+ void impl_createFunction(const OUString& _sFunctionName,const OUString& _sDataField,const DefaultFunction& _aFunction);
/** check whether the given function name is a countr function.
*
@@ -127,7 +127,7 @@ namespace rptui
* \param _Out_sScope the scope of the function
* \return When true it is a counter functions otherwise false.
*/
- bool impl_isCounterFunction_throw(const ::rtl::OUString& _sQuotedFunctionName,::rtl::OUString& _Out_sScope) const;
+ bool impl_isCounterFunction_throw(const OUString& _sQuotedFunctionName,OUString& _Out_sScope) const;
/** clear the own properties like function and scope and send a notification
*
@@ -136,51 +136,51 @@ namespace rptui
* \param _sOldScope
* \param _nOldDataFieldType
*/
- void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const ::rtl::OUString& _sOldFunctionName,const ::rtl::OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType);
+ void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const OUString& _sOldFunctionName,const OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType);
/** checks whether the name is a field or a parameter
*
* \param _sName the name to check
* \return true when it is a field or parameter otherwise false
*/
- bool impl_isDataField(const ::rtl::OUString& _sName) const;
+ bool impl_isDataField(const OUString& _sName) const;
/**return all formula in a semicolon separated list
*
* \param _rList the localized function names
*/
- void impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const;
+ void impl_fillFormulaList_nothrow(::std::vector< OUString >& _out_rList) const;
/** return all group names in a semicolon separated list starting with the group where this control is contained in.
*
* \param _rList fills the list with all scope names.
*/
- void impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const;
+ void impl_fillScopeList_nothrow(::std::vector< OUString >& _out_rList) const;
/** return all supported output formats of the report definition
*
* \param _rList fills the list with all mime types
*/
- void impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const;
+ void impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out_rList) const;
/** return the one supported output formats of the report definition
*
* \param _sMimetype the mimetype
*/
- ::rtl::OUString impl_ConvertMimeTypeToUI_nothrow(const ::rtl::OUString& _sMimetype) const;
+ OUString impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMimetype) const;
/** return the MimeType for the given UI Name
*
* \param _sUIName the doc ui name
*/
- ::rtl::OUString impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const;
+ OUString impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const;
/** get the functions supplier for the set scope, default is the surrounding group.
*
* \param _rsNamePostFix the name post fix which canbe used when the scope as name part is needed
* \return the function supplier
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(::rtl::OUString& _rsNamePostFix);
+ ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(OUString& _rsNamePostFix);
/** checks if the given function is a default function we know.
*
@@ -190,8 +190,8 @@ namespace rptui
* \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful.
* \return sal_True with known otherwise sal_False
*/
- sal_Bool isDefaultFunction(const ::rtl::OUString& _sQuotedFunction
- ,::rtl::OUString& _Out_rDataField
+ sal_Bool isDefaultFunction(const OUString& _sQuotedFunction
+ ,OUString& _Out_rDataField
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>& _xFunctionsSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>()
,bool _bSet = false) const;
@@ -203,8 +203,8 @@ namespace rptui
* \return
*/
sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction
- ,::rtl::OUString& _rDataField
- ,::rtl::OUString& _rsDefaultFunctionName) const;
+ ,OUString& _rDataField
+ ,OUString& _rsDefaultFunctionName) const;
/** fills the memeber m_aDefaultFunctions
*
@@ -218,7 +218,7 @@ namespace rptui
* \param _sFunction The name of the function.
* \param _sDataField The name of the data field.
*/
- void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const ::rtl::OUString& _sFunction,const ::rtl::OUString& _sDataField);
+ void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField);
void removeFunction();
@@ -238,8 +238,8 @@ namespace rptui
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 >&);
@@ -247,9 +247,9 @@ namespace rptui
explicit GeometryHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
// 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::XComponent:
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException);
@@ -257,20 +257,20 @@ namespace rptui
// ::com::sun::star::inspection::XPropertyHandler:
virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException);
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
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 ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
- virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
+ 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 ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
+ virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException);
protected:
@@ -286,8 +286,8 @@ namespace rptui
virtual void SAL_CALL disposing();
PropertyChangeListeners m_aPropertyListeners;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aFieldNames;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aParamNames;
+ ::com::sun::star::uno::Sequence< OUString > m_aFieldNames;
+ ::com::sun::star::uno::Sequence< OUString > m_aParamNames;
TFunctions m_aFunctionNames;
::std::vector< DefaultFunction > m_aDefaultFunctions;
DefaultFunction m_aCounterFunction;
@@ -302,8 +302,8 @@ namespace rptui
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OPropertyInfoService > m_pInfoService;
SAL_WNODEPRECATED_DECLARATIONS_POP
- mutable ::rtl::OUString m_sDefaultFunction;
- mutable ::rtl::OUString m_sScope;
+ mutable OUString m_sDefaultFunction;
+ mutable OUString m_sScope;
sal_uInt32 m_nDataFieldType;
mutable bool m_bNewFunction;
bool m_bIn;
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 1b67a6d5506a..53b7d50e4569 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -124,7 +124,7 @@ private:
/** returns the data type for the given column name
@param _sColumnName
*/
- sal_Int32 getColumnDataType(const ::rtl::OUString& _sColumnName);
+ sal_Int32 getColumnDataType(const OUString& _sColumnName);
/** shows the text given by the id in the multiline edit
@param _nResId the string id
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 833513ce9c45..97532abd31ef 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -45,8 +45,8 @@ namespace rptui
{
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 >&);
@@ -54,9 +54,9 @@ namespace rptui
explicit ReportComponentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
// 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::XComponent:
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException);
@@ -64,20 +64,20 @@ namespace rptui
// ::com::sun::star::inspection::XPropertyHandler:
virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
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 ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
- virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
- virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
+ 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 ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException);
+ virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException);
+ virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException);
virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException);
protected:
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index cb3c95cacc1e..9f2cbe0167fb 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -112,9 +112,9 @@ namespace rptui
::boost::shared_ptr<rptui::OReportModel>
m_aReportModel;
- ::rtl::OUString m_sName; /// name for the report definition
- ::rtl::OUString m_sLastActivePage; /// last active property browser page
- ::rtl::OUString m_sMode; /// the current mode of the controller
+ OUString m_sName; /// name for the report definition
+ OUString m_sLastActivePage; /// last active property browser page
+ OUString m_sMode; /// the current mode of the controller
sal_Int32 m_nSplitPos; /// the position of the splitter
sal_Int32 m_nPageNum; /// the page number from the restoreView call
sal_Int32 m_nSelectionCount;
@@ -137,7 +137,7 @@ namespace rptui
* \param _xSection the section where to create the formatted field
* \param _sFunction the function which will be set at the data field.
*/
- void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const ::rtl::OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD);
+ void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD);
/** switch the report header/footer sectionon off with undo or without depending on the given id.
*
* \param _nId Can either be SID_REPORTHEADER_WITHOUT_UNDO or SID_REPORTFOOTER_WITHOUT_UNDO or SID_REPORTHEADERFOOTER.