[Libreoffice-commits] core.git: 2 commits - include/svtools sfx2/source

[Michael Stahl]

 include/svtools/brwbox.hxx    |    2 +-
 sfx2/source/doc/graphhelp.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7191ff96bcd0fd265bd6af30d6422c694f66e1d7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 4 20:50:09 2013 +0200

    warning C4305 truncation from String* to bool
    
    Change-Id: Ie623a8c5def6357461db83f5df80cb45cc5a6389

diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 8f3a5b5..1f8a7f1 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -108,7 +108,7 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta )
 #ifdef WNT
     if ( pGDIMeta )
     {
-        String aStr = OUString(".emf");
+        OUString const aStr(".emf");
         ::utl::TempFile aTempFile( OUString(),
                                    &aStr,
                                    NULL,
commit 801ebbcabf744e402d15bc34f9f484455b57f061
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 4 20:32:40 2013 +0200

    warning C4805 unsafe mixture of type int and type bool
    
    Change-Id: Iaae721fed7e5acde5ff91620639ac7ef61c324ee

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 128c57c..3005b21 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -262,7 +262,7 @@ private:
     sal_uInt16          nResizeCol;     // resize this column in MouseMove
     sal_Bool            bResizing;      // mouse captured for column resizing
 
-    sal_Bool            bSelect;        // select or deselect
+    bool                bSelect;        /// select or deselect
     sal_Bool            bSelectionIsVisible; // depending on focus
     sal_Bool            bScrolling;     // hidden cursor while scrolling
     sal_Bool            bNotToggleSel;  // set while in ToggleSelection() etc.