[Libreoffice-commits] .: 3 commits - basctl/source oox/Package_inc.mk tools/source unusedcode.easy

[Caolán McNamara]

 basctl/source/basicide/baside2.cxx |    2 +-
 basctl/source/basicide/baside2.hxx |    2 +-
 oox/Package_inc.mk                 |    1 +
 tools/source/inet/inetstrm.cxx     |   22 +++++++++++-----------
 unusedcode.easy                    |    1 -
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit f4eb51fc238a427f148b0dde253570f4030bddf0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 24 21:48:33 2011 +0000

    fix build error, deliver oox/helper/attributelist.hxx

diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index ac2ad7d..5564eab 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/expor
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
 $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
commit 33a03b669bf195a25efa273ad38402fb2e54aa78
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 24 21:41:31 2011 +0000

    no need for BasicErrorHdl to be a LINK

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 8b57961..fb6ed3a 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -659,7 +659,7 @@ void ModulWindow::ManageBreakPoints()
 }
 
 
-IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
+long ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
 {
     DBG_CHKTHIS( ModulWindow, 0 );
     GoOnTop();
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index ebf501e..119aa60 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -326,7 +326,7 @@ private:
     String              aCurPath;
     ::rtl::OUString     m_aModule;
 
-    DECL_LINK( BasicErrorHdl, StarBASIC * );
+    long                BasicErrorHdl( StarBASIC* pBasic );
     long                BasicBreakHdl( StarBASIC* pBasic );
 
     void                CheckCompileBasic();
diff --git a/unusedcode.easy b/unusedcode.easy
index 3283270..98cc325 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -227,7 +227,6 @@ MetricBox::RemoveValue(long, FieldUnit)
 MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
 MiscSettings::SetDisablePrinting(unsigned char)
 MiscSettings::SetEnableATToolSupport(unsigned char)
-ModulWindow::LinkStubBasicErrorHdl(void*, void*)
 MoreButton::RemoveWindow(Window*)
 MultiLineEdit::GetHScrollBar() const
 MultiLineEdit::GetLeftMargin() const
commit e2b73031e810bc5b29101a9d22ab0264ae676d99
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 24 21:35:32 2011 +0000

    ByteString->rtl::OString

diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index eadeec5..6b1011b 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -503,14 +503,14 @@ int INetMessageOStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
     // Check for header or body.
     if (!IsHeaderParsed())
     {
-        ByteString aField (pData);
-        sal_uInt16 nPos = aField.Search (':');
-        if (nPos != STRING_NOTFOUND)
+        rtl::OString aField(pData);
+        sal_Int32 nPos = aField.indexOf(':');
+        if (nPos != -1)
         {
-            ByteString aName (
-                aField.Copy (0, nPos));
-            ByteString aValue (
-                aField.Copy (nPos + 1, aField.Len() - nPos + 1));
+            rtl::OString aName(
+                aField.copy(0, nPos));
+            rtl::OString aValue(
+                aField.copy(nPos + 1, aField.getLength() - nPos + 1));
             aValue = comphelper::string::stripStart(aValue, ' ');
 
             pTargetMsg->SetHeaderField (
@@ -1614,11 +1614,11 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
                     // Determine boundary.
                     rtl::OString aType(rtl::OUStringToOString(
                         pMsg->GetContentType(), RTL_TEXTENCODING_ASCII_US));
-                    ByteString aLowerType(aType);
-                    aLowerType.ToLowerAscii();
+                    rtl::OString aLowerType(aType.toAsciiLowerCase());
 
-                    sal_uInt16 nPos = aLowerType.Search ("boundary=");
-                    ByteString aBoundary(aType.copy(nPos + 9));
+                    sal_Int32 nPos = comphelper::string::indexOfL(aLowerType,
+                        RTL_CONSTASCII_STRINGPARAM("boundary="));
+                    rtl::OString aBoundary(aType.copy(nPos + 9));
 
                     aBoundary = comphelper::string::strip(aBoundary, ' ');
                     aBoundary = comphelper::string::strip(aBoundary, '"');