[Libreoffice-commits] .: 3 commits - sc/source

[Thomas Arnhold]

 sc/source/filter/html/htmlexp.cxx   |    2 -
 sc/source/filter/starcalc/scflt.cxx |   49 ------------------------------------
 sc/source/ui/unoobj/datauno.cxx     |    2 -
 sc/source/ui/vba/vbaapplication.cxx |    6 ++--
 4 files changed, 4 insertions(+), 55 deletions(-)

New commits:
commit 24a1e2ab1fdd8824449708b90d23f78181c76ba2
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jan 28 15:17:24 2011 +0100

    Replace empty equalsAscii() with getLength().

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index b5d7d4b..3f76d3a 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -361,7 +361,7 @@ void ScHTMLExport::WriteHeader()
         OUT_LF();
 
         //----------------------------------------------------------
-        if (!xDocProps->getPrintedBy().equalsAscii(""))
+        if (xDocProps->getPrintedBy().getLength())
         {
             OUT_COMMENT( GLOBSTR( STR_DOC_INFO ) );
             String aStrOut( GLOBSTR( STR_DOC_PRINTED ) );
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index e0a6e90..65b7e11 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1629,10 +1629,10 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
                         sal_Int32 nSemicolonID = 0;
                         ::rtl::OUString sFirstFilter = sSelectedFilters.getToken( 0, ';' , nSemicolonID );
                         ::rtl::OUString sFileExtension = aURLObj.GetExtension();
-                        if ( sFileExtension.equalsAscii("") )
+                        if ( sFileExtension.getLength() == 0 )
                         {
                             sFileExtension = sFirstFilter.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*.*")) ? sFileExtension : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
-                            aPathStr = sFileExtension.equalsAscii("") ? aPathStr : aPathStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
+                            aPathStr = sFileExtension.getLength() == 0 ? aPathStr : aPathStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
                         }
                         else
                         {
@@ -1661,7 +1661,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
                             {
                                 sFileExtension = sFirstFilter.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*.*")) ? rtl::OUString()
                                                                                  : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
-                                aPathStr = sFileExtension.equalsAscii("") ? aPathStr
+                                aPathStr = sFileExtension.getLength() == 0 ? aPathStr
                                                                           : aPathStr + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
                             }
                         }
commit cb36f9dfc7c1f17c275987271dc5376281ab8d0e
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Jan 25 23:50:19 2011 +0100

    Remove SC_CONVUNO_HXX. This should be done by convuno.hxx.

diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 7bbe90a..5e8c6ca 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -58,10 +58,8 @@
 #include "dbdocfun.hxx"
 #include "unonames.hxx"
 #include "globstr.hrc"
-#ifndef SC_CONVUNO_HXX
 #include "convuno.hxx"
 #include "hints.hxx"
-#endif
 #include "attrib.hxx"
 #include "dpshttab.hxx"
 #include <comphelper/extract.hxx>
commit 6358ebdd4ea3ff51d3449f8977889a04dfbc5eca
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Jan 25 23:49:52 2011 +0100

    Remove SC10_SHOW_OBJECTS.

diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 8d65644..f5f6fc0 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -2354,25 +2354,6 @@ void Sc10Import::LoadObjects()
   if (rStream.IsEof()) return;
   if (ID == ObjectID)
   {
-#ifdef SC10_SHOW_OBJECTS
-    // Achtung nur zu Debugzwecken
-    //-----------------------------------
-    pDoc->InsertTab(SC_TAB_APPEND, "GraphObjects");
-    SCCOL nCol = 0;
-    SCROW nRow = 0;
-    SCTAB nTab = 0;
-    pDoc->GetTable("GraphObjects", nTab);
-    pDoc->SetString(nCol++, nRow, nTab, "ObjectTyp");
-    pDoc->SetString(nCol++, nRow, nTab, "Col");
-    pDoc->SetString(nCol++, nRow, nTab, "Row");
-    pDoc->SetString(nCol++, nRow, nTab, "Tab");
-    pDoc->SetString(nCol++, nRow, nTab, "X");
-    pDoc->SetString(nCol++, nRow, nTab, "Y");
-    pDoc->SetString(nCol++, nRow, nTab, "W");
-    pDoc->SetString(nCol++, nRow, nTab, "H");
-    //-----------------------------------
-#endif
-
     USHORT nAnz;
     rStream >> nAnz;
     sal_Char Reserved[32];
@@ -2405,36 +2386,6 @@ void Sc10Import::LoadObjects()
         nStartY += (long) ( GraphHeader.y / nPPTY * HMM_PER_TWIPS );
         long nSizeY = (long) ( GraphHeader.h / nPPTY * HMM_PER_TWIPS );
 
-#ifdef SC10_SHOW_OBJECTS
-         // Achtung nur zu Debugzwecken
-         //-----------------------------------
-         nCol = 0;
-         nRow++;
-         switch (ObjectType)
-         {
-          case otOle :
-           pDoc->SetString(nCol++, nRow, nTab, "Ole-Object");
-           break;
-          case otImage :
-           pDoc->SetString(nCol++, nRow, nTab, "Image-Object");
-           break;
-          case otChart :
-           pDoc->SetString(nCol++, nRow, nTab, "Chart-Object");
-           break;
-          default :
-           pDoc->SetString(nCol++, nRow, nTab, "ERROR");
-           break;
-         }
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.CarretX);
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.CarretY);
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.CarretZ);
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.x);
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.y);
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.w);
-         pDoc->SetValue(nCol++, nRow, nTab, GraphHeader.h);
-         //-----------------------------------
-#endif
-
         switch (ObjectType)
         {
           case otOle :