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

[Herbert Dürr]

 basctl/source/basicide/baside2b.cxx |    8 ++++++++
 cui/source/options/optsave.cxx      |    7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 82170a2180449bccb55b5091571dc79ec6fc7b51
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Jul 17 15:09:17 2013 +0000

    #i21548# add context menu to code editor part of Basic IDE
    
    for now only with cut, copy and paste but can be extended
    
    Patch by: Tsutomu Uchino <hanya.runo at gmail.com>

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 0e8569c..a7f7e97 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -383,6 +383,14 @@ void __EXPORT EditorWindow::Command( const CommandEvent& rCEvt )
              ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) )
         {
             HandleScrollCommand( rCEvt, pModulWindow->GetHScrollBar(), &pModulWindow->GetEditVScrollBar() );
+        } else if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) {
+            BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
+            SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+            SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
+            if ( pDispatcher )
+            {
+                pDispatcher->ExecutePopup();
+            }
         }
     }
 }
commit 963530a3b78ace2e21cf73c161996f613256b367
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Jul 17 14:49:57 2013 +0000

    #i122759# prefer the UIName for the list of "Always save as" filter names
    
    the listbox in the Tools->Options->Load/Save->General->AlwaysSaveAs listbox
    did not prefer the localized UIName, so sometimes the internal filter name
    was shown in the user interface even when an UIName was provided.
    
    Patch by: Tsutomu Uchino <hanya.runo at gmail.com>

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 1e6abbc..a67b864 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -664,8 +664,8 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
     {
         if(!pProperties[nProp].Name.compareToAscii("UIName"))
         {
-            pProperties[nProp].Value >>= sRet;
-//!            break;
+            if ( pProperties[nProp].Value >>= sRet )
+                break;
         }
         else if(!pProperties[nProp].Name.compareToAscii("Flags"))
         {
@@ -676,7 +676,8 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
         }
         else if(!pProperties[nProp].Name.compareToAscii("Name"))
         {
-            pProperties[nProp].Value >>= sRet;
+            if ( !sRet.getLength() )
+                pProperties[nProp].Value >>= sRet;
         }
     }
     return sRet;