[Libreoffice-commits] .: cui/source svtools/inc svtools/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/about.cxx     |    1 +
 cui/source/dialogs/insdlg.cxx    |    1 -
 svtools/inc/svtools/svmedit2.hxx |    1 -
 svtools/source/edit/svmedit2.cxx |    5 -----
 vcl/inc/vcl/vclmedit.hxx         |    1 +
 vcl/source/edit/vclmedit.cxx     |    5 +++++
 vcl/source/window/msgbox.cxx     |    1 +
 7 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 9dbb62555f0813cc55e48be28047f22e2b3ea4ef
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Oct 22 17:25:12 2012 +0400

    disable cursor in about dialog and message boxes
    
    Change-Id: I060872e0a468f2ce26a2ab519c5bfe271574170b

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 23b9bd5..9dc8384 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -166,6 +166,7 @@ void AboutDialog::StyleControls()
     // Version Text
     aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 1.2 ) );
     aVersionText.SetControlFont( aLargeFont );
+    aVersionText.EnableCursor( sal_False );
 
     // Copyright Text
     aCopyrightText.SetTextSelectable( sal_False );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 069d26c..9c42a48 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -46,7 +46,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vclmedit.hxx>
 #include <sot/clsids.hxx>
 #include <sfx2/frmdescr.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx
index 74645a2..68b7541 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/svtools/inc/svtools/svmedit2.hxx
@@ -34,7 +34,6 @@ public:
                     // methods of TextView
     void            InsertText( const String& rNew, sal_Bool bSelect = sal_False );
     void            SetAutoScroll( sal_Bool bAutoScroll );
-    void            EnableCursor( sal_Bool bEnable );
 
                     // methods of TextEngine
     void            SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 8d530b2..911c47f 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -49,11 +49,6 @@ void ExtMultiLineEdit::SetAutoScroll( sal_Bool bAutoScroll )
     GetTextView()->SetAutoScroll( bAutoScroll );
 }
 
-void ExtMultiLineEdit::EnableCursor( sal_Bool bEnable )
-{
-    GetTextView()->EnableCursor( bEnable );
-}
-
 void ExtMultiLineEdit::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     GetTextEngine()->SetAttrib( rAttr, nPara, nStart, nEnd );
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 7ecb944..0264b4a 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -137,6 +137,7 @@ public:
     void            DisableSelectionOnFocus();
 
     void            SetTextSelectable( sal_Bool bTextSelectable );
+    void            EnableCursor( sal_Bool bEnable );
 };
 
 inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index fce3a0d..bee4278 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1569,4 +1569,9 @@ void VclMultiLineEdit::SetTextSelectable( sal_Bool bTextSelectable )
     pImpVclMEdit->GetTextWindow()->SetTextSelectable( bTextSelectable );
 }
 
+void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
+{
+    GetTextView()->EnableCursor( bEnable );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 41c1505..353eab8 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -403,6 +403,7 @@ void MessBox::ImplPosControls()
     mpVCLMultiLineEdit->SetPosSizePixel( aTextPos, aMEditSize );
     mpVCLMultiLineEdit->Show();
     mpVCLMultiLineEdit->SetPaintTransparent(sal_True);
+    mpVCLMultiLineEdit->EnableCursor(sal_False);
     SetPageSizePixel( aPageSize );
 }