diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 21:10:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-06 07:02:42 +0100 |
| commit | 0a8bf4b534775bb64e6baa228dce881c5c0d65a5 (patch) | |
| tree | b6753e237796855f7af63b9730a21eecdb50bc3b /rsc | |
| parent | 5ae49477396c1a0d7dd2d387bf46ac8c02cbeb53 (diff) | |
FloatingWindows are no longer loaded from resource files
Change-Id: I2705bbb4db52779e0065400f09604384fd9cf151
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 34 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 5 |
3 files changed, 0 insertions, 41 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 456c82d92d9c..74e46e425eb7 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -213,8 +213,6 @@ class RscTypCont RscEnum * pTriState ); RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem, RscTop * pClassImageList ); - RscTop * InitClassFloatingWindow( 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 8b79d824f471..62561de065e4 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1480,40 +1480,6 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, return pClassToolBox; } -RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, - RscEnum * pMapUnit ) -{ - Atom nId; - RscTop * pClassFloatingWindow; - - // Klasse anlegen - nId = pHS->getID( "FloatingWindow" ); - pClassFloatingWindow = new RscClass( nId, RSC_FLOATINGWINDOW, pSuper ); - pClassFloatingWindow->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassFloatingWindow ); - - // Variablen anlegen - nId = aNmTb.Put( "_ZoomInMapMode", VARNAME ); - pClassFloatingWindow->SetVariable( nId, pMapUnit, NULL, 0, - RSC_FLOATINGWINDOW_WHMAPMODE ); - nId = aNmTb.Put( "_ZoomInWidth", VARNAME ); - pClassFloatingWindow->SetVariable( nId, &aShort, NULL, 0, - RSC_FLOATINGWINDOW_WIDTH ); - nId = aNmTb.Put( "_ZoomInHeight", VARNAME ); - pClassFloatingWindow->SetVariable( nId, &aShort, NULL, 0, - RSC_FLOATINGWINDOW_HEIGHT ); - nId = aNmTb.Put( "ZoomIn", VARNAME ); - pClassFloatingWindow->SetVariable( nId, &aBool, NULL, 0, - RSC_FLOATINGWINDOW_ZOOMIN ); - - INS_WINBIT(pClassFloatingWindow,Zoomable) - INS_WINBIT(pClassFloatingWindow,HideWhenDeactivate) - INS_WINBIT(pClassFloatingWindow,EnableResizing) - INS_WINBIT(pClassFloatingWindow,StdPopup) - - return pClassFloatingWindow; -} - RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 211490a6805d..08056748264a 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -100,7 +100,6 @@ void RscTypCont::Init() RscTop * pClassDockingWindow; RscTop * pClassToolBoxItem; RscTop * pClassToolBox; - RscTop * pClassFloatingWindow; RscTop * pClassFixedLine; RscTop * pClassSfxStyleFamilyItem; RscTop * pClassSfxTemplateDialog; @@ -511,10 +510,6 @@ void RscTypCont::Init() pClassImageList ); pRoot->Insert( pClassToolBox ); - pClassFloatingWindow = InitClassFloatingWindow( pClassSystemWindow, - pMapUnit ); - pRoot->Insert( pClassFloatingWindow ); - // Klasse anlegen nId = pHS->getID( "FixedLine" ); pClassFixedLine = |