[Libreoffice-commits] .: vcl/aqua vcl/source

Ivan Timofeev ivantimofeev at kemper.freedesktop.org
Mon Feb 27 05:14:05 PST 2012


 vcl/aqua/source/dtrans/HtmlFmtFlt.cxx   |    4 ++--
 vcl/aqua/source/dtrans/PictToBmpFlt.cxx |    4 ++--
 vcl/source/gdi/print3.cxx               |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c581d33dec47a4c411a034482876543f6357d1e8
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Feb 27 17:12:33 2012 +0400

    there is no Sequence::isEmpty()

diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 275f5a1..0bd461d 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -65,9 +65,9 @@ const std::string TAG_END_BODY = std::string("</BODY");
 
 Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml)
 {
-    OSL_ASSERT(!aTextHtml.isEmpty());
+    OSL_ASSERT(aTextHtml.getLength() > 0);
 
-    if (aTextHtml.isEmpty())
+    if (!(aTextHtml.getLength() > 0))
         return Sequence<sal_Int8>();
 
     // fill the buffer with dummy values to calc the exact length
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 4b3d371..3eb4fb8 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -161,7 +161,7 @@ bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
             {
                 aBmp.realloc( [pOut length] );
                 [pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
-                bResult = (!aBmp.isEmpty());
+                bResult = (aBmp.getLength() != 0);
             }
         }
     }
@@ -190,7 +190,7 @@ bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
             {
                 aPict.realloc( [pOut length] );
                 [pOut getBytes: aPict.getArray() length: aPict.getLength()];
-                bResult = (!aPict.isEmpty());
+                bResult = (aPict.getLength() != 0);
             }
         }
     }
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index abdece6..482491d 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1336,7 +1336,7 @@ void PrinterController::setValue( const beans::PropertyValue& i_rValue )
 
 void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_rOptions )
 {
-    DBG_ASSERT( mpImplData->maUIOptions.isEmpty(), "setUIOptions called twice !" );
+    DBG_ASSERT( mpImplData->maUIOptions.getLength() == 0, "setUIOptions called twice !" );
 
     mpImplData->maUIOptions = i_rOptions;
 


More information about the Libreoffice-commits mailing list