Repository.mk | 1 canvas/source/directx/dx_textlayout_drawhelper.cxx | 2 cosv/Makefile | 7 ++ cosv/Module_cosv.mk | 16 +++++ cosv/Package_inc.mk | 36 ++++++++++++ cosv/StaticLibrary_cosv.mk | 34 +++++++++++ cosv/prj/build.lst | 12 ---- cosv/prj/d.lst | 8 -- cosv/source/comphelp/makefile.mk | 46 --------------- cosv/source/fullcpp.mk | 35 ----------- cosv/source/inc/precomp.h | 36 ------------ cosv/source/service/makefile.mk | 49 ---------------- cosv/source/storage/makefile.mk | 43 -------------- cosv/source/strings/makefile.mk | 49 ---------------- cosv/source/unittest/makefile.mk | 63 --------------------- cosv/util/makefile.mk | 49 ---------------- sfx2/source/appl/appdde.cxx | 8 +- sfx2/source/appl/lnkbase2.cxx | 4 - solenv/inc/libs.mk | 4 - svl/inc/svl/svdde.hxx | 18 +++--- svl/source/svdde/ddecli.cxx | 4 - svl/source/svdde/ddedata.cxx | 2 svl/source/svdde/ddeimp.hxx | 7 +- svl/source/svdde/ddestrg.cxx | 10 +-- svl/source/svdde/ddesvr.cxx | 34 +++++------ svl/unx/source/svdde/ddedummy.cxx | 14 ++-- svx/source/dialog/sendreportw32.cxx | 2 sw/source/ui/envelp/envimg.cxx | 2 tools/inc/tools/string.hxx | 7 -- tools/source/string/strascii.cxx | 36 ------------ tools/source/string/strimp.cxx | 28 --------- tools/source/string/tustring.cxx | 37 ------------ unusedcode.easy | 4 - vcl/win/source/gdi/salgdi3.cxx | 10 +-- vcl/win/source/gdi/salprn.cxx | 8 +- vcl/win/source/window/salframe.cxx | 8 +- 36 files changed, 166 insertions(+), 567 deletions(-)
New commits: commit d4b172b8196de05bb4efa39e19a2b324cf0b2778 Author: Caolán McNamara <[email protected]> Date: Thu Aug 2 08:44:10 2012 +0100 strip down UniString some more Change-Id: Ibd749a70a7bbe8c1023edf7bd144aa6547147a12 diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index f804a60..3dca360 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -201,7 +201,7 @@ namespace dxcanvas const Point aEmptyPoint(0, 0); // create the String - const String aText(rText.Text.getStr()); + const rtl::OUString aText(rText.Text); if( rLogicalAdvancements.getLength() ) { diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 280dbf3..94067d9 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -66,7 +66,7 @@ public: ImplDdeService( const String& rNm ) : DdeService( rNm ) {} - virtual sal_Bool MakeTopic( const String& ); + virtual sal_Bool MakeTopic( const rtl::OUString& ); virtual String Topics(); @@ -110,7 +110,7 @@ namespace } } -sal_Bool ImplDdeService::MakeTopic( const String& rNm ) +sal_Bool ImplDdeService::MakeTopic( const rtl::OUString& rNm ) { // Workaround for Event after Main() under OS/2 // happens when exiting starts the App again @@ -223,7 +223,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); virtual sal_Bool StartAdviseLoop(); - virtual sal_Bool MakeItem( const String& rItem ); + virtual sal_Bool MakeItem( const rtl::OUString& rItem ); }; @@ -664,7 +664,7 @@ sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr ) return 0 != nRet; } -sal_Bool SfxDdeDocTopic_Impl::MakeItem( const String& rItem ) +sal_Bool SfxDdeDocTopic_Impl::MakeItem( const rtl::OUString& rItem ) { AddItem( DdeItem( rItem ) ); return sal_True; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index a2b7410..755e6d6 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -603,7 +603,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) String sNm( rLinkName ); sal_uInt16 nTokenPos = 0; - String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + rtl::OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI) @@ -612,7 +612,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) if( pService->GetName() == sService ) { // then we search for the Topic - String sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + rtl::OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); if( pItemStt ) *pItemStt = nTokenPos; diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 0895a81..0d8bc21 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -108,7 +108,7 @@ public: virtual ~DdeTransaction(); sal_Bool IsBusy() { return bBusy; } - const String& GetName() const; + const rtl::OUString GetName() const; void Execute(); @@ -258,7 +258,7 @@ public: DdeItem( const DdeItem& ); virtual ~DdeItem(); - const String& GetName() const; + const rtl::OUString GetName() const; short GetLinks(); void NotifyClient(); }; @@ -294,7 +294,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeItem( const String& rItem ); + virtual sal_Bool MakeItem( const rtl::OUString& rItem ); // es wird ein Warm-/Hot-Link eingerichtet. Return-Wert // besagt ob es geklappt hat @@ -308,7 +308,7 @@ private: private: DdeString* pName; - String aItem; + rtl::OUString aItem; std::vector<DdeItem*> aItems; Link aConnectLink; Link aDisconnectLink; @@ -317,10 +317,10 @@ private: Link aExecLink; public: - DdeTopic( SAL_UNUSED_PARAMETER const String& ); + DdeTopic( SAL_UNUSED_PARAMETER const rtl::OUString& ); virtual ~DdeTopic(); - const String& GetName() const; + const rtl::OUString GetName() const; long GetConvId(); void SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; } @@ -340,7 +340,7 @@ public: void InsertItem( DdeItem* ); // fuer eigene Ableitungen! DdeItem* AddItem( const DdeItem& ); // werden kopiert ! void RemoveItem( const DdeItem& ); - const String& GetCurItem() { return aItem; } + const rtl::OUString& GetCurItem() { return aItem; } const std::vector<DdeItem*>& GetItems() const { return aItems; } private: @@ -360,7 +360,7 @@ public: virtual sal_Bool IsBusy(); virtual String GetHelp(); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeTopic( const String& rItem ); + virtual sal_Bool MakeTopic( const rtl::OUString& rItem ); protected: virtual String Topics(); @@ -385,7 +385,7 @@ public: DdeService( SAL_UNUSED_PARAMETER const String& ); virtual ~DdeService(); - const String& GetName() const; + const rtl::OUString GetName() const; short GetError() { return nStatus; } static DdeServices& GetServices(); diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index e698835..368ef13 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -341,9 +341,9 @@ void DdeTransaction::Execute() // --- DdeTransaction::GetName() ----------------------------------- -const String& DdeTransaction::GetName() const +const rtl::OUString DdeTransaction::GetName() const { - return *pName; + return pName->toOUString(); } // --- DdeTransaction::Data() -------------------------------------- diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 30f7a05..c47d390 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -183,7 +183,7 @@ sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt ) TCHAR szName[ 256 ]; if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) ) - nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast<const sal_Unicode*>(szName)) ); + nFmt = SotExchange::RegisterFormatName( rtl::OUString(reinterpret_cast<const sal_Unicode*>(szName)) ); } #endif break; diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 99e2ec2..02e6841 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -81,19 +81,22 @@ public: // - DdeString - // ------------- -class DdeString : public String +class DdeString { +private: + rtl::OUString m_aString; protected: HSZ hString; DWORD hInst; public: DdeString( DWORD, const sal_Unicode* ); - DdeString( DWORD, const String& ); + DdeString( DWORD, const rtl::OUString& ); ~DdeString(); int operator==( HSZ ); operator HSZ(); + rtl::OUString toOUString() const { return m_aString; } }; // -------------- diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index 1c8c189..6a2564d 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.cxx @@ -25,8 +25,8 @@ // --- DdeString::DdeString() -------------------------------------- -DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) : - String( p ) +DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) + : m_aString(p) { hString = DdeCreateStringHandle( hDdeInst, (LPTSTR)p, CP_WINUNICODE ); hInst = hDdeInst; @@ -34,10 +34,10 @@ DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) : // --- DdeString::DdeString() -------------------------------------- -DdeString::DdeString( DWORD hDdeInst, const String& r) : - String( r ) +DdeString::DdeString( DWORD hDdeInst, const rtl::OUString& r) + : m_aString(r) { - hString = DdeCreateStringHandle( hDdeInst, (LPTSTR)r.GetBuffer(), CP_WINUNICODE ); + hString = DdeCreateStringHandle( hDdeInst, (LPTSTR)r.getStr(), CP_WINUNICODE ); hInst = hDdeInst; } diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 25cc3cf..383e9d6 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -95,7 +95,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( sal_uInt16 n = 0; while( STRING_NOTFOUND != n ) { - String s( sTopics.GetToken( 0, '\t', n )); + rtl::OUString s( sTopics.GetToken( 0, '\t', n )); if( s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) ++nTopics; } @@ -123,7 +123,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( sal_uInt16 n = 0; while( STRING_NOTFOUND != n ) { - String s( sTopics.GetToken( 0, '\t', n )); + rtl::OUString s( sTopics.GetToken( 0, '\t', n )); s = comphelper::string::remove(s, '\n'); s = comphelper::string::remove(s, '\r'); if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) ) @@ -224,7 +224,7 @@ found: if ( pItem ) pTopic->aItem = pItem->GetName(); else - pTopic->aItem.Erase(); + pTopic->aItem = rtl::OUString(); sal_Bool bRes = sal_False; pInst->hCurConvSvr = (long)hConv; @@ -519,9 +519,9 @@ DdeService::~DdeService() // --- DdeService::GetName() --------------------------------------- -const String& DdeService::GetName() const +const rtl::OUString DdeService::GetName() const { - return *pName; + return pName->toOUString(); } // --- DdeService::GetServices() ----------------------------------- @@ -612,7 +612,7 @@ void DdeService::RemoveFormat( sal_uLong nFmt ) // --- DdeTopic::DdeTopic() ---------------------------------------- -DdeTopic::DdeTopic( const String& rName ) +DdeTopic::DdeTopic( const rtl::OUString& rName ) { DdeInstData* pInst = ImpGetInstData(); DBG_ASSERT(pInst,"SVDDE:No instance data"); @@ -635,9 +635,9 @@ DdeTopic::~DdeTopic() // --- DdeTopic::GetName() ----------------------------------------- -const String& DdeTopic::GetName() const +const rtl::OUString DdeTopic::GetName() const { - return *pName; + return pName->toOUString(); } // --- DdeTopic::IsSystemTopic() ----------------------------------- @@ -703,7 +703,7 @@ void DdeTopic::NotifyClient( const String& rItem ) DBG_ASSERT(pInst,"SVDDE:No instance data"); for ( iter = aItems.begin(); iter != aItems.end(); ++iter) { - if ( (*iter)->GetName() == rItem && (*iter)->pImpData) + if ( (*iter)->GetName().equals(rItem) && (*iter)->pImpData) { DdePostAdvise( pInst->hDdeInstSvr, *pName, *(*iter)->pName ); break; @@ -819,7 +819,7 @@ DdeItem::DdeItem( const DdeItem& r) { DdeInstData* pInst = ImpGetInstData(); DBG_ASSERT(pInst,"SVDDE:No instance data"); - pName = new DdeString( pInst->hDdeInstSvr, *r.pName ); + pName = new DdeString( pInst->hDdeInstSvr, r.pName->toOUString() ); nType = DDEITEM; pMyTopic = 0; pImpData = 0; @@ -838,9 +838,9 @@ DdeItem::~DdeItem() // --- DdeItem::GetName() ------------------------------------------ -const String& DdeItem::GetName() const +const rtl::OUString DdeItem::GetName() const { - return *pName; + return pName->toOUString(); } // --- DdeItem::NotifyClient() ------------------------------------------ @@ -985,7 +985,7 @@ String DdeService::SysItems() s += '\t'; s += (*iterItem)->GetName(); } - s += String::CreateFromAscii("\r\n"); + s += rtl::OUString("\r\n"); } } @@ -1006,7 +1006,7 @@ String DdeService::Topics() s += '\t'; s += (*iter)->GetName(); } - s += String::CreateFromAscii("\r\n"); + s += rtl::OUString("\r\n"); return s; } @@ -1052,7 +1052,7 @@ String DdeService::Formats() String DdeService::Status() { - return IsBusy() ? String::CreateFromAscii("Busy\r\n") : String::CreateFromAscii("Ready\r\n"); + return IsBusy() ? rtl::OUString("Busy\r\n") : rtl::OUString("Ready\r\n"); } // --- DdeService::IsBusy() ---------------------------------------- @@ -1069,12 +1069,12 @@ String DdeService::GetHelp() return String(); } -sal_Bool DdeTopic::MakeItem( const String& ) +sal_Bool DdeTopic::MakeItem( const rtl::OUString& ) { return sal_False; } -sal_Bool DdeService::MakeTopic( const String& ) +sal_Bool DdeService::MakeTopic( const rtl::OUString& ) { return sal_False; } diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index c9e19f3..d38a3d1 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -129,7 +129,7 @@ DdePoke::DdePoke( DdeConnection& rConnection, const String& rString, const DdeDa } -DdeTopic::DdeTopic( const String& ) +DdeTopic::DdeTopic( const rtl::OUString& ) { } @@ -163,7 +163,7 @@ DdeData* DdeTopic::Get( SAL_UNUSED_PARAMETER sal_uLong ) return NULL; } -sal_Bool DdeTopic::MakeItem( SAL_UNUSED_PARAMETER const String& ) +sal_Bool DdeTopic::MakeItem( SAL_UNUSED_PARAMETER const rtl::OUString& ) { return sal_False; } @@ -188,9 +188,9 @@ sal_Bool DdeTopic::Put( SAL_UNUSED_PARAMETER const DdeData* ) return sal_False; } -const String& DdeTopic::GetName() const +const rtl::OUString DdeTopic::GetName() const { - return String::EmptyString(); + return rtl::OUString(); } DdeService::DdeService( const String& ) @@ -248,14 +248,14 @@ void DdeService::RemoveTopic( SAL_UNUSED_PARAMETER const DdeTopic& ) { } -sal_Bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const String& ) +sal_Bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const rtl::OUString& ) { return sal_False; } -const String& DdeService::GetName() const +const rtl::OUString DdeService::GetName() const { - return String::EmptyString(); + return rtl::OUString(); } namespace diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index 129e7cb..c45045f 100644 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -119,7 +119,7 @@ namespace svx{ TEXT("ReturnAddress"), szBuffer, sizeof(szBuffer) ) ) - maEMailAddrED.SetText( (sal_Unicode *)szBuffer ); + maEMailAddrED.SetText(rtl::OUString((sal_Unicode *)szBuffer)); DWORD fAllowContact = sal_False; RegReadValue( diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 5f8f256..e3967c2 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -45,7 +45,7 @@ #include <unomid.h> #ifdef WNT -#define NEXTLINE UniString::CreateFromAscii("\r\n") +#define NEXTLINE rtl::OUString("\r\n") #else #define NEXTLINE '\n' #endif diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index c524f0f..d1768bc 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -152,6 +152,8 @@ private: TOOLS_DLLPRIVATE UniString( const rtl::OString& rByteStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); + TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr ); + TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen ); public: UniString(); @@ -159,8 +161,6 @@ public: UniString( const UniString& rStr ); UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen ); UniString( const rtl::OUString& rStr ); - UniString( const sal_Unicode* pCharStr ); - UniString( const sal_Unicode* pCharStr, xub_StrLen nLen ); UniString( sal_Unicode c ); UniString(char c); // ...but allow "UniString('a')" UniString( const sal_Char* pByteStr, @@ -177,9 +177,6 @@ public: reinterpret_cast<rtl_uString*>(mpData)), SAL_NO_ACQUIRE ); } - static UniString CreateFromAscii( const sal_Char* pAsciiStr ); - static UniString CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); - static UniString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 ); static const UniString& EmptyString(); sal_Int32 ToInt32() const; diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx index 49600b9..f0fd961 100644 --- a/tools/source/string/strascii.cxx +++ b/tools/source/string/strascii.cxx @@ -162,42 +162,6 @@ static sal_Int32 ImplStringICompareAscii( const sal_Unicode* pStr1, const sal_Ch return nRet; } -// ======================================================================= - -UniString UniString::CreateFromAscii( const sal_Char* pAsciiStr ) -{ - DBG_ASSERT( pAsciiStr, "UniString::CreateFromAscii() - pAsciiStr is NULL" ); - - // Stringlaenge ermitteln - xub_StrLen nLen = ImplStringLen( pAsciiStr ); - - UniString aTempStr; - if ( nLen ) - { - ImplCopyAsciiStr( aTempStr.AllocBuffer( nLen ), pAsciiStr, nLen ); - } - return aTempStr; -} - -// ----------------------------------------------------------------------- - -UniString UniString::CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ) -{ - DBG_ASSERT( pAsciiStr, "UniString::CreateFromAscii() - pAsciiStr is NULL" ); - - // Stringlaenge ermitteln - if ( nLen == STRING_LEN ) - nLen = ImplStringLen( pAsciiStr ); - - UniString aTempStr; - - if ( nLen ) - { - ImplCopyAsciiStr( aTempStr.AllocBuffer( nLen ), pAsciiStr, nLen ); - } - return aTempStr; -} - // ----------------------------------------------------------------------- UniString& UniString::AssignAscii( const sal_Char* pAsciiStr ) diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index 3e2fc43..6717d93 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -192,34 +192,6 @@ STRING::STRING( const STRING& rStr, xub_StrLen nPos, xub_StrLen nLen ) // ----------------------------------------------------------------------- -STRING::STRING( const STRCODE* pCharStr ) - : mpData(NULL) -{ - DBG_CTOR( STRING, DBGCHECKSTRING ); - - // Stringlaenge ermitteln - // Bei diesem Ctor darf NULL uebergeben werden - xub_StrLen nLen; - if ( pCharStr ) - nLen = ImplStringLen( pCharStr ); - else - nLen = 0; - - // Ist es kein leerer String - if ( nLen ) - { - // Verwaltungsdaten anlegen und String kopieren - mpData = ImplAllocData( nLen ); - memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) ); - } - else - { - STRING_NEW((STRING_TYPE **)&mpData); - } -} - -// ----------------------------------------------------------------------- - STRING::~STRING() { DBG_DTOR( STRING, DBGCHECKSTRING ); diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index db9aeaa..120bf00 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -855,43 +855,6 @@ STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, xub_StrLen& rIndex ) c // ----------------------------------------------------------------------- -STRING::STRING( const STRCODE* pCharStr, xub_StrLen nLen ) -: mpData(NULL) -{ - DBG_CTOR( STRING, DBGCHECKSTRING ); - DBG_ASSERT( pCharStr, "String::String() - pCharStr is NULL" ); - - if ( nLen == STRING_LEN ) - nLen = ImplStringLen( pCharStr ); - -#ifdef DBG_UTIL - if ( DbgIsAssert() ) - { - for ( xub_StrLen i = 0; i < nLen; i++ ) - { - if ( !pCharStr[i] ) - { - OSL_FAIL( "String::String() : nLen is wrong" ); - } - } - } -#endif - - // Ist es kein leerer String - if ( nLen ) - { - // Verwaltungsdaten anlegen und String kopieren - mpData = ImplAllocData( nLen ); - memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) ); - } - else - { - STRING_NEW((STRING_TYPE **)&mpData); - } -} - -// ----------------------------------------------------------------------- - STRING& STRING::Append( const STRCODE* pCharStr, xub_StrLen nCharLen ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); diff --git a/unusedcode.easy b/unusedcode.easy index 5e27520..25f2c4d 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -25,10 +25,6 @@ SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<co SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) SpinButton::SpinButton(Window*, ResId const&) StgCache::Pos2Page(int) -String::CreateFromAscii(char const*) -String::CreateFromAscii(char const*, unsigned short) -String::String(unsigned short const*) -String::String(unsigned short const*, unsigned short) SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*) SvtSlideSorterBarOptions::AddListenerLink(Link const&) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 81ad69b..ebb1edc 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1010,8 +1010,8 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { - XubString aFontName( reinterpret_cast<const xub_Unicode*>(rLogFont.lfFaceName) ); - if ( aFontName.Len() ) + rtl::OUString aFontName( reinterpret_cast<const xub_Unicode*>(rLogFont.lfFaceName) ); + if (!aFontName.isEmpty()) { rFont.SetName( aFontName ); rFont.SetCharSet( ImplCharSetToSal( rLogFont.lfCharSet ) ); @@ -1890,7 +1890,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0; else pInfo->mbCourier = FALSE; - String aName( reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName) ); + String aName = rtl::OUString(reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName)); pInfo->mpName = &aName; memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) ); pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet; @@ -2745,13 +2745,13 @@ const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const bool bPFA = (*aRawFontData.get() < 0x80); rInfo.m_nFontType = bPFA ? FontSubsetInfo::TYPE1_PFA : FontSubsetInfo::TYPE1_PFB; WCHAR aFaceName[64]; - int nFNLen = ::GetTextFaceW( mhDC, 64, aFaceName ); + sal_Int32 nFNLen = ::GetTextFaceW( mhDC, 64, aFaceName ); // #i59854# strip eventual null byte while( nFNLen > 0 && aFaceName[nFNLen-1] == 0 ) nFNLen--; if( nFNLen == 0 ) *pDataLen = 0; - rInfo.m_aPSName = String( reinterpret_cast<const sal_Unicode*>(aFaceName), sal::static_int_cast<sal_uInt16>(nFNLen) ); + rInfo.m_aPSName = rtl::OUString(reinterpret_cast<const sal_Unicode*>(aFaceName), nFNLen); rInfo.m_nAscent = +aTm.tmAscent; rInfo.m_nDescent = -aTm.tmDescent; rInfo.m_aFontBBox = Rectangle( Point( -aTm.tmOverhang, -aTm.tmDescent ), diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 10bb796..70be7f4 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -218,18 +218,18 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) if( GetPrinterW( hPrinter, 2, (LPBYTE)pWinInfo2, nBytes, &nBytes ) ) { if( pWinInfo2->pDriverName ) - pInfo->maDriver = String( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) ); + pInfo->maDriver = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) ); XubString aPortName; if ( pWinInfo2->pPortName ) - aPortName = String( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) ); + aPortName = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) ); // pLocation can be 0 (the Windows docu doesn't describe this) if ( pWinInfo2->pLocation && *pWinInfo2->pLocation ) - pInfo->maLocation = String( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pLocation) ); + pInfo->maLocation = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pLocation) ); else pInfo->maLocation = aPortName; // pComment can be 0 (the Windows docu doesn't describe this) if ( pWinInfo2->pComment ) - pInfo->maComment = String( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) ); + pInfo->maComment = rtl::OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pComment) ); pInfo->mnStatus = ImplWinQueueStatusToSal( pWinInfo2->Status ); pInfo->mnJobs = pWinInfo2->cJobs; if( ! pInfo->mpSysData ) diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 938a710..25bb9a2 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -4632,7 +4632,7 @@ static int ImplMeasureItem( HWND hWnd, WPARAM wParam, LPARAM lParam ) HFONT hfntOld = (HFONT) SelectObject(hdc, (HFONT) CreateFontIndirect( &ncm.lfMenuFont )); // menu text and accelerator - String aStr(pSalMenuItem->mText.GetBuffer() ); + String aStr(pSalMenuItem->mText); if( pSalMenuItem->mAccelText.Len() ) { aStr.AppendAscii(" "); @@ -4775,7 +4775,7 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam ) hfntOld = (HFONT) SelectObject(pDI->hDC, (HFONT) CreateFontIndirect( &ncm.lfMenuFont )); SIZE strSize; - String aStr( pSalMenuItem->mText.GetBuffer() ); + String aStr( pSalMenuItem->mText ); GetTextExtentPoint32W( pDI->hDC, (LPWSTR) aStr.GetBuffer(), aStr.Len(), &strSize ); @@ -5167,7 +5167,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, { WCHAR* pTextBuf = new WCHAR[nTextLen]; ImmGetCompositionStringW( hIMC, GCS_RESULTSTR, pTextBuf, nTextLen*sizeof( WCHAR ) ); - aEvt.maText = XubString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (xub_StrLen)nTextLen ); + aEvt.maText = rtl::OUString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (sal_Int32)nTextLen ); delete [] pTextBuf; } @@ -5193,7 +5193,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, { WCHAR* pTextBuf = new WCHAR[nTextLen]; ImmGetCompositionStringW( hIMC, GCS_COMPSTR, pTextBuf, nTextLen*sizeof( WCHAR ) ); - aEvt.maText = XubString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (xub_StrLen)nTextLen ); + aEvt.maText = rtl::OUString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (sal_Int32)nTextLen ); delete [] pTextBuf; BYTE* pAttrBuf = NULL; commit 1d90e4f5f3e046b946445dec38811fec8114364c Author: Caolán McNamara <[email protected]> Date: Wed Aug 1 20:25:32 2012 +0100 gbuildize cosv Change-Id: I73eb612edaba21aa5bb07577b42bd31f8de2dd2a diff --git a/Repository.mk b/Repository.mk index ad27532..f485593 100644 --- a/Repository.mk +++ b/Repository.mk @@ -639,6 +639,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ codemaker \ codemaker_cpp \ codemaker_java \ + cosv \ dtobj \ headless \ libeay32 \ diff --git a/cosv/Makefile b/cosv/Makefile new file mode 100644 index 0000000..ccb1c85 --- /dev/null +++ b/cosv/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/cosv/Module_cosv.mk b/cosv/Module_cosv.mk new file mode 100644 index 0000000..729185a --- /dev/null +++ b/cosv/Module_cosv.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +$(eval $(call gb_Module_Module,cosv)) + +$(eval $(call gb_Module_add_targets,cosv,\ + Package_inc \ + StaticLibrary_cosv \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/cosv/Package_inc.mk b/cosv/Package_inc.mk new file mode 100644 index 0000000..fa22956 --- /dev/null +++ b/cosv/Package_inc.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +$(eval $(call gb_Package_Package,cosv_inc,$(SRCDIR)/cosv/inc)) + +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_precomp.h,cosv/csv_precomp.h)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/bstream.hxx,cosv/bstream.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comdline.hxx,cosv/comdline.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comfunc.hxx,cosv/comfunc.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_env.hxx,cosv/csv_env.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_ostream.hxx,cosv/csv_ostream.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/dirchain.hxx,cosv/dirchain.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/file.hxx,cosv/file.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/openclose.hxx,cosv/openclose.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/persist.hxx,cosv/persist.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc_dir.hxx,cosv/ploc_dir.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc.hxx,cosv/ploc.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/plocroot.hxx,cosv/plocroot.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/std_outp.hxx,cosv/std_outp.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/streamstr.hxx,cosv/streamstr.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/stringdata.hxx,cosv/stringdata.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/string.hxx,cosv/string.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/str_types.hxx,cosv/str_types.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/x.hxx,cosv/x.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/dyn.hxx,cosv/tpl/dyn.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/processor.hxx,cosv/tpl/processor.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/swelist.hxx,cosv/tpl/swelist.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/tpltools.hxx,cosv/tpl/tpltools.hxx)) +$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/vvector.hxx,cosv/tpl/vvector.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk new file mode 100644 index 0000000..32b9a05 --- /dev/null +++ b/cosv/StaticLibrary_cosv.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,cosv)) + +$(eval $(call gb_StaticLibrary_set_include,cosv,\ + -I$(SRCDIR)/cosv/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\ + cosv/source/comphelp/badcast \ + cosv/source/service/comdline \ + cosv/source/service/comfunc \ + cosv/source/service/csv_ostream \ + cosv/source/service/std_outp \ + cosv/source/storage/dirchain \ + cosv/source/storage/file \ + cosv/source/storage/persist \ + cosv/source/storage/ploc \ + cosv/source/storage/ploc_dir \ + cosv/source/storage/plocroot \ + cosv/source/strings/streamstr \ + cosv/source/strings/string \ + cosv/source/strings/str_types \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst index 140c617..440b808 100644 --- a/cosv/prj/build.lst +++ b/cosv/prj/build.lst @@ -1,13 +1,3 @@ cs cosv : sal soltools NULL cs cosv usr1 - all cs_mkout NULL -cs cosv\prj get - all cs_prj NULL -cs cosv\inc get - all cs_inc NULL -cs cosv\inc\cosv get - all cs_inc_cosv NULL -cs cosv\inc\cosv\template get - all cs_inc_templ NULL -cs cosv\source get - all cs_src NULL -cs cosv\source\inc get - all cs_src_inc NULL -cs cosv\source\service nmake - all cs_serv NULL -cs cosv\source\storage nmake - all cs_store NULL -cs cosv\source\strings nmake - all cs_string NULL -cs cosv\source\comphelp nmake - all cs_badcast NULL -cs cosv\util nmake - all cs_util cs_serv cs_store cs_string cs_badcast NULL +cs cosv\prj nmake - all cs_prj NULL diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst index 496506b..e69de29 100644 --- a/cosv/prj/d.lst +++ b/cosv/prj/d.lst @@ -1,8 +0,0 @@ -mkdir: %_DEST%\inc\cosv -mkdir: %_DEST%\inc\cosv\tpl - -..\%__SRC%\lib\cosv.lib %_DEST%\lib\cosv.lib -..\%__SRC%\lib\libcosv.a %_DEST%\lib\libcosv.a -..\inc\cosv\*.hxx %_DEST%\inc\cosv\*.hxx -..\inc\cosv\*.h %_DEST%\inc\cosv\*.h -..\inc\cosv\tpl\*.hxx %_DEST%\inc\cosv\tpl\*.hxx diff --git a/cosv/prj/dmake b/cosv/prj/dmake deleted file mode 100644 index e69de29..0000000 diff --git a/cosv/source/comphelp/makefile.mk b/cosv/source/comphelp/makefile.mk deleted file mode 100644 index 1c83fa9..0000000 --- a/cosv/source/comphelp/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=..$/.. - -PRJNAME=cosv -TARGET=cosv_badcast_wnt -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true - -.INCLUDE : settings.mk - - - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/badcast.obj - - - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - - - diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk deleted file mode 100644 index 3c10af2..0000000 --- a/cosv/source/fullcpp.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - - - -# --- Settings ----------------------------------------------------- -# Has to be inlcuded AFTER settings.mk ! - - -.IF "$(COM)"=="MSC" - -# RTTI -CFLAGS+= -GR - -.ENDIF - -.IF "$(COM)"=="GCC" -# RTTI -CFLAGSCXX+= -frtti -.ENDIF diff --git a/cosv/source/inc/precomp.h b/cosv/source/inc/precomp.h deleted file mode 100644 index 41cfd74..0000000 --- a/cosv/source/inc/precomp.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef CSV_PRECOMP_H -#define CSV_PRECOMP_H - - -#define CSV_USE_CSV_ASSERTIONS -#include <cosv/csv_env.hxx> - -#include <cosv/comfunc.hxx> -#include <cosv/string.hxx> -#include <cosv/streamstr.hxx> -#include <cosv/std_outp.hxx> -#include <cosv/tpl/dyn.hxx> - - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/source/service/makefile.mk b/cosv/source/service/makefile.mk deleted file mode 100644 index 6975ae0..0000000 --- a/cosv/source/service/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=..$/.. - -PRJNAME=cosv -TARGET=cosv_service - -ENABLE_EXCEPTIONS=true - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.INCLUDE : $(PRJ)$/source$/fullcpp.mk - - - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/comdline.obj \ - $(OBJ)$/comfunc.obj \ - $(OBJ)$/csv_ostream.obj \ - $(OBJ)$/std_outp.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - - diff --git a/cosv/source/storage/makefile.mk b/cosv/source/storage/makefile.mk deleted file mode 100644 index 3a3b037..0000000 --- a/cosv/source/storage/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=..$/.. - -PRJNAME=cosv -TARGET=cosv_storage - -ENABLE_EXCEPTIONS=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/source$/fullcpp.mk - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/dirchain.obj \ - $(OBJ)$/file.obj \ - $(OBJ)$/persist.obj \ - $(OBJ)$/ploc.obj \ - $(OBJ)$/ploc_dir.obj \ - $(OBJ)$/plocroot.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/cosv/source/strings/makefile.mk b/cosv/source/strings/makefile.mk deleted file mode 100644 index 0391a93..0000000 --- a/cosv/source/strings/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=..$/.. - -PRJNAME=cosv -TARGET=cosv_strings - -ENABLE_EXCEPTIONS=true - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.INCLUDE : $(PRJ)$/source$/fullcpp.mk - - - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/str_types.obj \ - $(OBJ)$/streamstr.obj \ - $(OBJ)$/string.obj - - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - - diff --git a/cosv/source/unittest/makefile.mk b/cosv/source/unittest/makefile.mk deleted file mode 100644 index 3389c73..0000000 --- a/cosv/source/unittest/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=..$/.. - -PRJNAME=cosv -TARGET=cosv_unittest -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true -PRJINC=$(PRJ)$/source - -.INCLUDE : settings.mk -.INCLUDE : static.mk - -.INCLUDE : $(PRJ)$/source$/fullcpp.mk - - - - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/file_ut.obj \ - $(OBJ)$/simplestring_ut.obj - - - - -APP1TARGET= $(TARGET) -APP1STACK= 1000000 -APP1OBJS= $(OBJ)$/ut_main.obj - - -APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib - - -APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - - diff --git a/cosv/util/makefile.mk b/cosv/util/makefile.mk deleted file mode 100644 index 9ac7447..0000000 --- a/cosv/util/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=.. - -PRJNAME=cosv -TARGET=cosv - -ENABLE_EXCEPTIONS=true - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - - -# --- Files -------------------------------------------------------- - -LIB1FILES= \ - $(LB)$/cosv_service.lib \ - $(LB)$/cosv_storage.lib \ - $(LB)$/cosv_strings.lib \ - $(LB)$/cosv_badcast_wnt.lib - - -# --- Targets ------------------------------------------------------ - -LIB1TARGET= $(LB)$/$(TARGET).lib -LIB1ARCHIV= $(LB)$/lib$(TARGET).a - - -.INCLUDE : target.mk - - diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 9c17046..d01be0a 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -520,7 +520,7 @@ APP3RDLIB= $(LIBPRE) app.lib SAMPLE3RDLIB= $(LIBPRE) sample.lib HNJLIB*=libhnj.lib MYSPELLLIB= $(LIBPRE) myspell.lib -COSVLIB= $(LIBPRE) cosv.lib +COSVLIB=cosv.lib UDMLIB= $(LIBPRE) udm.lib ULINGULIB=$(LIBPRE) libulingu.lib .IF "$(SYSTEM_HUNSPELL)" == "YES" commit c97f34c72b151cd6820cbae5ad94743ec0379de3 Author: Caolán McNamara <[email protected]> Date: Wed Aug 1 21:55:32 2012 +0100 sablotron gone for years Change-Id: Ib62f0595c42bc4bd8f5c55c8d3de19e92dfe9698 diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 31e947b..9c17046 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -300,7 +300,6 @@ USED_BOOTSTRP_LIBS= $(TOOLSLIB) USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) \ $(USED_UNO_LIBS) -SABLOT3RDLIB=-lsablot APP3RDLIB=-lapp SAMPLE3RDLIB=-lsample HNJLIB*=-lhyphen @@ -517,7 +516,6 @@ BFSO3LIB=bf_so.lib LEGACYSMGRLIB=ilegacy_binfilters.lib BFSVTOOLLIB=bf_svt.lib -SABLOT3RDLIB= $(LIBPRE) sablot.lib APP3RDLIB= $(LIBPRE) app.lib SAMPLE3RDLIB= $(LIBPRE) sample.lib HNJLIB*=libhnj.lib
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
