[Libreoffice-commits] .: 17 commits - rsc/source svtools/source toolkit/source tools/bootstrp tools/inc tools/Library_tl.mk tools/Package_inc.mk tools/source vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jun 13 03:45:39 PDT 2011
rsc/source/rsc/rsc.cxx | 2
svtools/source/dialogs/colrdlg.cxx | 2
toolkit/source/awt/vclxtabpagemodel.cxx | 6
toolkit/source/awt/vclxtoolkit.cxx | 8
toolkit/source/controls/animatedimages.cxx | 4
toolkit/source/controls/controlmodelcontainerbase.cxx | 22
toolkit/source/controls/dialogcontrol.cxx | 4
toolkit/source/controls/spinningprogress.cxx | 4
toolkit/source/controls/tabpagecontainer.cxx | 2
toolkit/source/controls/tabpagemodel.cxx | 7
tools/Library_tl.mk | 4
tools/Package_inc.mk | 2
tools/bootstrp/prj.cxx | 1
tools/inc/tools/geninfo.hxx | 233 --------
tools/inc/tools/iparser.hxx | 147 -----
tools/inc/tools/stream.hxx | 146 -----
tools/source/communi/geninfo.cxx | 417 ----------------
tools/source/communi/parser.cxx | 469 ------------------
tools/source/stream/stream.cxx | 190 -------
vcl/source/gdi/pdfwriter_impl2.cxx | 14
vcl/source/gdi/svgread.cxx | 2
21 files changed, 63 insertions(+), 1623 deletions(-)
New commits:
commit 2d2884ef604615ec32ca97dd454147b701920e00
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 11:34:47 2011 +0100
simplify and shrink this to used methods
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index cdb8ad0..13586fd 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -407,11 +407,8 @@ public:
{ nJustification = nJus; CreateFormatString(); }
sal_uInt8 GetJustification() const { return nJustification; }
- SvStream& WriteNumber( short nShort );
- SvStream& WriteNumber( sal_uInt16 nUInt16 );
- SvStream& WriteNumber( long nLong );
SvStream& WriteNumber( sal_uInt32 nUInt32 );
- SvStream& WriteNumber( int nInt );
+ SvStream& WriteNumber( sal_Int32 nInt32 );
sal_Size Read( void* pData, sal_Size nSize );
sal_Size Write( const void* pData, sal_Size nSize );
@@ -561,24 +558,6 @@ inline SvStream& operator<<( SvStream& rStr, SvStrPtr f )
return rStr;
}
-inline SvStream& SvStream::WriteNumber( short nShort )
-{
- WriteNumber( (long)nShort );
- return *this;
-}
-
-inline SvStream& SvStream::WriteNumber( sal_uInt16 nUShort )
-{
- WriteNumber( (sal_uInt32)nUShort );
- return *this;
-}
-
-inline SvStream& SvStream::WriteNumber( int nInt )
-{
- WriteNumber( (long)nInt );
- return *this;
-}
-
inline void SvStream::SetEndianSwap( sal_Bool bVal )
{
#ifdef OSL_BIGENDIAN
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index aa49d37..efbdae7 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1992,53 +1992,51 @@ void SvStream::CreateFormatString()
|*
*************************************************************************/
-SvStream& SvStream::WriteNumber( long nLong )
+SvStream& SvStream::WriteNumber( sal_Int32 nInt32 )
{
char buffer[256+12];
- char pType[] = "ld"; // Nicht static!
ByteString aFStr( aFormatString);
- aFStr += pType;
- int nLen;
+ aFStr += SAL_PRIdINT32;
+ sal_Size nLen;
switch ( nPrintfParams )
{
case SPECIAL_PARAM_NONE :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nLong );
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nInt32);
break;
case SPECIAL_PARAM_WIDTH :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nWidth, nLong );
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nWidth, nInt32);
break;
case SPECIAL_PARAM_PRECISION :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nPrecision,nLong);
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nPrecision, nInt32);
break;
default:
- nLen=sprintf(buffer, aFStr.GetBuffer(),nWidth,nPrecision,nLong);
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nWidth, nPrecision, nInt32);
}
- Write( buffer, (long)nLen );
+ Write( buffer, nLen );
return *this;
}
SvStream& SvStream::WriteNumber( sal_uInt32 nUInt32 )
{
char buffer[256+12];
- char pType[] = "lu"; // Nicht static!
ByteString aFStr( aFormatString);
- aFStr += pType;
- int nLen;
+ aFStr += SAL_PRIuUINT32;
+ sal_Size nLen;
switch ( nPrintfParams )
{
case SPECIAL_PARAM_NONE :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nUInt32 );
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nUInt32);
break;
case SPECIAL_PARAM_WIDTH :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nWidth, nUInt32 );
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nWidth, nUInt32);
break;
case SPECIAL_PARAM_PRECISION :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nPrecision, nUInt32 );
+ nLen = sprintf(buffer, aFStr.GetBuffer(), nPrecision, nUInt32);
break;
default:
- nLen=sprintf(buffer,aFStr.GetBuffer(),nWidth,nPrecision,nUInt32 );
+ nLen = sprintf(buffer,aFStr.GetBuffer(), nWidth, nPrecision, nUInt32);
}
- Write( buffer, (long)nLen );
+ Write( buffer, nLen );
return *this;
}
commit b7df478cda8f5b5051a5ef434b9411e8b6c13dec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 09:21:49 2011 +0100
remove unused WriteNumber float/double variants
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 3a835ac..cdb8ad0 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -394,7 +394,7 @@ public:
SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); }
SvStream& WriteByteString( const ByteString& rStr );
-: void SetPrecision( sal_uInt8 nPrec )
+ void SetPrecision( sal_uInt8 nPrec )
{ nPrecision = nPrec; CreateFormatString(); }
sal_uInt8 GetPrecision() const { return nPrecision; }
void SetWidth( sal_uInt8 nWid)
commit 05a71ca343aad7b0d8e803392dbe9d67526dbaf8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 09:21:26 2011 +0100
remove unused WriteNumber float/double variants
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 6c699c7..3a835ac 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -412,8 +412,6 @@ public:
SvStream& WriteNumber( long nLong );
SvStream& WriteNumber( sal_uInt32 nUInt32 );
SvStream& WriteNumber( int nInt );
- SvStream& WriteNumber( float nFloat );
- SvStream& WriteNumber( const double& rDouble );
sal_Size Read( void* pData, sal_Size nSize );
sal_Size Write( const void* pData, sal_Size nSize );
@@ -581,13 +579,6 @@ inline SvStream& SvStream::WriteNumber( int nInt )
return *this;
}
-inline SvStream& SvStream::WriteNumber( float nFloat )
-{
- double nTemp = nFloat;
- WriteNumber( nTemp );
- return *this;
-}
-
inline void SvStream::SetEndianSwap( sal_Bool bVal )
{
#ifdef OSL_BIGENDIAN
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index b5d1cbf..aa49d37 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -2042,31 +2042,6 @@ SvStream& SvStream::WriteNumber( sal_uInt32 nUInt32 )
return *this;
}
-
-SvStream& SvStream::WriteNumber( const double& rDouble )
-{
- char buffer[256+24];
- ByteString aFStr( aFormatString);
- aFStr += "lf";
- int nLen;
- switch ( nPrintfParams )
- {
- case SPECIAL_PARAM_NONE :
- nLen = sprintf( buffer, aFStr.GetBuffer(), rDouble );
- break;
- case SPECIAL_PARAM_WIDTH :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nWidth, rDouble );
- break;
- case SPECIAL_PARAM_PRECISION :
- nLen = sprintf( buffer, aFStr.GetBuffer(), nPrecision, rDouble);
- break;
- default:
- nLen=sprintf(buffer, aFStr.GetBuffer(),nWidth,nPrecision,rDouble);
- }
- Write( buffer, (long)nLen );
- return *this;
-}
-
/*************************************************************************
|*
|* Stream::CryptAndWriteBuffer()
commit c2e07f31ab9c2e250faa96d3eff1c5d838e6f5f8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 09:12:13 2011 +0100
remove unused Radix
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 9b79dc1..6c699c7 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -274,7 +274,6 @@ private:
// Formatierung von Strings
char cFiller;
- sal_uInt8 nRadix;
sal_uInt8 nPrecision;
sal_uInt8 nWidth;
sal_uInt8 nPrintfParams;
@@ -395,10 +394,7 @@ public:
SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); }
SvStream& WriteByteString( const ByteString& rStr );
- void SetRadix( sal_uInt8 nRad )
- { nRadix = nRad; CreateFormatString(); }
- sal_uInt8 GetRadix() const { return nRadix; }
- void SetPrecision( sal_uInt8 nPrec )
+: void SetPrecision( sal_uInt8 nPrec )
{ nPrecision = nPrec; CreateFormatString(); }
sal_uInt8 GetPrecision() const { return nPrecision; }
void SetWidth( sal_uInt8 nWid)
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 690bb3e..b5d1cbf 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -466,7 +466,6 @@ void SvStream::ImpInit()
eIOMode = STREAM_IO_DONTKNOW;
nBufFree = 0;
- nRadix = 10;
nPrecision = 0; // all significant digits
nWidth = 0; // default width
cFiller = ' ';
@@ -1997,10 +1996,6 @@ SvStream& SvStream::WriteNumber( long nLong )
{
char buffer[256+12];
char pType[] = "ld"; // Nicht static!
- if( nRadix == 16 )
- pType[1] = 'x';
- else if( nRadix == 8 )
- pType[1] = 'o';
ByteString aFStr( aFormatString);
aFStr += pType;
int nLen;
@@ -2026,10 +2021,6 @@ SvStream& SvStream::WriteNumber( sal_uInt32 nUInt32 )
{
char buffer[256+12];
char pType[] = "lu"; // Nicht static!
- if( nRadix == 16 )
- pType[1] = 'x';
- else if( nRadix == 8 )
- pType[1] = 'o';
ByteString aFStr( aFormatString);
aFStr += pType;
int nLen;
commit a483b5a2dc03e55d8d933e3915fa4c67b19c3b56
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 00:05:12 2011 +0100
rename SetKey to informative SetCryptMaskKey
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 9d77f9e..9b79dc1 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -269,7 +269,7 @@ private:
CharSet eStreamCharSet;
// Verschluesselung
- ByteString aKey; // aKey.Len != 0 -> Verschluesselung
+ rtl::OString m_aCryptMaskKey; // aCryptMaskKey.getLength != 0 -> Verschluesselung
unsigned char nCryptMask;
// Formatierung von Strings
@@ -337,8 +337,8 @@ public:
{ nCompressMode = nNewMode; }
sal_uInt16 GetCompressMode() const { return nCompressMode; }
- void SetKey( const ByteString& rKey );
- const ByteString& GetKey() const { return aKey; }
+ void SetCryptMaskKey(const rtl::OString& rCryptMaskKey);
+ const rtl::OString& GetCryptMaskKey() const { return m_aCryptMaskKey; }
void SetStreamCharSet( CharSet eCharSet )
{ eStreamCharSet = eCharSet; }
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 908b67e..690bb3e 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -2181,10 +2181,11 @@ unsigned char implGetCryptMask(const sal_Char* pStr, sal_Int32 nLen, long nVersi
return nCryptMask;
}
-void SvStream::SetKey( const ByteString& rKey )
+void SvStream::SetCryptMaskKey(const rtl::OString& rCryptMaskKey)
{
- aKey = rKey;
- nCryptMask = implGetCryptMask( aKey.GetBuffer(), aKey.Len(), GetVersion() );
+ m_aCryptMaskKey = rCryptMaskKey;
+ nCryptMask = implGetCryptMask(m_aCryptMaskKey.getStr(),
+ m_aCryptMaskKey.getLength(), GetVersion());
}
/*************************************************************************
commit 71d50536e31e5eadff6920bf075fd0779a719870
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 12 23:59:19 2011 +0100
remove unused GenericInformation
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 554e55a..fb6f0d5 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -33,7 +33,6 @@
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
-#include <tools/geninfo.hxx>
#include "bootstrp/prj.hxx"
#if defined(WNT)
commit 9e7e4ad113e2dc199ce2175fd869522e780b945c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 12 23:58:56 2011 +0100
remove unused GenericInformation
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 30df5f3..da3e027 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
$(eval $(call gb_Library_add_exception_objects,tl,\
- tools/source/communi/geninfo \
tools/source/datetime/datetime \
tools/source/datetime/tdate \
tools/source/datetime/ttime \
@@ -163,5 +162,5 @@ endif
# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
# -DOPTIMIZE
# no -DTOOLS_DLLIMPLEMENTATION on toolsdll
-# -DEXCEPTIONS_OFF -fno-exceptions on geninfo datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
+# -DEXCEPTIONS_OFF -fno-exceptions on datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
# vim: set noet sw=4 ts=4:
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 81c00da..45d6c4a 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenu
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx))
diff --git a/tools/inc/tools/geninfo.hxx b/tools/inc/tools/geninfo.hxx
deleted file mode 100644
index ee247e5..0000000
--- a/tools/inc/tools/geninfo.hxx
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _BOOTSTRP_GENINFO_HXX
-#define _BOOTSTRP_GENINFO_HXX
-
-#include "tools/toolsdllapi.h"
-
-#include <tools/string.hxx>
-#include <vector>
-
-// forwards
-class GenericInformationList;
-
-//
-// class GenericInformation
-//
-
-/******************************************************************************
-Purpose: holds generic informations and subinformations in a simple format
-******************************************************************************/
-
-class TOOLS_DLLPUBLIC GenericInformation : public ByteString // the key is stored in base class
-{
-friend class GenericInformationList; // can be child or/and parent
-private:
- ByteString sValue; // holds value of data
- ByteString sComment;
-
- GenericInformationList *pInfoList; // holds subinformations
- GenericInformationList *pParent; // holds a pointer to parent list
-
- // methods
- void ListDeleted() { pParent = NULL; } // allowed to be accessed
- // from friend class
- // GenericInformationList
-
-public:
- GenericInformation( const ByteString &rKey, const ByteString &rValue,
- GenericInformationList *pParentList = NULL,
- GenericInformationList *pSubInfos = NULL );
- GenericInformation( const GenericInformation& rInf, sal_Bool bCopySubs = sal_True);
-
- ~GenericInformation();
-
- ByteString &GetValue() { return sValue; }
- void SetValue( const ByteString &rValue ) { sValue = rValue; }
-
- ByteString &GetComment() { return sComment; }
- void SetComment( const ByteString &rComment ) { sComment = rComment; }
-
- // this methods used to handle sub informations
- sal_Bool InsertSubInfo( GenericInformation *pInfo );
- // siehe GenericInformationList
- sal_Bool InsertSubInfo( const ByteString &rPathKey, const ByteString &rValue,
- sal_Bool bSearchByPath = sal_False, sal_Bool bNewPath = sal_False);
- void RemoveSubInfo( GenericInformation *pInfo, sal_Bool bDelete = sal_False );
- // void RemoveSelf( sal_Bool bDelete = sal_False ); // loescht sich selbst aus der Parentliste
- // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- // bei bDelete = sal_True werden auch alle Sublisten UND DIE INFO SELBST geloescht.
- // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
- GenericInformation *GetSubInfo( ByteString &rKey, sal_Bool bSearchByPath = sal_False,
- sal_Bool bCreatePath = sal_False );
- // path can be something like this: src370/drives/o:
-
- void SetSubList( GenericInformationList *pSubList )
- { pInfoList = pSubList; }
- GenericInformationList *GetSubList() { return pInfoList; }
-};
-
-/* diese Klasse bietet einen SemaphoreLock zum lesen (und nicht Schreiben)
- * oder schreiben (und nicht lesen)
- */
-class GenericLockInformation : public GenericInformation
-{
-public:
-GenericLockInformation( const ByteString &rKey, const ByteString &rValue,
- GenericInformationList *pParentList = NULL,
- GenericInformationList *pSubInfos = NULL )
- : GenericInformation( rKey, rValue, pParentList, pSubInfos),
- aLockState( read ), nLockKey( 0 ) {};
-
- /* bietet einen Lockmechanismus fuer exclusive Zugriffe
- *
- * -"writeonly" wird angesprochen, wenn von der Wurzel ausgehend
- * ein Item veraendert werden soll. In der Zeit kann die Liste nicht
- * gelesen werden, womit keine Inconsistenzen entstehen koennen.
- *
- * -"read" wird zum Normalen lesen der Infos benutzt, 90% der Betriebszeit.
- * waerenddessen kann nicht geschrieben werden -> writeonly Lock.
- * Ist fuer den atomaren(nicht unterbrochenen) Lesezugriff gedacht
- *
- * -"readonly" wird zum niederschreiben des Teilbaums benutzt, was schon mal
- * 10 Minuten dauern kann. In der Zeit kann kein Writeonlylock gesetzt
- * werden, aber ein rescedule. Damit koennen andere Aktionen asynchron ausgefuert
- * werden, aber die Datensicherheit bleibt gewahrt
- *
- * Zustandsaenderung: writeonly <-> read <-> readonly
- *
- * nLockKey ist zum verschluesseln des LockZugriffs mit einem 32bit Wort vorgesehen.
- * ist der Schluessel nicht null, so kann nur mit dem Schluessel in
- * die Baumstruktur geschrieben werden.
- * ist der Schluessel nLockKey Null, dann kann jeder Schreiben und die Locks loesen
- */
- enum LockState{ writeonly, read, readonly };
-
- /* der Schreibschutz darf nur aktiviert werden, wenn
- * der Status auf Lesen steht
- */
- sal_Bool SetWriteLock(sal_uInt32 nKey = 0) { return ((read==aLockState) &&
- (aLockState=writeonly, nLockKey=nKey, sal_True)); }
- /* Schreibschutz darf nur geloest werden, wenn
- * der Schreibschutz drin ist, und
- * entweder der LockKey Null ist(Generalschluessel) oder der Key zum LockKey passt
- */
- sal_Bool ReleaseWriteLock(sal_uInt32 nKey = 0) { return ((writeonly==aLockState) &&
- (!nLockKey||nKey==nLockKey) &&
- (aLockState=read, nLockKey=0, sal_True)); } // setzt den zustand auf "read"
- sal_Bool SetReadLock(sal_uInt32 nKey = 0) { return ((read==aLockState) &&
- (aLockState=readonly, nLockKey=nKey, sal_True)); }
- sal_Bool ReleaseReadLock(sal_uInt32 nKey = 0) { return ((readonly==aLockState) &&
- (!nLockKey||nKey==nLockKey) &&
- (aLockState=read, nLockKey=0, sal_True)); } // setzt den zustand auf "read"
-
- LockState GetLockState() const { return aLockState; }
- sal_Bool IsWriteLocked() const { return (writeonly==aLockState); }
- sal_Bool IsReadLocked() const { return (readonly==aLockState); }
- sal_Bool IsNotLocked() const { return (read==aLockState); }
- sal_Bool IsLocker( sal_uInt32 nKey ) { return (nKey==nLockKey || !nLockKey); }
-
- /* wenn der Schreibschutz aktiviert wurde,
- * und bei vorhandenem Schreibschutz die Keys stimmen
- * rufe die Parentmethode auf */
- sal_Bool InsertSubInfo( GenericInformation *pInfo, sal_uInt32 nKey = 0 ) {
- return ((writeonly==aLockState) &&
- (!nLockKey || nKey==nLockKey) &&
- (GenericInformation::InsertSubInfo( pInfo ), sal_True)); }
-
- sal_Bool InsertSubInfo( const ByteString &rPathKey, const ByteString &rValue, sal_uInt32 nKey = 0,
- sal_Bool bSearchByPath = sal_False, sal_Bool bNewPath = sal_False) {
- return ((writeonly==aLockState) &&
- (!nLockKey || nKey==nLockKey) &&
- (GenericInformation::InsertSubInfo( rPathKey, rValue, bSearchByPath, bNewPath ), sal_True)); }
- /* 29.jan.98: erweiterung um lesemoeglichkeit vom Lockclienten */
- GenericInformation *GetSubInfo( ByteString &rKey, sal_Bool bSearchByPath = sal_False,
- sal_Bool bCreatePath = sal_False, sal_uInt32 nKey = 0 ) {
- if (writeonly==aLockState && nLockKey && nKey!=nLockKey )
- return NULL;
- return GenericInformation::GetSubInfo(rKey, bSearchByPath, bCreatePath); }
-
-private:
-
- LockState aLockState;
- sal_uInt32 nLockKey;
-};
-
-//
-// class GenericInformationList
-//
-
-/******************************************************************************
-Purpose: holds set of generic informations in a sorted list
-******************************************************************************/
-
-typedef ::std::vector< GenericInformation* > GenericInformationList_Impl;
-
-class TOOLS_DLLPUBLIC GenericInformationList
-{
-private:
- GenericInformationList_Impl maList;
- GenericInformation *pOwner; // holds parent of this list
-
-protected:
- // methods
- size_t InsertSorted( GenericInformation *pInfo, sal_Bool bOverwrite,
- size_t nStart, size_t nEnd );
- GenericInformation *Search( size_t &rPos, ByteString sKey,
- size_t nStart, size_t nEnd );
-
-public:
- GenericInformationList( GenericInformation *pParent = NULL );
- GenericInformationList(const GenericInformationList& rList, GenericInformation *pParent = NULL);
- ~GenericInformationList();
-
- // this methods used to handle the informations using binary search
- GenericInformation *GetInfo( ByteString &rKey, sal_Bool bSearchByPath = sal_False,
- sal_Bool bCreatePath = sal_False );
- /* path can be something like this: src370/drives/o:
- * bCreatePath will create the neccecary paths to the GI */
-
- sal_Bool InsertInfo( GenericInformation *pInfo, sal_Bool bOverwrite = sal_True );
- /* legt eine GenericInformation im Baum an mit Key-Value
- * wenn bNewPath gesetzt, wird der nichtexistente Teil des Pfades neu kreiert
- * wenn bNewPath nicht gesetzt ist und ein Teil des Pfades nicht vorhanden ist,
- * gibt die Methode sal_False zurueck.*/
- sal_Bool InsertInfo( const ByteString &rPathKey, const ByteString &rValue,
- sal_Bool bSearchByPath = sal_False, sal_Bool bNewPath = sal_False);
- void RemoveInfo( GenericInformation *pInfo, sal_Bool bDelete = sal_False );
-
- GenericInformation* SetOwner( GenericInformation *pNewOwner );
-
- size_t size() const;
- GenericInformation* operator[]( size_t i ) const;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/communi/geninfo.cxx b/tools/source/communi/geninfo.cxx
deleted file mode 100644
index 9155b7b..0000000
--- a/tools/source/communi/geninfo.cxx
+++ /dev/null
@@ -1,417 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_tools.hxx"
-#include "tools/geninfo.hxx"
-#include <stdio.h>
-
-//
-// class GenericInformation
-//
-
-/*****************************************************************************/
-GenericInformation::GenericInformation( const ByteString &rKey,
- const ByteString &rValue,
- GenericInformationList *pParentList,
- GenericInformationList *pSubInfos )
-/*****************************************************************************/
- : ByteString( rKey ),
- sValue( rValue ),
- pInfoList( pSubInfos ),
- pParent( pParentList )
-{
- // if a ParentList exists, insert this object into it
- if ( pParent )
- pParent->InsertInfo( this );
- // make myself owner of pInfoList
- if ( pInfoList )
- pInfoList->SetOwner( this );
-}
-
-/*****************************************************************************/
-GenericInformation::GenericInformation( const GenericInformation& rInf,
- sal_Bool bCopySubs)
-/*****************************************************************************/
- : ByteString( rInf ),
- sValue( rInf.sValue ),
- pInfoList( 0L ),
- pParent(NULL)
-{
- if(bCopySubs && rInf.pInfoList)
- pInfoList = new GenericInformationList(*rInf.pInfoList, this);
-}
-
-/*****************************************************************************/
-GenericInformation::~GenericInformation()
-/*****************************************************************************/
-{
- // remove pInfoList and all childs out of memory
- delete pInfoList;
- pInfoList = 0;
-
- // remove this Info out of ParentList
- if ( pParent )
- pParent->RemoveInfo( this );
-}
-
-/*****************************************************************************/
-sal_Bool GenericInformation::InsertSubInfo( GenericInformation *pInfo )
-/*****************************************************************************/
-{
- return ( pInfoList && pInfoList->InsertInfo( pInfo ));
-}
-
-/*****************************************************************************/
-sal_Bool GenericInformation::InsertSubInfo( const ByteString &rPathKey, const ByteString &rValue,
- sal_Bool bSearchByPath, sal_Bool bNewPath )
-/*****************************************************************************/
-{
- return (pInfoList && pInfoList->InsertInfo( rPathKey, rValue, bSearchByPath, bNewPath ));
-}
-
-/*****************************************************************************/
-void GenericInformation::RemoveSubInfo( GenericInformation *pInfo,
- sal_Bool bDelete )
-/*****************************************************************************/
-{
- pInfoList->RemoveInfo( pInfo, bDelete );
-}
-
-/*****************************************************************************/
-GenericInformation *GenericInformation::GetSubInfo( ByteString &rKey,
- sal_Bool bSearchByPath,
- sal_Bool bCreatePath )
-/*****************************************************************************/
-{
- if ( !pInfoList && bCreatePath )
- pInfoList = new GenericInformationList( this );
- if ( pInfoList )
- return pInfoList->GetInfo( rKey, bSearchByPath, bCreatePath );
- return NULL;
-}
-
-
-//
-// class GenericInformationList
-//
-
-/*****************************************************************************/
-GenericInformationList::GenericInformationList( GenericInformation *pParent )
-/*****************************************************************************/
- : pOwner( pParent )
-{
-}
-
-/*****************************************************************************/
-GenericInformationList::GenericInformationList(
- const GenericInformationList& rList,
- GenericInformation *pParent
-)
-/*****************************************************************************/
-{
- GenericInformation* pTemp,*pWork;
-
- pOwner = pParent;
-
- for( size_t i = 0; i < rList.size(); i++ )
- {
- pTemp = rList[ i ];
- pWork = new GenericInformation(*pTemp,sal_True);
-
- maList.push_back( pWork );
- }
-}
-
-/*****************************************************************************/
-GenericInformationList::~GenericInformationList()
-/*****************************************************************************/
-{
- // delete all Informations stored in this List
- for ( size_t i = 0, n = maList.size(); i < n; ++i ) {
- maList[ i ]->ListDeleted();
- delete maList[ i ];
- }
- maList.clear();
-}
-
-/*****************************************************************************/
-GenericInformation *GenericInformationList::Search(
- size_t &rPos,
- ByteString sKey,
- size_t nStart,
- size_t nEnd
-)
-/*****************************************************************************/
-{
- if ( maList.empty() ) {
- rPos = 0;
- return NULL;
- }
-
- if ( nStart == nEnd ) {
- rPos = nStart;
- ByteString sCandidate = ByteString( *maList[ nStart ] );
- if ( sCandidate.ToUpperAscii() == sKey.ToUpperAscii()) {
- return maList[ nStart ]; // found !!!
- }
- else {
- // requested key not found
- return NULL;
- }
- }
-
- // search binary in existing list
- size_t nActPos = nStart + (( nEnd - nStart ) / 2 );
- rPos = nActPos;
- ByteString sCandidate = ByteString( *maList[ nActPos ] );
-
- if ( sCandidate.ToUpperAscii() == sKey.ToUpperAscii() )
- return maList[ nActPos ]; // found !!!
-
- // split the list at ActPos
- if ( sCandidate < sKey )
- return Search( rPos, sKey, nActPos + 1, nEnd );
- else
- return Search( rPos, sKey, nStart, nActPos );
-}
-
-/*****************************************************************************/
-GenericInformation *GenericInformationList::GetInfo( ByteString &rKey,
- sal_Bool bSearchByPath,
- sal_Bool bCreatePath )
-/*****************************************************************************/
-{
-
- rKey.EraseLeadingChars( '/' );
- rKey.EraseTrailingChars( '/' );
-
- ByteString sKey;
- if ( bSearchByPath )
- sKey = rKey.GetToken( 0, '/' );
- else
- sKey = rKey;
-
- size_t nPos = 0;
- GenericInformation *pReturnInfo = Search( nPos, sKey, 0, maList.size() - 1 );
- /* wenn kein Searchpath gesetzt und kein Returninfo vorhanden,
- * gib NULL zurueck
- * wenn Searchpath gesetzt und returninfo vorhanden,
- * suche weiter nach unten
- * wenn searchpath gesetzt kein returninfo vorhanden und newpath gesetzt,
- * mache neues Verzeichniss
- */
- sal_uInt16 nTokenCount = rKey.GetTokenCount('/');
- // search for next key of path in next level of tree
- if ( bSearchByPath && (nTokenCount > 1)) {
- ByteString sPath = ByteString(rKey.Copy( sKey.Len() + 1 ));
- if ( !pReturnInfo ) { // wenn kein Return, dann muss man es anlegen
- if ( !bCreatePath ) // wenn aber kein Create, dann nicht anlegen
- return NULL;
- pReturnInfo = new GenericInformation( sKey, "", this, NULL);
- pReturnInfo->SetSubList( new GenericInformationList( pReturnInfo ));
- }
- return pReturnInfo->GetSubInfo( sPath, sal_True, bCreatePath );
- }
- if ( !pReturnInfo && bCreatePath ) {
- pReturnInfo = new GenericInformation ( sKey, "", this, NULL);
- }
-
- return pReturnInfo; // kann durchaus NULL sein.
-}
-
-/*****************************************************************************/
-size_t GenericInformationList::InsertSorted(
- GenericInformation *pInfo,
- sal_Bool bOverwrite,
- size_t nStart,
- size_t nEnd
-)
-/*****************************************************************************/
-{
- if ( maList.empty() ) {
- // empty list, so insert at first pos
- maList.push_back( pInfo );
- return 0;
- }
-
- ByteString sKey( pInfo->GetBuffer());
- sKey.ToUpperAscii();
-
- // Check to speed up reading a (partially) sorted list
- if ( nStart == 0 && maList.size()-1 == nEnd )
- {
- ByteString sCandidate( *maList[ nEnd ] );
- if ( sCandidate.ToUpperAscii() < sKey )
- {
- maList.push_back( pInfo );
- return nEnd+1;
- }
- }
-
- // Only one element, so insert before or after
- if ( maList.size() == 1 ) {
- ByteString sCandidate( *maList[ 0 ] );
- if ( sCandidate.ToUpperAscii() == sKey ) {
- // key allready exists in list
- if ( bOverwrite ) {
- if ( pInfo != maList[ 0 ] )
- delete maList[ 0 ];
- maList[ 0 ] = pInfo;
- }
- return 0;
- }
- else if ( sCandidate > sKey ) {
- maList.insert( maList.begin(), pInfo );
- return 0;
- }
- else {
- maList.push_back( pInfo );
- return 1;
- }
- }
-
- size_t nActPos = nStart + (( nEnd - nStart ) / 2 );
- ByteString sCandidate = ByteString( *maList[ nActPos ] );
-
- if ( sCandidate.ToUpperAscii() == sKey ) {
- // key allready exists in list
- if ( bOverwrite ) {
- if ( pInfo != maList[ nActPos ] )
- delete maList[ nActPos ];
- maList[ nActPos ] = pInfo;
- }
- return nActPos;
- }
-
- if ( nStart == nEnd ) {
- // now more ways to search for key -> insert here
- GenericInformationList_Impl::iterator it = maList.begin();
- ::std::advance( it, nStart );
- if ( sCandidate > sKey ) {
- maList.insert( it, pInfo );
- return nStart;
- }
- else {
- ++it;
- maList.insert( it, pInfo );
- return ( nStart + 1 );
- }
- }
-
- if ( nActPos == maList.size() - 1 ) {
- // reached end of list -> insert here
- maList.push_back( pInfo );
- return ( nActPos + 1 );
- }
-
- ByteString sSecondCand = ByteString( *maList[ nActPos + 1 ] );
- if (( sCandidate < sKey ) && ( sSecondCand.ToUpperAscii() > sKey )) {
- // optimal position to insert object
- GenericInformationList_Impl::iterator it = maList.begin();
- ::std::advance( it, nActPos + 1 );
- maList.insert( it, pInfo );
- return ( nActPos + 1 );
- }
-
- if ( sCandidate < sKey )
- return InsertSorted( pInfo, bOverwrite, nActPos + 1, nEnd );
- else
- return InsertSorted( pInfo, bOverwrite, nStart, nActPos );
-}
-
-/*****************************************************************************/
-sal_Bool GenericInformationList::InsertInfo( GenericInformation *pInfo,
- sal_Bool bOverwrite )
-/*****************************************************************************/
-{
- if ( !pInfo->Len())
- return sal_False;
-
- InsertSorted( pInfo, bOverwrite, 0, maList.size() - 1 );
- return sal_True;
-}
-
-
-/*****************************************************************************/
-sal_Bool GenericInformationList::InsertInfo( const ByteString &rPathKey, const ByteString &rValue,
- sal_Bool bSearchByPath, sal_Bool bNewPath )
-/*****************************************************************************/
-{
- GenericInformation *pInfo;
- ByteString sPathKey ( rPathKey );
- sPathKey.EraseLeadingChars( '/' );
- sPathKey.EraseTrailingChars( '/' );
-
- pInfo = GetInfo( sPathKey, bSearchByPath, bNewPath );
-
- if ( pInfo ) {
- pInfo->SetValue( rValue );
- return sal_True;
- }
- return sal_False;
-}
-
-/*****************************************************************************/
-void GenericInformationList::RemoveInfo( GenericInformation *pInfo,
- sal_Bool bDelete )
-/*****************************************************************************/
-{
- for (
- GenericInformationList_Impl::iterator it = maList.begin();
- it < maList.end();
- ++it
- ) {
- if ( *it == pInfo ) {
- maList.erase( it );
- }
- }
- if ( bDelete )
- delete pInfo;
-}
-
-GenericInformation* GenericInformationList::SetOwner( GenericInformation *pNewOwner )
-{
- GenericInformation *pOldOwner = pOwner;
- if ( pOwner ) // bei parent austragen;
- pOwner->SetSubList( NULL );
- if ( pNewOwner )
- pNewOwner->SetSubList( this );
- pOwner = pNewOwner;
- return pOldOwner;
-}
-
-size_t GenericInformationList::size() const {
- return maList.size();
-}
-
-GenericInformation* GenericInformationList::operator[]( size_t i ) const {
- return ( i < maList.size() ) ? maList[ i ] : NULL;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0f62669141382e8a0dba7b4d901911b3e056c94e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 12 23:56:25 2011 +0100
Remove dodgy and unused ReadNumber
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 216ab57..9d77f9e 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -411,14 +411,6 @@ public:
{ nJustification = nJus; CreateFormatString(); }
sal_uInt8 GetJustification() const { return nJustification; }
- SvStream& ReadNumber( short& rShort );
- SvStream& ReadNumber( sal_uInt16& rUInt16 );
- SvStream& ReadNumber( long& rLong );
- SvStream& ReadNumber( sal_uInt32& rUInt32 );
- SvStream& ReadNumber( int& rInt );
- SvStream& ReadNumber( float& rFloat );
- SvStream& ReadNumber( double& rDouble );
-
SvStream& WriteNumber( short nShort );
SvStream& WriteNumber( sal_uInt16 nUInt16 );
SvStream& WriteNumber( long nLong );
@@ -575,38 +567,6 @@ inline SvStream& operator<<( SvStream& rStr, SvStrPtr f )
return rStr;
}
-inline SvStream& SvStream::ReadNumber( short& rShort )
-{
- long nTmp;
- ReadNumber( nTmp );
- rShort = (short)nTmp;
- return *this;
-}
-
-inline SvStream& SvStream::ReadNumber( sal_uInt16& rUShort )
-{
- sal_uInt32 nTmp;
- ReadNumber( nTmp );
- rUShort = (sal_uInt16)nTmp;
- return *this;
-}
-
-inline SvStream& SvStream::ReadNumber( int& rInt )
-{
- long nTmp;
- ReadNumber( nTmp );
- rInt = (int)nTmp;
- return *this;
-}
-
-inline SvStream& SvStream::ReadNumber( float& rFloat )
-{
- double nTmp;
- ReadNumber( nTmp );
- rFloat = (float)nTmp;
- return *this;
-}
-
inline SvStream& SvStream::WriteNumber( short nShort )
{
WriteNumber( (long)nShort );
@@ -625,14 +585,6 @@ inline SvStream& SvStream::WriteNumber( int nInt )
return *this;
}
-/*
-inline SvStream& SvStream::WriteNumber( unsigned int nUInt )
-{
- WriteNumber( (sal_uIntPtr)nUInt );
- return *this;
-}
-*/
-
inline SvStream& SvStream::WriteNumber( float nFloat )
{
double nTemp = nFloat;
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index bf9bfad..908b67e 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1989,90 +1989,6 @@ void SvStream::CreateFormatString()
/*************************************************************************
|*
-|* Stream::ReadNumber()
-|*
-*************************************************************************/
-
-#define BUFSIZE_LONG 21 // log( 2 hoch 64 ) + 1
-
-SvStream& SvStream::ReadNumber( long& rLong )
-{
- EatWhite();
- if( bIsEof || nError )
- {
- SetError( SVSTREAM_GENERALERROR );
- return *this;
- }
- sal_Size nFPtr = Tell();
- char buf[ BUFSIZE_LONG ];
- memset( buf, 0, BUFSIZE_LONG );
- sal_Size nTemp = Read( buf, BUFSIZE_LONG-1 );
- if( !nTemp || nError )
- {
- SetError( SVSTREAM_GENERALERROR );
- return *this;
- }
- char *pEndPtr;
- rLong = strtol( buf, &pEndPtr, (int)nRadix );
- nFPtr += ( (sal_Size)pEndPtr - (sal_Size)(&(buf[0])) );
- Seek( nFPtr );
- bIsEof = sal_False;
- return *this;
-}
-
-SvStream& SvStream::ReadNumber( sal_uInt32& rUInt32 )
-{
- EatWhite();
- if( bIsEof || nError )
- {
- SetError( SVSTREAM_GENERALERROR );
- return *this;
- }
- sal_Size nFPtr = Tell();
- char buf[ BUFSIZE_LONG ];
- memset( buf, 0, BUFSIZE_LONG );
- sal_Size nTemp = Read( buf, BUFSIZE_LONG-1 );
- if( !nTemp || nError )
- {
- SetError( SVSTREAM_GENERALERROR );
- return *this;
- }
- char *pEndPtr;
- rUInt32 = strtoul( buf, &pEndPtr, (int)nRadix );
- nFPtr += ( (sal_uIntPtr)pEndPtr - (sal_uIntPtr)buf );
- Seek( nFPtr );
- bIsEof = sal_False;
- return *this;
-}
-
-SvStream& SvStream::ReadNumber( double& rDouble )
-{
- EatWhite();
- if( bIsEof || nError )
- {
- SetError( SVSTREAM_GENERALERROR );
- return *this;
- }
- sal_Size nFPtr = Tell();
- char buf[ BUFSIZE_LONG ];
- memset( buf, 0, BUFSIZE_LONG );
- sal_Size nTemp = Read( buf, BUFSIZE_LONG-1 );
- if( !nTemp || nError )
- {
- SetError( SVSTREAM_GENERALERROR );
- return *this;
- }
- char *pEndPtr;
- rDouble = strtod( buf, &pEndPtr );
- nFPtr += ( (sal_Size)pEndPtr - (sal_Size)buf );
- Seek( nFPtr );
- bIsEof = sal_False;
- return *this;
-}
-
-
-/*************************************************************************
-|*
|* Stream::WriteNumber()
|*
*************************************************************************/
commit c2bf574cb3bd5e4b4b4b9e916fd91c33cfcf5486
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 12 22:37:26 2011 +0100
WriteByteStringLines unused
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index f28a4ee..216ab57 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -452,8 +452,6 @@ public:
sal_Bool ReadByteStringLine( String& rStr ) { return ReadByteStringLine( rStr, GetStreamCharSet()); }
sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
sal_Bool WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
- sal_Bool WriteByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet );
- sal_Bool WriteByteStringLines( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
/// Switch to no endian swapping and write 0xfeff
sal_Bool StartWritingUnicodeText();
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 0d9c603..bf9bfad 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -944,11 +944,6 @@ sal_Bool SvStream::WriteUniStringLine( const String& rStr )
|*
*************************************************************************/
-sal_Bool SvStream::WriteByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet )
-{
- return WriteLines( ByteString( rStr, eDestCharSet ) );
-}
-
sal_Bool SvStream::WriteLines( const ByteString& rStr )
{
ByteString aStr( rStr );
commit 58c143784bbd390c4c1ffd80f8495c3ab2a8eada
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 12 22:36:01 2011 +0100
InformationParser unused
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index bd9cf81..30df5f3 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
$(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/communi/geninfo \
- tools/source/communi/parser \
tools/source/datetime/datetime \
tools/source/datetime/tdate \
tools/source/datetime/ttime \
@@ -164,5 +163,5 @@ endif
# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g
# -DOPTIMIZE
# no -DTOOLS_DLLIMPLEMENTATION on toolsdll
-# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
+# -DEXCEPTIONS_OFF -fno-exceptions on geninfo datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader
# vim: set noet sw=4 ts=4:
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 9dd746d..81c00da 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx))
diff --git a/tools/inc/tools/iparser.hxx b/tools/inc/tools/iparser.hxx
deleted file mode 100644
index 4ff0790..0000000
--- a/tools/inc/tools/iparser.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef IPARSER_HXX
-#define IPARSER_HXX
-
-#include <tools/string.hxx>
-#include <tools/link.hxx>
-#include <tools/stream.hxx>
-#include "tools/toolsdllapi.h"
-
-// forwards
-class Dir;
-class GenericInformation;
-class GenericInformationList;
-
-//
-// class InformationParser
-//
-
-/******************************************************************************
-Purpose: reads generic information files into a simple structure in memory
-******************************************************************************/
-
-// information files used by this parser have following format:
-
-/*
-
-key [value]
-{
- key [value]
- key [value]
- {
- key [value]
- ...
- ...
- }
-}
-key [value]
-...
-...
-
-*/
-
-// error codes:
-
-#define IP_NO_ERROR 0x0000
-#define IP_UNEXPECTED_EOF 0x0001
-
-#define REPLACE_VARIABLES sal_True
-
-class TOOLS_DLLPUBLIC InformationParser
-{
-private:
- sal_Bool bRecover;
- ByteString sOldLine;
-
- ByteString sCurrentComment;
-
- sal_Bool bReplaceVariables; // meaning %UPD and %VERSION
- sal_uInt16 nLevel;
- ByteString sUPD;
- ByteString sVersion;
-
- Link aStatusLink;
- SvStream *pActStream;
- UniString sStreamName;
-
- sal_uInt16 nErrorCode;
- sal_uIntPtr nErrorLine;
- ByteString sErrorText;
- sal_uIntPtr nActLine;
-
- // methods
- TOOLS_DLLPRIVATE ByteString &ReadLine();
- TOOLS_DLLPRIVATE GenericInformation *ReadKey( GenericInformationList *pExistingList );
- inline void Recover();
-
-protected:
- sal_Bool Save( SvStream &rOutStream,
- const GenericInformationList *pSaveList, sal_uInt16 nLevel, sal_Bool bStripped );
- GenericInformationList *Execute( SvStream &rSourceStream,
- GenericInformationList *pExistingList );
- virtual void PrintStatus( ByteString &rStatus )
- { if ( aStatusLink.IsSet()) aStatusLink.Call( &rStatus ); }
-
-public:
- InformationParser( sal_Bool bReplace = sal_False );
- virtual ~InformationParser();
-
- // the following methods return NULL if any errors are detected
-
- // reads a information file and stores the data in a
- // GenericInformationList
- GenericInformationList *Execute( SvMemoryStream &rSourceStream,
- GenericInformationList *pExistingList = NULL );
- GenericInformationList *Execute( SvFileStream &rSourceStream,
- GenericInformationList *pExistingList = NULL );
- GenericInformationList *Execute( UniString &rSourceFile,
- GenericInformationList *pExistingList = NULL );
- // reads all information files in the dir and stores the data in a
- // GenericInformationList => first key is the filename
- GenericInformationList *Execute( Dir &rDir,
- GenericInformationList *pExistingList = NULL );
-
- // save the InfrormationList to rSourceFile
- // returns sal_False on error
- sal_Bool Save( SvFileStream &rSourceStream,
- const GenericInformationList *pSaveList );
- sal_Bool Save( SvMemoryStream &rSourceStream,
- const GenericInformationList *pSaveList );
- sal_Bool Save( const UniString &rSourceFile,
- const GenericInformationList *pSaveList );
-
- sal_uInt16 GetErrorCode();
- ByteString &GetErrorText();
-
- void SetStatusHdl( const Link &rHdl ) { aStatusLink = rHdl; }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/communi/parser.cxx b/tools/source/communi/parser.cxx
deleted file mode 100644
index 037878f..0000000
--- a/tools/source/communi/parser.cxx
+++ /dev/null
@@ -1,469 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_tools.hxx"
-
-#include <stdio.h>
-#include <tools/stream.hxx>
-#include <tools/fsys.hxx>
-
-#include "tools/iparser.hxx"
-#include "tools/geninfo.hxx"
-
-//
-// class InformationParser
-//
-
-#define cKeyLevelChar '\t'
-
-/*****************************************************************************/
-InformationParser::InformationParser( sal_Bool bReplace )
-/*****************************************************************************/
- : bRecover( sal_False ),
- sOldLine( "" ),
- bReplaceVariables( bReplace ),
- nLevel( 0 ),
- sUPD( "" ),
- sVersion( "" ),
- pActStream( NULL ),
- nErrorCode( 0 ),
- nErrorLine( 0 ),
- sErrorText( "" ),
- nActLine( 0 )
-{
-}
-
-/*****************************************************************************/
-InformationParser::~InformationParser()
-/*****************************************************************************/
-{
-}
-
-/*****************************************************************************/
-ByteString &InformationParser::ReadLine()
-/*****************************************************************************/
-{
- ByteString sLine;
-
- if ( bRecover ) {
- bRecover = sal_False;
- }
- else {
- if ( !pActStream->IsEof()) {
- pActStream->ReadLine( sLine );
- xub_StrLen nStart = 0;
- xub_StrLen nEnd = sLine.Len();
- sal_Bool bCopy = sal_False;
- while ( nStart < nEnd && ( sLine.GetChar( nStart ) == ' ' || sLine.GetChar( nStart ) == 0x09 ) )
- {
- nStart++;
- bCopy = sal_True;
- }
-
- while ( nStart < nEnd && ( sLine.GetChar( nEnd-1 ) == ' ' || sLine.GetChar( nEnd-1 ) == 0x09 ) )
- {
- nEnd--;
- bCopy = sal_True;
- }
-
- if ( bCopy )
- sLine = sLine.Copy( nStart, nEnd - nStart );
-
- if (( sLine.GetChar( 0 ) == '#' ) || ( !sLine.Len())) {
- if ( sCurrentComment.Len())
- sCurrentComment += "\n";
- sCurrentComment += sLine;
- return ReadLine();
- }
- else {
- if ( bReplaceVariables ) {
- sLine.SearchAndReplaceAll( "%UPD", sUPD );
- sLine.SearchAndReplaceAll( "%VERSION", sVersion );
- }
- }
- }
- else {
- if ( nLevel ) {
- sLine = "}";
- fprintf( stdout, "Reached EOF parsing %s. Suplying extra '}'\n",ByteString( sStreamName, gsl_getSystemTextEncoding()).GetBuffer() );
- // nErrorCode = IP_UNEXPECTED_EOF;
- // nErrorLine = nActLine;
- }
- else
- sLine = "";
- }
-
- sOldLine = sLine;
- nActLine++;
- }
-
- return sOldLine;
-}
-
-/*****************************************************************************/
-GenericInformation *InformationParser::ReadKey(
- GenericInformationList *pExistingList )
-/*****************************************************************************/
-{
- // this method has no error handling yet, but it works very fast.
- // it is used to create whole informations and sub informations in
- // a simple data format in memory, readed in a configuration file with
- // following format:
-
- /*
-
- key [value]
- {
- key [value]
- key [value]
- {
- key [value]
- ...
- ...
- }
- }
- key [value]
- ...
- ...
-
- */
-
- GenericInformation *pInfo = NULL;
-
- ByteString sLine( ReadLine());
- ByteString sKey;
- ByteString sValue;
- ByteString sComment( sCurrentComment );
- sCurrentComment = "";
-
- // key separated from value by tab?
- sal_uInt16 nWSPos = sLine.Search( ' ' );
- if ( sLine.Search( '\t' ) < nWSPos ) {
- nWSPos = sLine.Search( '\t' );
- sLine.SearchAndReplace( "\t", " " );
- }
-
- if ( sLine.GetTokenCount( ' ' ) > 1 ) {
- sKey = sLine.GetToken( 0, ' ' );
- sValue = sLine.Copy( sKey.Len() + 1 );
- while (( sValue.Search( ' ' ) == 0 ) || ( sValue.Search( '\t' ) == 0 )) {
- sValue.Erase( 0, 1 );
- }
- }
- else
- sKey=sLine;
-
- if ( bReplaceVariables && !nLevel ) {
- sUPD = sKey.Copy( sKey.Len() - 3 );
- sVersion = sKey;
- }
-
- if ( ReadLine() == "{" ) {
- nLevel++;
- GenericInformationList *pSubList = new GenericInformationList();
- while ( ReadLine() != "}" ) {
- Recover();
- ReadKey( pSubList );
- }
- nLevel--;
- pInfo = new GenericInformation( sKey, sValue,
- pExistingList, pSubList );
- pInfo->SetComment( sComment );
- }
- else {
- Recover();
- if ( !sKey.Equals( "}" ) && !sKey.Equals( "{" ) )
- {
- pInfo = new GenericInformation( sKey, sValue, pExistingList );
- pInfo->SetComment( sComment );
- }
- }
-
- return pInfo;
-}
-
-/*****************************************************************************/
-void InformationParser::Recover()
-/*****************************************************************************/
-{
- bRecover = sal_True;
-}
-
-/*****************************************************************************/
-sal_Bool InformationParser::Save( SvStream &rOutStream,
- const GenericInformationList *pSaveList,
- sal_uInt16 level, sal_Bool bStripped )
-/*****************************************************************************/
-{
- sal_uInt16 i;
- sal_uIntPtr nInfoListCount;
- ByteString sTmpStr;
- GenericInformation *pGenericInfo;
- GenericInformationList *pGenericInfoList;
-
- static ByteString aKeyLevel;
- aKeyLevel.Expand( level, cKeyLevelChar );
-
- for ( nInfoListCount = 0; nInfoListCount < pSaveList->size(); nInfoListCount++) {
- // Key-Value Paare schreiben
- pGenericInfo = (*pSaveList)[ nInfoListCount ];
- sTmpStr = "";
- if ( !bStripped && level )
- sTmpStr.Append( aKeyLevel.GetBuffer(), level );
-
- if ( !bStripped )
- for ( i = 0; i < pGenericInfo->GetComment().GetTokenCount( '\n' ); i++ ) {
- sTmpStr += pGenericInfo->GetComment().GetToken( i, '\n' );
- sTmpStr += "\n";
- if ( level )
- sTmpStr.Append( aKeyLevel.GetBuffer(), level );
- }
-
- sTmpStr += pGenericInfo->GetBuffer();
- sTmpStr += ' ';
- sTmpStr += pGenericInfo->GetValue();
- if ( !rOutStream.WriteLine( sTmpStr ) )
- return sal_False;
-
- // wenn vorhanden, bearbeite recursive die Sublisten
- if (( pGenericInfoList = pGenericInfo->GetSubList() ) != NULL ) {
- // oeffnende Klammer
- sTmpStr = "";
- if ( !bStripped && level )
- sTmpStr.Append( aKeyLevel.GetBuffer(), level );
- sTmpStr += '{';
- if ( !rOutStream.WriteLine( sTmpStr ) )
- return sal_False;
- // recursiv die sublist abarbeiten
- if ( !Save( rOutStream, pGenericInfoList, level+1, bStripped ) )
- return sal_False;
- // schliessende Klammer
- sTmpStr = "";
- if ( !bStripped && level )
- sTmpStr.Append( aKeyLevel.GetBuffer(), level );
- sTmpStr += '}';
- if ( !rOutStream.WriteLine( sTmpStr ) )
- return sal_False;
- }
- }
- return sal_True;
-}
-
-/*****************************************************************************/
-GenericInformationList *InformationParser::Execute(
- SvStream &rSourceStream,
- GenericInformationList *pExistingList )
-/*****************************************************************************/
-{
- GenericInformationList *pList;
- if ( pExistingList )
- pList = pExistingList;
- else
- pList = new GenericInformationList();
-
- pActStream = &rSourceStream;
-
- // read all infos out of current file
- while( !rSourceStream.IsEof()) {
- nLevel = 0;
- ReadKey( pList );
- }
-
- return pList;
-}
-
-/*****************************************************************************/
-GenericInformationList *InformationParser::Execute( SvMemoryStream &rSourceStream,
- GenericInformationList *pExistingList )
-/*****************************************************************************/
-{
- sStreamName = UniString( "Memory", gsl_getSystemTextEncoding());
- return Execute( (SvStream &)rSourceStream, pExistingList );
-}
-
-/*****************************************************************************/
-GenericInformationList *InformationParser::Execute(
- SvFileStream &rSourceStream,
- GenericInformationList *pExistingList )
-/*****************************************************************************/
-{
- if ( !rSourceStream.IsOpen())
- return NULL;
- sStreamName = rSourceStream.GetFileName();
- return Execute( (SvStream &)rSourceStream, pExistingList );
-}
-
-/*****************************************************************************/
-GenericInformationList *InformationParser::Execute( UniString &rSourceFile,
- GenericInformationList *pExistingList )
-/*****************************************************************************/
-{
- DirEntry aDirEntry( rSourceFile );
- if ( !aDirEntry.Exists())
- return NULL;
-
- GenericInformationList *pList;
- if ( pExistingList )
- pList = pExistingList;
- else
- pList = new GenericInformationList();
-
- // reset status
- nErrorCode = 0;
- nErrorLine = 0;
- nActLine = 0;
-
- SvFileStream aActStream;
- aActStream.Open( rSourceFile, STREAM_READ );
- if( aActStream.GetError())
- return NULL;
-
- pActStream = &aActStream;
- if ( !Execute( aActStream, pList )) {
- delete pList;
- pList = NULL;
- }
-
- // close the stream
- aActStream.Close();
- pActStream = NULL;
-
- if ( !nErrorCode )
- return pList;
-
- return NULL;
-}
-
-/*****************************************************************************/
-GenericInformationList *InformationParser::Execute( Dir &rDir,
- GenericInformationList *pExistingList )
-/*****************************************************************************/
-{
- GenericInformationList *pList;
-
- if ( pExistingList )
- pList = pExistingList;
- else
- pList = new GenericInformationList();
-
- for ( sal_uInt16 i = 0; i < rDir.Count(); i++ ) {
-
- // execute this dir
- UniString sNextFile( rDir[i].GetFull());
- GenericInformationList *pSubList = Execute( sNextFile );
-
- if ( !pSubList ) {
- // any errors ?
- delete pList;
- return NULL;
- }
-
- // create new info and insert it into list
- ByteString sFileKey( rDir[i].GetName(), RTL_TEXTENCODING_UTF8 );
- new GenericInformation(
- sFileKey,
- ByteString( "" ),
- pList, pSubList );
- }
-
- return pList;
-}
-
-/*****************************************************************************/
-sal_Bool InformationParser::Save( SvFileStream &rSourceStream,
- const GenericInformationList *pSaveList )
-/*****************************************************************************/
-{
- if ( !rSourceStream.IsOpen() || !Save( (SvStream &)rSourceStream, pSaveList, 0, sal_False ))
- {
- printf( "ERROR saving file \"%s\"\n",ByteString( rSourceStream.GetFileName(), gsl_getSystemTextEncoding()).GetBuffer() );
- return sal_False;
- }
-
- return sal_True;
-}
-
-/*****************************************************************************/
-sal_Bool InformationParser::Save( SvMemoryStream &rSourceStream,
- const GenericInformationList *pSaveList )
-/*****************************************************************************/
-{
- Time a;
- sal_Bool bRet = Save( (SvStream &)rSourceStream, pSaveList, 0, sal_True );
- Time b;
- b = b - a;
- return bRet;
-}
-
-/*****************************************************************************/
-sal_Bool InformationParser::Save( const UniString &rSourceFile,
- const GenericInformationList *pSaveList )
-/*****************************************************************************/
-{
- SvFileStream *pOutFile = new SvFileStream( rSourceFile, STREAM_STD_WRITE | STREAM_TRUNC );
-
- if ( !Save( *pOutFile, pSaveList )) {
- delete pOutFile;
- return sal_False;
- }
- delete pOutFile;
- return sal_True;
-}
-
-/*****************************************************************************/
-sal_uInt16 InformationParser::GetErrorCode()
-/*****************************************************************************/
-{
- return nErrorCode;
-}
-
-/*****************************************************************************/
-ByteString &InformationParser::GetErrorText()
-/*****************************************************************************/
-{
- // sErrorText = pActStream->GetFileName();
- sErrorText = ByteString( sStreamName, gsl_getSystemTextEncoding());
- sErrorText += ByteString( " (" );
- sErrorText += ByteString::CreateFromInt64(nErrorLine);
- sErrorText += ByteString( "): " );
-
- switch ( nErrorCode ) {
- case IP_NO_ERROR:
- sErrorText += ByteString( "Keine Fehler aufgetereten" );
- break;
- case IP_UNEXPECTED_EOF:
- sErrorText += ByteString( "Ungültiges Dateiende!" );
- break;
- }
-
- return sErrorText;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 08eef4779f5319c282ab621a05a5b343a1010181
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 12 22:32:13 2011 +0100
ultra-documented AddMark/RemoveMark unimplemented and unused
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 184e119..f28a4ee 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -568,48 +568,6 @@ public:
long GetVersion() { return nVersion; }
void SetVersion( long n ) { nVersion = n; }
- /** Add a mark to indicate to which position in the stream you want to be
- able to seek back.
-
- @descr If you set a mark at nPos, you indicate to the stream that you
- won't issue seek operations to any position 'before' nPos. This can
- be exploited by 'transient streams' that do not permanently store
- their data; they can discard any buffered data up to nPos.
-
- @descr However, if the stream is already positioned past nPos, this
- method is not guaranteed to have the desired effect. A 'transient
- stream' may have already discarded the buffered data at nPos, so that
- a seek operation to nPos will fail nonetheless.
-
- @descr There can be more than one mark for a stream, indicating that
- you want to be able to seek back in the stream as far as the 'lowest'
- off all the marks. There can even be multiple marks at the same
- position (and they must all be individually removed with
- RemoveMark()).
-
- @param nPos The position in the stream at which to add a mark.
- */
- virtual void AddMark(sal_Size nPos);
-
- /** Remove a mark introduced with AddMark().
-
- @descr If you no longer need to seek back to some position for which
- you added a mark, you should remove that mark. (And a 'transient
- stream' that does not permanently store its data can then potentially
- discard some of its buffered data.)
-
- @descr Removing one mark does not have any effects on any other
- marks. Especially, if you have multiple marks at the same position,
- you must call this method multiple times to effectively 'unmark' that
- position.
-
- @descr If you specify a position for which there is no mark, this
- method simply has no effect.
-
- @param nPos The position in the stream at which to remove the mark.
- */
- virtual void RemoveMark(sal_Size nPos);
-
friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // fuer Manips
};
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 5c784ea..0d9c603 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -2319,18 +2319,6 @@ sal_Bool SvStream::SetStreamSize( sal_Size nSize )
return (sal_Bool)(nError == 0);
}
-//============================================================================
-
-void SvStream::AddMark( sal_Size )
-{
-}
-
-//============================================================================
-
-void SvStream::RemoveMark( sal_Size )
-{
-}
-
/*************************************************************************
|*
|* endl()
commit 968eccf29bc6ebc6f3209d412954d3f3b25d2001
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 11 00:31:03 2011 +0100
remove ugly and unused WriteUniOrByteStringLine
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 1e7b0b5..184e119 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -490,11 +490,6 @@ public:
sal_Bool WriteUniStringLine( const String& rStr );
/// Write multiple lines of Unicode (with CovertLineEnd) and append line end (endlu())
sal_Bool WriteUniStringLines( const String& rStr );
- /// Write a line of Unicode if eDestCharSet==RTL_TEXTENCODING_UNICODE,
- /// otherwise write a line of Bytecode converted to eDestCharSet
- sal_Bool WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
- sal_Bool WriteUniOrByteStringLine( const String& rStr )
- { return WriteUniOrByteStringLine( rStr, GetStreamCharSet() ); }
/// Write a Unicode character if eDestCharSet==RTL_TEXTENCODING_UNICODE,
/// otherwise write as Bytecode converted to eDestCharSet.
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 9ee7876..5c784ea 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -938,14 +938,6 @@ sal_Bool SvStream::WriteUniStringLine( const String& rStr )
return nError == SVSTREAM_OK;
}
-sal_Bool SvStream::WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet )
-{
- if ( eDestCharSet == RTL_TEXTENCODING_UNICODE )
- return WriteUniStringLine( rStr );
- else
- return WriteByteStringLine( rStr, eDestCharSet );
-}
-
/*************************************************************************
|*
|* Stream::WriteLines()
commit 98fcafb23a71834c915aad72969ec6846c016ab7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 11 00:30:23 2011 +0100
remove ugly and unused WriteUniOrByteStringLines
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 4273583..1e7b0b5 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -495,12 +495,7 @@ public:
sal_Bool WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
sal_Bool WriteUniOrByteStringLine( const String& rStr )
{ return WriteUniOrByteStringLine( rStr, GetStreamCharSet() ); }
- /// Write multiple lines of Unicode if eDestCharSet==RTL_TEXTENCODING_UNICODE,
- /// otherwise write multiple lines of Bytecode converted to eDestCharSet,
- /// CovertLineEnd is applied.
- sal_Bool WriteUniOrByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet );
- sal_Bool WriteUniOrByteStringLines( const String& rStr )
- { return WriteUniOrByteStringLines( rStr, GetStreamCharSet() ); }
+
/// Write a Unicode character if eDestCharSet==RTL_TEXTENCODING_UNICODE,
/// otherwise write as Bytecode converted to eDestCharSet.
/// This may result in more than one byte being written
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 11a1cb3..9ee7876 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -974,14 +974,6 @@ sal_Bool SvStream::WriteUniStringLines( const String& rStr )
return nError == SVSTREAM_OK;
}
-sal_Bool SvStream::WriteUniOrByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet )
-{
- if ( eDestCharSet == RTL_TEXTENCODING_UNICODE )
- return WriteUniStringLines( rStr );
- else
- return WriteByteStringLines( rStr, eDestCharSet );
-}
-
/*************************************************************************
|*
|* Stream::WriteUniOrByteChar()
commit 5fee7a9c94d421e9debd543eb560d47af13aaf5d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 11 00:17:37 2011 +0100
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e313d04..e2fedb2 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -837,7 +837,7 @@ ERRTYPE RscCompiler::Link()
OUString sIlstUrl, sIlstSys;
sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1);
sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.'));
- sIlstUrl += OUString::createFromAscii(".ilst");
+ sIlstUrl += OUString(RTL_CONSTASCII_USTRINGPARAM(".ilst"));
sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8));
aSysList = lcl_getSystemPath(sIlstUrl);
commit 4b9dd3ac2bc0d84800084cb58b54fab1a11eb84f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 10 23:54:57 2011 +0100
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index c317621..437d317 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -92,7 +92,7 @@ short SvColorDialog::Execute()
Sequence< Any > args(1);
args[0] = Any( xParent );
- Reference< XExecutableDialog > xDialog( xSMGR->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.cui.ColorPicker"), args), UNO_QUERY_THROW );
+ Reference< XExecutableDialog > xDialog( xSMGR->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.cui.ColorPicker")), args), UNO_QUERY_THROW );
Reference< XPropertyAccess > xPropertyAccess( xDialog, UNO_QUERY_THROW );
Sequence< PropertyValue > props( 2 );
commit de64f2bd92566ac2e43707b7c102889b3ffeb679
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 10 23:53:58 2011 +0100
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx
index a44e61b..4c0d5df 100644
--- a/toolkit/source/awt/vclxtabpagemodel.cxx
+++ b/toolkit/source/awt/vclxtabpagemodel.cxx
@@ -107,7 +107,7 @@ void SAL_CALL VCLXTabPageModel::setEnabled( ::sal_Bool _enabled ) throw (::com::
//if ( pTabControl )
// return pTabControl->GetPageText(0);
//else
- return ::rtl::OUString::createFromAscii("");
+ return ::rtl::OUString();
}
void SAL_CALL VCLXTabPageModel::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException)
{
@@ -118,7 +118,7 @@ void SAL_CALL VCLXTabPageModel::setTitle( const ::rtl::OUString& _title ) throw
}
::rtl::OUString SAL_CALL VCLXTabPageModel::getImageURL() throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii("");
+ return ::rtl::OUString();
}
void SAL_CALL VCLXTabPageModel::setImageURL( const ::rtl::OUString& /*_imageurl*/ ) throw (::com::sun::star::uno::RuntimeException)
{
@@ -127,7 +127,7 @@ void SAL_CALL VCLXTabPageModel::setImageURL( const ::rtl::OUString& /*_imageurl*
::rtl::OUString SAL_CALL VCLXTabPageModel::getTooltip() throw (::com::sun::star::uno::RuntimeException)
{
//return m_sTooltip;
- return ::rtl::OUString::createFromAscii("");
+ return ::rtl::OUString();
}
void SAL_CALL VCLXTabPageModel::setTooltip( const ::rtl::OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException)
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 29af17a..bfe570a 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -893,8 +893,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_TABPAGE:
/*
- if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
- ::rtl::OUString::createFromAscii("tabpagemodel") ) )
+ if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("tabpagemodel") ) )
{
pNewWindow = new TabControl( pParent, nWinBits );
*ppNewComp = new VCLXTabPageContainer;
@@ -1031,8 +1031,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
// (compatibility)
*ppNewComp = new ::toolkit::XThrobber;
}
- else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
- ::rtl::OUString::createFromAscii("tabpagecontainer") ) )
+ else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("tabpagecontainer") ) )
{
pNewWindow = new TabControl( pParent, nWinBits );
*ppNewComp = new VCLXTabPageContainer;
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 418d89f..ef9e2c2 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -289,7 +289,7 @@ namespace toolkit
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "org.openoffice.comp.toolkit.AnimatedImagesControlModel" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.toolkit.AnimatedImagesControlModel"));
}
//------------------------------------------------------------------------------------------------------------------
@@ -297,7 +297,7 @@ namespace toolkit
{
Sequence< ::rtl::OUString > aServiceNames(2);
aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel );
- aServiceNames[1] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" );
+ aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"));
return aServiceNames;
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index d83f174..0a62b39 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -408,7 +408,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const ::rtl::
Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
if ( xAgg.is() )
{
- if ( xSI->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" ) ) )
+ if ( xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"))) )
{
// release 3 of the 4 references we have to the object
xAgg.clear();
@@ -996,8 +996,8 @@ void ControlModelContainerBase::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
}
@@ -1029,8 +1029,8 @@ void ControlModelContainerBase::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
continue;
@@ -1059,8 +1059,8 @@ void ControlModelContainerBase::implUpdateGroupStructure()
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
::rtl::OUString sLabel;
- if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
- xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+ if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+ xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
}
@@ -1722,10 +1722,10 @@ void ControlContainerBase::addingControl( const Reference< XControl >& _rxContro
{
Sequence< ::rtl::OUString > aNames( 4 );
::rtl::OUString* pNames = aNames.getArray();
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionX" );
- *pNames++ = ::rtl::OUString::createFromAscii( "PositionY" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Width" );
- *pNames++ = ::rtl::OUString::createFromAscii( "Height" );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX") );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY") );
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+ *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
xProps->addPropertiesChangeListener( aNames, this );
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 3556673..1ad71e9 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -266,9 +266,9 @@ UnoDialogControl::~UnoDialogControl()
sal_Bool bDecoration( sal_True );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return ::rtl::OUString::createFromAscii( "Dialog" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialog"));
else
- return ::rtl::OUString::createFromAscii( "TabPage" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPage"));
}
void UnoDialogControl::dispose() throw(RuntimeException)
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 5b9de0e..3019be3 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -122,7 +122,7 @@ namespace toolkit
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "org.openoffice.comp.toolkit.SpinningProgressControlModel" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.toolkit.SpinningProgressControlModel"));
}
//------------------------------------------------------------------------------------------------------------------
@@ -131,7 +131,7 @@ namespace toolkit
Sequence< ::rtl::OUString > aServiceNames(3);
aServiceNames[0] = ::rtl::OUString::createFromAscii( szServiceName_SpinningProgressControlModel );
aServiceNames[1] = ::rtl::OUString::createFromAscii( szServiceName_AnimatedImagesControlModel );
- aServiceNames[2] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" );
+ aServiceNames[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"));
return aServiceNames;
}
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 6e88c26..9ddd30a 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -185,7 +185,7 @@ UnoControlTabPageContainer::UnoControlTabPageContainer( const Reference< XMultiS
OUString UnoControlTabPageContainer::GetComponentServiceName()
{
- return OUString::createFromAscii( "TabPageContainer" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("TabPageContainer"));
}
void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException)
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 41f21e1..649ae00 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -247,14 +247,13 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
//===== Service ===============================================================
::rtl::OUString UnoControlTabPageModel_getImplementationName (void) throw(RuntimeException)
{
- return rtl::OUString::createFromAscii("com.sun.star.awt.tab.UnoControlTabPageModel");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tab.UnoControlTabPageModel"));
}
Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.awt.tab.UnoControlTabPageModel"));
+ const ::rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tab.UnoControlTabPageModel"));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
//=============================================================================
@@ -274,7 +273,7 @@ UnoControlTabPage::~UnoControlTabPage()
::rtl::OUString UnoControlTabPage::GetComponentServiceName()
{
- return ::rtl::OUString::createFromAscii( "TabPageModel" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPageModel"));
}
void UnoControlTabPage::dispose() throw(RuntimeException)
commit cb13cdf076a7a49e026b7545adbaad717df3e84c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 10 23:35:57 2011 +0100
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 43dc631..b5c1e16 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -196,18 +196,18 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
uno::Reference < io::XStream > xStream = new utl::OStreamWrapper( aStrm );
uno::Reference< io::XSeekable > xSeekable( xStream, UNO_QUERY_THROW );
uno::Reference< graphic::XGraphicProvider > xGraphicProvider( ImplGetSVData()->maAppData.mxMSF->createInstance(
- OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ), UNO_QUERY );
if ( xGraphicProvider.is() )
{
uno::Reference< graphic::XGraphic > xGraphic( aGraphic.GetXGraphic() );
uno::Reference < io::XOutputStream > xOut( xStream->getOutputStream() );
- rtl::OUString aMimeType( ::rtl::OUString::createFromAscii( "image/jpeg" ) );
+ rtl::OUString aMimeType(RTL_CONSTASCII_USTRINGPARAM("image/jpeg"));
uno::Sequence< beans::PropertyValue > aOutMediaProperties( 3 );
- aOutMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+ aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream"));
aOutMediaProperties[0].Value <<= xOut;
- aOutMediaProperties[1].Name = ::rtl::OUString::createFromAscii( "MimeType" );
+ aOutMediaProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MimeType"));
aOutMediaProperties[1].Value <<= aMimeType;
- aOutMediaProperties[2].Name = ::rtl::OUString::createFromAscii( "FilterData" );
+ aOutMediaProperties[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData"));
aOutMediaProperties[2].Value <<= aFilterData;
xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
xOut->flush();
@@ -221,13 +221,13 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
xSeekable->seek( 0 );
Sequence< PropertyValue > aArgs( 1 );
- aArgs[ 0 ].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+ aArgs[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
aArgs[ 0 ].Value <<= xStream;
uno::Reference< XPropertySet > xPropSet( xGraphicProvider->queryGraphicDescriptor( aArgs ) );
if ( xPropSet.is() )
{
sal_Int16 nBitsPerPixel = 24;
- if ( xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "BitsPerPixel" ) ) >>= nBitsPerPixel )
+ if ( xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BitsPerPixel")) ) >>= nBitsPerPixel )
{
bTrueColorJPG = nBitsPerPixel != 8;
}
diff --git a/vcl/source/gdi/svgread.cxx b/vcl/source/gdi/svgread.cxx
index 47ef39c..554cfa8 100644
--- a/vcl/source/gdi/svgread.cxx
+++ b/vcl/source/gdi/svgread.cxx
@@ -78,7 +78,7 @@ namespace vcl
if( nStmLen )
{
- const vcl::RenderGraphic aSVGGraphic( ::rtl::OUString::createFromAscii( "image/svg+xml" ), nStmLen );
+ const vcl::RenderGraphic aSVGGraphic( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/svg+xml")), nStmLen );
mrStm.Seek( nStmPos );
mrStm.Read( aSVGGraphic.GetGraphicData().get(), nStmLen );
More information about the Libreoffice-commits
mailing list