mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop RSC_DOCKINGWINDOW*

Browse Source 
Change-Id: Ibcddc2def40e15f4a2f92fec13c1c3fd2f824d68
This commit is contained in:
Caolán McNamara
2016-10-12 10:28:17 +01:00
parent 7091666cb9
commit 540b7d3ae4
6 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/tools/rc.h
View File

@@ -77,12 +77,6 @@ namespace o3tl {
template<> struct typed_flags<RscMenuItem> : is_typed_flags<RscMenuItem, 0xd6f> {}; template<> struct typed_flags<RscMenuItem> : is_typed_flags<RscMenuItem, 0xd6f> {};
} }
// For "DockingWindow" resources:
#define RSC_DOCKINGWINDOW_XYMAPMODE 0x01
#define RSC_DOCKINGWINDOW_X 0x02
#define RSC_DOCKINGWINDOW_Y 0x04
#define RSC_DOCKINGWINDOW_FLOATING 0x08
// For "ImageButtons": // For "ImageButtons":
enum class RscImageButtonFlags { enum class RscImageButtonFlags {
Image = 0x01, Image = 0x01,

2
include/tools/rcid.h
View File

@@ -59,8 +59,6 @@
#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) #define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx

2
rsc/inc/rscdb.hxx
View File

@@ -191,8 +191,6 @@ class RscTypCont
RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenuItem( RscTop * pSuper );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper,
RscTop * pClassBitmap, RscTop * pClassBitmap,
RscTop * pClassImage, RscTop * pClassImage,

37
rsc/source/parser/rscicpx.cxx
View File

@@ -664,43 +664,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
return pClassMenu; return pClassMenu;
} }
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit )
{
Atom nId;
RscTop * pClassDockWindow;
// initialize class
nId = pHS->getID( "DockingWindow" );
pClassDockWindow = new RscClass( nId, RSC_DOCKINGWINDOW, pSuper );
pClassDockWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassDockWindow );
// initialize variables
nId = aNmTb.Put( "_FloatingPosMapMode", VARNAME );
pClassDockWindow->SetVariable( nId, pMapUnit, nullptr, 0,
RSC_DOCKINGWINDOW_XYMAPMODE );
nId = aNmTb.Put( "_FloatingPosX", VARNAME );
pClassDockWindow->SetVariable( nId, &aShort, nullptr, 0,
RSC_DOCKINGWINDOW_X );
nId = aNmTb.Put( "_FloatingPosY", VARNAME );
pClassDockWindow->SetVariable( nId, &aShort, nullptr, 0,
RSC_DOCKINGWINDOW_Y );
nId = aNmTb.Put( "FloatingMode", VARNAME );
pClassDockWindow->SetVariable( nId, &aBool, nullptr, 0,
RSC_DOCKINGWINDOW_FLOATING );
INS_WINBIT(pClassDockWindow,Moveable)
INS_WINBIT(pClassDockWindow,Sizeable)
INS_WINBIT(pClassDockWindow,EnableResizing)
INS_WINBIT(pClassDockWindow,Closeable)
INS_WINBIT(pClassDockWindow,HideWhenDeactivate);
INS_WINBIT(pClassDockWindow,Zoomable);
INS_WINBIT(pClassDockWindow,Dockable);
return pClassDockWindow;
}
RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper,
RscTop * pClassBitmap, RscTop * pClassBitmap,
RscTop * pClassImage, RscTop * pClassImage,

3
rsc/source/parser/rscinit.cxx
View File

@@ -345,9 +345,6 @@ void RscTypCont::Init()
(sal_uInt32)RscMenuItem::Menu ); (sal_uInt32)RscMenuItem::Menu );
} }
{ {
RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow );
RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr, RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr,
pClassBitmap, pClassBitmap,
pClassImage, pClassImage,

14
tools/source/rc/resmgr.cxx
View File

@@ -1410,7 +1410,6 @@ OString ResMgr::GetAutoHelpId()
{ {
// auto help ids for top level windows // auto help ids for top level windows
switch( pRC->pResource->GetRT() ) { switch( pRC->pResource->GetRT() ) {
case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break;
default: return OString(); default: return OString();
} }
} }
@@ -1419,19 +1418,6 @@ OString ResMgr::GetAutoHelpId()
// only controls with the following parents get auto help ids // only controls with the following parents get auto help ids
const ImpRCStack *pRC1 = StackTop(1); const ImpRCStack *pRC1 = StackTop(1);
switch( pRC1->pResource->GetRT() ) { switch( pRC1->pResource->GetRT() ) {
case RSC_DOCKINGWINDOW:
// intentionally no breaks!
// auto help ids for controls
switch( pRC->pResource->GetRT() ) {
case RSC_EDIT: aHID.append( "Edit" ); break;
case RSC_LISTBOX: aHID.append( "ListBox" ); break;
case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
default:
// no type, no auto HID
return OString();
}
break;
default: default:
return OString(); return OString();
} }