include/tools/rc.h | 8 --------
include/tools/rcid.h | 3 ---
rsc/inc/rscdb.hxx | 1 -
rsc/source/parser/rscicpx.cxx | 20 --------------------
rsc/source/parser/rscinit.cxx | 4 ----
tools/source/rc/resmgr.cxx | 1 -
6 files changed, 37 deletions(-)
New commits:
commit e09e956a0c8eaa00e73474bccacee7aa656f2f67
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 16 18:28:53 2014 +0100
RSC_TABCONTROLITEM* no longer used
Change-Id: Ic496662d623c4732db41476109b3731cf1fd71a0
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 47d8fee..3c77bdc 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -162,11 +162,6 @@ typedef short RSWND_STYLE;
#define RSC_DOCKINGWINDOW_Y 0x04
#define RSC_DOCKINGWINDOW_FLOATING 0x08
-// For "TabControlItem" resources:
-#define RSC_TABCONTROLITEM_ID 0x0001
-#define RSC_TABCONTROLITEM_TEXT 0x0002
-#define RSC_TABCONTROLITEM_PAGERESID 0x0008
-
// For "ImageButtons":
#define RSC_IMAGEBUTTON_IMAGE 0x01
#define RSC_IMAGEBUTTON_SYMBOL 0x02
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 8d6ef0e..74fdef6 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -100,8 +100,6 @@
#define RSC_TABPAGE (RSC_NOTYPE + 0x74)
-#define RSC_TABCONTROLITEM (RSC_NOTYPE + 0x77)
-
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
commit 07048650e2459ad3d77fbeed9df2d63b9c849a7b
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 16 18:26:14 2014 +0100
RSCMENUBUTTON_MENU is not longer used
Change-Id: I2e12d923a07385fc6a036863070a10666542d39d
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 29dd4f3..47d8fee 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -53,9 +53,6 @@ typedef short RSWND_STYLE;
// For "FixedImage" resource:
#define RSC_FIXEDIMAGE_IMAGE 0x0001
-// For "MenuButton" resources:
-#define RSCMENUBUTTON_MENU 0x01
-
// For all menu resources:
#define RSC_MENU_ITEMS 0x01
#define RSC_MENU_TEXT 0x02
commit 924dda90a99f94799a053c6d127722ccd4540b5f
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 16 18:24:38 2014 +0100
RSC_MENUBUTTON is not in use anymore
Change-Id: I853b6b1cfcd4847603d9920a47298d1b9105b46f
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 032b815..8d6ef0e 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -67,7 +67,6 @@
#define RSC_CANCELBUTTON (RSC_NOTYPE + 0x48)
#define RSC_HELPBUTTON (RSC_NOTYPE + 0x49)
#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a)
-#define RSC_MENUBUTTON (RSC_NOTYPE + 0x4b)
#define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d)
#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e)
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index c5f84b7..c688190 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -177,7 +177,6 @@ class RscTypCont
RscTop * InitClassCheckBox( RscTop * pSuper );
RscTop * InitClassPushButton( RscTop * pSuper );
RscTop * InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState );
- RscTop * InitClassMenuButton( RscTop * pSuper, RscTop * pClasMenu );
RscTop * InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
RscEnum * pTriState );
RscTop * InitClassEdit( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e920df4..0760f32 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -452,26 +452,6 @@ RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper,
return pClassTriStateBox;
}
-RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper,
- RscTop * pClassMenu )
-{
- Atom nId;
- RscTop * pClassMenuButton;
-
- nId = pHS->getID( "MenuButton" );
- pClassMenuButton = new RscClass( nId, RSC_MENUBUTTON, pSuper );
- pClassMenuButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassMenuButton );
-
- // Variablen anlegen
- nId = aNmTb.Put( "ButtonMenu", VARNAME );
- pClassMenuButton->SetVariable( nId, pClassMenu, NULL, 0,
-
RSCMENUBUTTON_MENU );
-
- return pClassMenuButton;
-}
-
-
RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
RscTop * pClassImage,
RscEnum * pTriState )
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 1da37a6..7068140 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -95,7 +95,6 @@ void RscTypCont::Init()
RscTop * pClassAccel;
RscTop * pClassMenuItem;
RscTop * pClassMenu;
- RscTop * pClassMenuButton;
RscTop * pClassMessBox;
RscTop * pClassInfoBox;
RscTop * pClassWarningBox;
@@ -478,9 +477,6 @@ void RscTypCont::Init()
pClassMenuItem->SetVariable( nId, pClassMenu, NULL, VAR_SVDYNAMIC,
RSC_MENUITEM_MENU );
- pClassMenuButton = InitClassMenuButton( pClassControl, pClassMenu );
- pRoot->Insert( pClassMenuButton );
-
pClassMessBox = InitClassMessBox( pClassMgr, pMessButtons,
pMessDefButton );
pRoot->Insert( pClassMessBox );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 59bd7dc..d3f02e8 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1493,7 +1493,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_DATEFIELD: aHID.append( "DateField" );
break;
case RSC_TIMEFIELD: aHID.append( "TimeField" );
break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" );
break;
- case RSC_MENUBUTTON: aHID.append( "MenuButton" );
break;
default:
// no type, no auto HID
return OString();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
