summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-12 10:28:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-12 11:38:00 +0100
commit540b7d3ae4ee9fa4b46d2af6261e44de6bd4d462 (patch)
tree3d66fc7fee91202ca0ab2adb9a2ebb3245caee99
parent7091666cb9955683eabacaf329c66f10fe29eeb2 (diff)
drop RSC_DOCKINGWINDOW*
Change-Id: Ibcddc2def40e15f4a2f92fec13c1c3fd2f824d68
-rw-r--r--include/tools/rc.h6
-rw-r--r--include/tools/rcid.h2
-rw-r--r--rsc/inc/rscdb.hxx2
-rw-r--r--rsc/source/parser/rscicpx.cxx37
-rw-r--r--rsc/source/parser/rscinit.cxx3
-rw-r--r--tools/source/rc/resmgr.cxx14
6 files changed, 0 insertions, 64 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 00f324e0ef62..775903780f59 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -77,12 +77,6 @@ namespace o3tl {
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":
enum class RscImageButtonFlags {
Image = 0x01,
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index a96d3ccfa96c..4d69c85129d4 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -59,8 +59,6 @@
#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a)
-#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
-
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 2500f2db5004..5536b04b4725 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -191,8 +191,6 @@ class RscTypCont
RscTop * InitClassMenuItem( RscTop * pSuper );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
- RscTop * InitClassDockingWindow( RscTop * pSuper,
- RscEnum * pMapUnit );
RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper,
RscTop * pClassBitmap,
RscTop * pClassImage,
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 1908e0d9698f..e2514b8bc321 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -664,43 +664,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
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 * pClassBitmap,
RscTop * pClassImage,
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 14730fdd00f8..78126c4d948b 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -345,9 +345,6 @@ void RscTypCont::Init()
(sal_uInt32)RscMenuItem::Menu );
}
{
- RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
- pRoot->Insert( pClassDockingWindow );
-
RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr,
pClassBitmap,
pClassImage,
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index bdf71abc6a01..f0b4e556a24e 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1410,7 +1410,6 @@ OString ResMgr::GetAutoHelpId()
{
// auto help ids for top level windows
switch( pRC->pResource->GetRT() ) {
- case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break;
default: return OString();
}
}
@@ -1419,19 +1418,6 @@ OString ResMgr::GetAutoHelpId()
// only controls with the following parents get auto help ids
const ImpRCStack *pRC1 = StackTop(1);
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:
return OString();
}