curvirgoです。
Yoshiyuki Masutomi wrote:
> (一部定数表記が判らない部分があるので直接数値で比較していて、その部分は
> 気に入っていません)
この部分を修正しました。
--- SRC680_m138/sfx2/source/appl/newhelp.cxx.orig 2005-09-08 02:44:49.000000000 +0900
+++ SRC680_m138/sfx2/source/appl/newhelp.cxx 2005-11-12 22:12:24.000000000 +0900
@@ -2694,6 +2694,28 @@
bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) );
aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
aMenu.InsertSeparator();
+ aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
+ Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
+ aMenu.SetHelpId( TBI_COPY, SID_COPY );
+ aMenu.EnableItem( TBI_COPY, HasSelection() );
+ aMenu.InsertSeparator();
+ aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) );
+ aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE );
+ Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
+ URL aURL;
+ aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode");
+ PARSE_URL( aURL );
+ Reference < XDispatch > xDisp = xProv.is() ? xProv->queryDispatch( aURL, rtl::OUString(), 0 ) : Reference < XDispatch >();
+ if(xDisp.is())
+ {
+ HelpStatusListener_Impl* pStateListener;
+ Reference<XStatusListener>xStateListener = pStateListener = new HelpStatusListener_Impl(xDisp, aURL );
+ FeatureStateEvent rEvent = pStateListener->GetStateEvent();
+ sal_Bool bCheck = sal_False;
+ rEvent.State >>= bCheck;
+ aMenu.CheckItem(TBI_SELECTIONMODE, bCheck);
+ }
+ aMenu.InsertSeparator();
aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ),
Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
@@ -2715,30 +2737,6 @@
aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ),
Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
- aMenu.InsertSeparator();
- aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) );
- aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE );
- Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
- URL aURL;
- aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode");
- PARSE_URL( aURL );
- Reference < XDispatch > xDisp = xProv.is() ?
- xProv->queryDispatch( aURL, rtl::OUString(), 0 ) : Reference < XDispatch >();
- if(xDisp.is())
- {
- HelpStatusListener_Impl* pStateListener;
- Reference<XStatusListener>xStateListener = pStateListener =
- new HelpStatusListener_Impl(xDisp, aURL );
- FeatureStateEvent rEvent = pStateListener->GetStateEvent();
- sal_Bool bCheck = sal_False;
- rEvent.State >>= bCheck;
- aMenu.CheckItem(TBI_SELECTIONMODE, bCheck);
- }
- aMenu.InsertSeparator();
- aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
- Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
- aMenu.SetHelpId( TBI_COPY, SID_COPY );
- aMenu.EnableItem( TBI_COPY, HasSelection() );
if ( bIsDebug )
{
--- SRC680_m138/sfx2/source/menu/mnumgr.cxx.orig 2005-09-08 04:18:55.000000000 +0900
+++ SRC680_m138/sfx2/source/menu/mnumgr.cxx 2005-11-12 16:47:22.000000000 +0900
@@ -444,12 +444,13 @@
{
PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
nCount = aPop.GetItemCount();
- pSVMenu->InsertSeparator();
for ( n=0; n<nCount; n++ )
{
USHORT nId = aPop.GetItemId( n );
- pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
+ pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ), n + 1 );
}
+ if ( pSVMenu->GetItemType( n + 1 ) != MENUITEM_SEPARATOR ) pSVMenu->InsertSeparator( n + 1 );
+ pSVMenu->InsertSeparator( 1 );
}
}
@@ -1516,13 +1517,14 @@
{
PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
nCount = aPop.GetItemCount();
- pSVMenu->InsertSeparator();
for ( n=0; n<nCount; n++ )
{
USHORT nId = aPop.GetItemId( n );
- pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
+ pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ), n + 1 );
pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
}
+ if ( pSVMenu->GetItemType( n + 1 ) != MENUITEM_SEPARATOR ) pSVMenu->InsertSeparator( n + 1 );
+ pSVMenu->InsertSeparator( 1 );
}
InsertVerbs_Impl( &pFrame->GetBindings(), pFrame->GetViewShell()->GetVerbs(), pSVMenu );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
