[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - basctl/sdi basctl/source vcl/source

[Tsutomu Uchino]

 basctl/sdi/baside.sdi               |    6 ++++++
 basctl/source/basicide/baside2.cxx  |   14 ++++++++++++++
 basctl/source/basicide/baside2b.cxx |    4 +---
 basctl/source/basicide/baside3.cxx  |    6 ++++++
 vcl/source/gdi/dibtools.cxx         |   12 ------------
 5 files changed, 27 insertions(+), 15 deletions(-)

New commits:
commit f841659faf09fec69c962959b9da032fa0bc2b16
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Wed Jan 22 07:41:16 2014 +0000

    #i50481# make Select All command working through the main menu of Basic IDE

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 8165229..7e4012f 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -101,6 +101,12 @@ shell BasicIDEShell
         StateMethod = GetState;
     ]
 
+    SID_SELECTALL
+    [
+        ExecMethod  = ExecuteCurrent;
+        StateMethod = GetState;
+    ]
+
     SID_SEARCH_ITEM
     [
         ExecMethod  = ExecuteCurrent;
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index f370d3c..b417c54 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1132,6 +1132,14 @@ void __EXPORT ModulWindow::ExecuteCommand( SfxRequest& rReq )
             GetBreakPointWindow().Invalidate();
         }
         break;
+        case SID_SELECTALL:
+        {
+            TextSelection aSel( TextPaM( 0, 0 ), TextPaM( TEXT_PARA_ALL, 0xFFFF ) );
+            TextView * pView = GetEditView();
+            pView->SetSelection( aSel );
+            pView->GetWindow()->GrabFocus();
+        }
+        break;
     }
 }
 
@@ -1198,6 +1206,12 @@ void __EXPORT ModulWindow::GetState( SfxItemSet &rSet )
                 }
             }
             break;
+            case SID_SELECTALL:
+            {
+                if ( !GetEditView() )
+                    rSet.DisableItem( nWh );
+            }
+            break;
         }
     }
 }
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index a7f7e97..cb6ef05 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -431,9 +431,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
     sal_Bool bWasModified = pEditEngine->IsModified();
     if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
     {
-        if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A) && rKEvt.GetKeyCode().IsMod1() )
-            pEditView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) );
-        else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
+        if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y ) && rKEvt.GetKeyCode().IsMod1() )
             bDone = sal_True; // CTRL-Y schlucken, damit kein Vorlagenkatalog
         else
         {
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 84ece10..4c5cb19 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -431,6 +431,12 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
                     rSet.DisableItem( nWh );
             }
             break;
+
+            case SID_SELECTALL:
+            {
+                rSet.DisableItem( nWh );
+            }
+            break;
         }
     }
 }
commit 352ca2f6ecf8910afa24c53d7e872f62b2321321
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Wed Jan 22 06:16:21 2014 +0000

    #i106063# avoid additional seek for true color DIB
    
    The position in the stream is already at the end of color palette.

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index bdfce54..2e7d698 100755
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -419,12 +419,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
     // Read data
     if(bNative)
     {
-        // true color DIB's can have a (optimization) palette
-        if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
-        {
-            rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != DIBCOREHEADERSIZE ) ? 4 : 3));
-        }
-
         rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
     }
     else
@@ -460,12 +454,6 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
             const long nHeight(rHeader.nHeight);
             sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
 
-            // true color DIB's can have a (optimization) palette
-            if(rHeader.nColsUsed && 8 < rHeader.nBitCount)
-            {
-                rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != DIBCOREHEADERSIZE ) ? 4 : 3));
-            }
-
             const long nI(bTopDown ? 1 : -1);
             long nY(bTopDown ? 0 : nHeight - 1);
             long nCount(nHeight);