filter/source/msfilter/msdffimp.cxx | 1
filter/source/msfilter/util.cxx | 1
include/tools/string.hxx | 2 -
lotuswordpro/source/filter/lwpcelllayout.cxx | 2 -
lotuswordpro/source/filter/lwptblcell.hxx | 2 -
lotuswordpro/source/filter/lwptblformula.cxx | 1
tools/source/string/tustring.cxx | 30 ---------------------------
unusedcode.easy | 1
8 files changed, 2 insertions(+), 38 deletions(-)
New commits:
commit 11265856c564d5bb3278c5b816457af11338f554
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Oct 19 19:59:33 2013 +0100
drop some tools/string includes
Change-Id: I83698b10c0c4fef1929d62be809ac7d77e9a3502
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 34638f9..f5b655b 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -59,7 +59,6 @@
#include <editeng/charscaleitem.hxx>
#include <editeng/kernitem.hxx>
#include <vcl/graphicfilter.hxx>
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <vcl/virdev.hxx>
#include <vcl/bmpacc.hxx>
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 192ba41..13bc633 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -9,7 +9,6 @@
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
-#include <tools/string.hxx>
#include <unotools/fontcvt.hxx>
#include <unotools/fontdefs.hxx>
#include <vcl/svapp.hxx>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 529acc3..c7cb6a0 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -58,8 +58,6 @@
* For LWP filter architecture prototype - cell layouts
*/
-#include <tools/string.hxx>
-
#include "lwpcelllayout.hxx"
#include "lwpfoundry.hxx"
#include "lwpobjfactory.hxx"
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx
b/lotuswordpro/source/filter/lwptblcell.hxx
index b0ab4e9..ffb149f 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -64,8 +64,6 @@
#ifndef _LWPLAYOUTNUMERICSOVERRIDE_HXX_
#define _LWPLAYOUTNUMERICSOVERRIDE_HXX_
-#include <tools/string.hxx>
-
#include "lwpobj.hxx"
#include "lwpatomholder.hxx"
#include "lwpstory.hxx"
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx
b/lotuswordpro/source/filter/lwptblformula.cxx
index 5d5021f..f7c1375 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -68,6 +68,7 @@
#include "lwptblformula.hxx"
#include "lwptablelayout.hxx"
+#include <osl/thread.h>
#include <rtl/ustrbuf.hxx>
#include <boost/scoped_array.hpp>
commit 35373db02976efff7f640b477d07825e96c6b5a4
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Oct 19 19:21:49 2013 +0100
Related: fdo#38838 remove String::Assign(const sal_Unicode*)
Change-Id: I0dfa34732acfd20e71fa3876466552338332610b
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index d2e5088..2203a7d 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -135,6 +135,7 @@ private:
TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr );
TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
TOOLS_DLLPRIVATE UniString( sal_Unicode c );
+ TOOLS_DLLPRIVATE UniString& Assign( const sal_Unicode* pCharStr );
TOOLS_DLLPRIVATE UniString& Assign( const sal_Unicode* pCharStr,
xub_StrLen nLen );
TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr );
TOOLS_DLLPRIVATE UniString& Append( const sal_Unicode* pCharStr,
xub_StrLen nLen );
@@ -181,7 +182,6 @@ public:
UniString& Assign( const UniString& rStr );
UniString& Assign( const OUString& rStr );
- UniString& Assign( const sal_Unicode* pCharStr );
UniString& Assign( sal_Unicode c );
inline UniString & Assign(char c) // ...but allow "Assign('a')"
{ return Assign(static_cast< sal_Unicode >(c)); }
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 59b80d7..6fd2689 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -221,36 +221,6 @@ STRING& STRING::Assign( STRCODE c )
return *this;
}
-STRING& STRING::Assign( const STRCODE* pCharStr )
-{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
- DBG_ASSERT( pCharStr, "String::Assign() - pCharStr is NULL" );
-
- xub_StrLen nLen = ImplStringLen( pCharStr );
-
- if ( !nLen )
- {
- STRING_NEW((STRING_TYPE **)&mpData);
- }
- else
- {
- // copy without allocation if string length is identical
- if ( (nLen == mpData->mnLen) && (mpData->mnRefCount == 1) )
- memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
- else
- {
- // free old string
- STRING_RELEASE((STRING_TYPE *)mpData);
-
- // allocate string of new size and copy
- mpData = ImplAllocData( nLen );
- memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
- }
- }
-
- return *this;
-}
-
xub_StrLen ImplStringLen( const sal_Char* pStr )
{
const sal_Char* pTempStr = pStr;
diff --git a/unusedcode.easy b/unusedcode.easy
index f96a778..7e76ace 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -63,7 +63,6 @@ SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString,
com::sun::star::uno:
SfxTemplatePanelControl::SetParagraphFamily()
SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
-String::Assign(unsigned short const*)
String::Insert(String const&, unsigned short, unsigned short, unsigned short)
String::String(char)
SvdProgressInfo::ReportError()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
