diff options
28 files changed, 27 insertions, 36 deletions
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 635cccae173c..7e1bc645aeb5 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -38,6 +38,7 @@ #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> #include <osl/mutex.hxx> +#include <osl/thread.h> #include <rtl/digest.h> #include <rtl/strbuf.hxx> @@ -958,7 +959,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary SbModule* pMod = pBasicLib->FindModule( aElementName ); if( !pMod ) { - pMod = pBasicLib->MakeModule( aElementName, String() ); + pMod = pBasicLib->MakeModule( aElementName, OUString() ); pBasicLib->SetModified( sal_False ); } @@ -1077,7 +1078,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary SbModule* pMod = pBasicLib->FindModule( aElementName ); if( !pMod ) { - pMod = pBasicLib->MakeModule( aElementName, String() ); + pMod = pBasicLib->MakeModule( aElementName, OUString() ); pBasicLib->SetModified( sal_False ); } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 8ab54d24b068..b97a02e2a1ac 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2520,7 +2520,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) OUString sName = xContent->getIdentifier()->getContentIdentifier(); sal_Int32 nIndex = 0; sName = sName.copy(sName.getToken(0,'/',nIndex).getLength() + 1); - if ( m_aAsyncDrop.aUrl.Len() >= sName.getLength() && 0 == sName.compareTo(m_aAsyncDrop.aUrl,sName.getLength()) ) + if ( m_aAsyncDrop.aUrl.getLength() >= sName.getLength() && m_aAsyncDrop.aUrl.startsWith(sName) ) { m_aAsyncDrop.aDroppedData.clear(); return DND_ACTION_NONE; @@ -2530,7 +2530,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) Reference< XHierarchicalNameAccess > xContainer(getElements(m_aAsyncDrop.nType),UNO_QUERY); Reference<XNameAccess> xNameAccess(xContainer,UNO_QUERY); - if ( m_aAsyncDrop.aUrl.Len() && xContainer.is() && xContainer->hasByHierarchicalName(m_aAsyncDrop.aUrl) ) + if ( !m_aAsyncDrop.aUrl.isEmpty() && xContainer.is() && xContainer->hasByHierarchicalName(m_aAsyncDrop.aUrl) ) xNameAccess.set(xContainer->getByHierarchicalName(m_aAsyncDrop.aUrl),UNO_QUERY); if ( xNameAccess.is() ) diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index f2b1dc503543..31ca3de9c0f3 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -74,7 +74,7 @@ namespace dbaui //for transfor the tablename OUString sDefaultTableName; - String aUrl; + OUString aUrl; SotStorageStreamRef aHtmlRtfStorage; ElementType nType; SvTreeListEntry* pDroppedAt; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index f5806b399c6b..045835a242ae 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2036,7 +2036,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, Edit { if ( IsUndoEnabled() && !IsInUndo() ) { - XubString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) ); + OUString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) ); // Check whether attributes are deleted or changed: sal_uInt16 nStart = rPaM.GetIndex(); @@ -2895,15 +2895,15 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel ) { sal_Int32 nPara = aEditDoc.GetPos( aPaM.GetNode() ); OSL_ENSURE( nPara > 0, "AutoIndenting: Error!" ); - XubString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) ); - sal_uInt16 n = 0; - while ( ( n < aPrevParaText.Len() ) && - ( ( aPrevParaText.GetChar(n) == ' ' ) || ( aPrevParaText.GetChar(n) == '\t' ) ) ) + OUString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) ); + sal_Int32 n = 0; + while ( ( n < aPrevParaText.getLength() ) && + ( ( aPrevParaText[n] == ' ' ) || ( aPrevParaText[n] == '\t' ) ) ) { - if ( aPrevParaText.GetChar(n) == '\t' ) + if ( aPrevParaText[n] == '\t' ) aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) ); else - aPaM = ImpInsertText( aPaM, OUString(aPrevParaText.GetChar(n)) ); + aPaM = ImpInsertText( aPaM, OUString(aPrevParaText[n]) ); n++; } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1b094f3dfaee..e746a14fe674 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -263,7 +263,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel ) if ( nNode == nEndNode ) // can also be == nStart! nEndPos = aSel.Max().GetIndex(); } - XubString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); + OUString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); rOutput.WriteByteStringLine( aTmpStr, rOutput.GetStreamCharSet() ); } @@ -661,7 +661,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) if ( n == nEndPortion ) nE = nEndPos; - XubString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); + OUString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); RTFOutFuncs::Out_String( rOutput, aRTFStr, eDestEnc ); rOutput << '}'; } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 074df55db354..8264c0bf434c 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -370,10 +370,10 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c OUString SvxBulletItem::GetFullText() const { - XubString aStr( aPrevText ); - aStr += cSymbol; - aStr += aFollowText; - return aStr; + OUStringBuffer aStr(aPrevText); + aStr.append(cSymbol); + aStr.append(aFollowText); + return aStr.makeStringAndClear(); } //------------------------------------------------------------------------ diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index d7864825b3b8..b3a88dfbe6a1 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -22,7 +22,6 @@ #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <vcl/image.hxx> @@ -119,7 +118,7 @@ potentially not all applications [Draw,Equation,FontWork] can properly handle synthetic fonts. On filling, the previous name will be retained if possible. -For DontKnow, the FontStyleBox should be filled with String(), +For DontKnow, the FontStyleBox should be filled with OUString(), so it will contain a list with the default attributes. The currently shown style probably needs to be reset by the application. diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 33afac3fd3e8..ab54d55a0256 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -25,7 +25,6 @@ #include "svtools/svtdllapi.h" #include <tools/errinf.hxx> -#include <tools/string.hxx> class Window; class ResMgr; diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 35ed06dc92d5..0d8d96b8aa44 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.hxx @@ -22,7 +22,7 @@ #include "svtools/svtdllapi.h" #include <list> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <unotools/options.hxx> class SvtHelpOptions_Impl; diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index 60dafcb4e130..f5fba8483271 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -21,7 +21,6 @@ #define _IMAP_HXX #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <tools/stream.hxx> #include <vector> diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 7f383de1197c..f77aec7fe29e 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -21,7 +21,6 @@ #define _GOODIES_IMAPOBJ_HXX #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <svl/macitem.hxx> #include <rtl/strbuf.hxx> diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index e5a80b5bbb1e..71d8daafa79a 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -19,7 +19,6 @@ #ifndef _INETIMG_HXX #define _INETIMG_HXX -#include <tools/string.hxx> #include <tools/gen.hxx> class SvData; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 104143696ec1..3c8fe00e2b0c 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -22,7 +22,6 @@ #include "rtl/ref.hxx" #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <tools/urlobj.hxx> #include <vcl/combobox.hxx> diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 0a8e05954d71..d8aecb48ade6 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -21,7 +21,6 @@ #define _ICNVW_HXX #include "svtools/svtdllapi.h" -#include <tools/string.hxx> #include <vcl/ctrl.hxx> #include <tools/link.hxx> #include <tools/contnr.hxx> diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 1bebf7d45c45..32d87b4e60bb 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase1.hxx> #include <sot/exchange.hxx> -#include <tools/string.hxx> /** DropTargetListener that takes care of opening a file when it is dropped in the frame. */ diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index f57b1ce1845b..19eca16b6a66 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -22,7 +22,6 @@ #include "svtools/svtdllapi.h" #include <tools/solar.h> -#include <tools/string.hxx> #include <svtools/svparser.hxx> #include <boost/ptr_container/ptr_vector.hpp> diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index ee4688e9f96d..7d159af51f2c 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -22,9 +22,9 @@ #include "svtools/svtdllapi.h" #include <tools/link.hxx> -#include <tools/string.hxx> #include <tools/ref.hxx> #include <rtl/textenc.h> +#include <rtl/ustring.hxx> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/utility.hpp> #include <vector> diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index f85732638cfa..6354a0a416bd 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -23,7 +23,6 @@ #include "svtools/svtdllapi.h" #include <tools/globname.hxx> #include <tools/gen.hxx> -#include <tools/string.hxx> #include <sot/formats.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase4.hxx> diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 8019779b3748..3632bb1fd584 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -21,6 +21,7 @@ #define _SVX_XMLEXCHG_HXX_ #include <svtools/transfer.hxx> +#include <tools/string.hxx> #include "svx/svxdllapi.h" namespace com { diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index 0522df360ce2..230a5b2c5057 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -24,7 +24,6 @@ #include <boost/noncopyable.hpp> #include <i18nlangtag/languagetag.hxx> -#include <tools/string.hxx> #include <tools/solar.h> #include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/i18n/KParseTokens.hpp> diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx index 4a1864b2f44f..77ead6b8a523 100644 --- a/include/unotools/localfilehelper.hxx +++ b/include/unotools/localfilehelper.hxx @@ -23,7 +23,6 @@ #include "unotools/unotoolsdllapi.h" #include <rtl/ustring.hxx> -#include <tools/string.hxx> namespace utl { diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx index 426524dbff8e..d1d6bd9f45de 100644 --- a/include/unotools/pathoptions.hxx +++ b/include/unotools/pathoptions.hxx @@ -20,7 +20,6 @@ #define INCLUDED_unotools_PATHOPTIONS_HXX #include "unotools/unotoolsdllapi.h" -#include <tools/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/options.hxx> diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx index da3a472e8f60..9efe45a3fb9f 100644 --- a/include/unotools/tempfile.hxx +++ b/include/unotools/tempfile.hxx @@ -21,7 +21,6 @@ #ifndef _UNOTOOLS_TEMPFILE_HXX #define _UNOTOOLS_TEMPFILE_HXX -#include <tools/string.hxx> #include <tools/stream.hxx> namespace utl diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index 44552d652cd1..4a48a21a2820 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -45,7 +45,6 @@ namespace com } } -class String; namespace utl { class UcbLockBytesHandler; diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index f3f2e7d03158..5fff13455a32 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -18,6 +18,7 @@ */ +#include <osl/thread.h> #include <svtools/htmlcfg.hxx> #include <svtools/parhtml.hxx> #include <unotools/syslocale.hxx> diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 3bc5a5c16e67..a6717d50f86e 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -22,6 +22,7 @@ #include <stdio.h> #include <comphelper/string.hxx> #include <tools/stream.hxx> +#include <tools/string.hxx> #include <tools/debug.hxx> #include <tools/color.hxx> #include <rtl/ustrbuf.hxx> diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index b7a98620d60b..98999c42a779 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/thread.h> #include <sot/formats.hxx> #include <tools/stream.hxx> diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 1411f43d731a..4b98c2dc67dd 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -22,6 +22,7 @@ #include <vector> +#include <tools/string.hxx> #include <unotools/syslocale.hxx> #include <basic/sbxvar.hxx> |