summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-05 21:10:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-06 07:02:42 +0100
commit0a8bf4b534775bb64e6baa228dce881c5c0d65a5 (patch)
treeb6753e237796855f7af63b9730a21eecdb50bc3b
parent5ae49477396c1a0d7dd2d387bf46ac8c02cbeb53 (diff)
FloatingWindows are no longer loaded from resource files
Change-Id: I2705bbb4db52779e0065400f09604384fd9cf151
-rwxr-xr-xbin/count-todo-dialogs4
-rw-r--r--include/sfx2/basedlgs.hxx4
-rw-r--r--include/sfx2/tbxctrl.hxx4
-rw-r--r--include/tools/rc.h6
-rw-r--r--include/tools/rcid.h2
-rw-r--r--include/vcl/floatwin.hxx2
-rw-r--r--rsc/inc/rscdb.hxx2
-rw-r--r--rsc/source/parser/rscicpx.cxx34
-rw-r--r--rsc/source/parser/rscinit.cxx5
-rw-r--r--sfx2/source/dialog/basedlgs.cxx20
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx17
-rw-r--r--starmath/inc/helpids.h1
-rw-r--r--tools/source/rc/resmgr.cxx2
-rw-r--r--vcl/source/window/floatwin.cxx42
14 files changed, 2 insertions, 143 deletions
diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index 4c1678b646ee..09f85c90dbd4 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -20,7 +20,7 @@ infoboxes=0
queryboxes=0
warningboxes=0
msgboxes=0
-floatingwindows=`git grep -h FloatingWindow -- *.src|grep -v HelpID|cut -d' ' -f2- |sort|uniq|wc -l`
+floatingwindows=0
dockingwindows=`git grep -h DockingWindow -- *.src|grep -v HelpID|grep -v hrc|cut -d' ' -f2- |sort|uniq|wc -l`
echo There are $dialogs unconverted dialogs
@@ -33,7 +33,7 @@ echo There are $msgboxes unconverted msgboxes
echo There are $floatingwindows unconverted floatingwindows
echo There are $dockingwindows unconverted dockingwindows
-num=$(($floatingwindows + dockingwindows))
+num=$dockingwindows
echo An estimated additional $num .ui are required
percent=$(($converted * 100 / ($num + $converted)))
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index cef733fda939..6c4c1f49d99b 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -137,10 +137,6 @@ protected:
SfxFloatingWindow( SfxBindings *pBindings,
SfxChildWindow *pCW,
Window* pParent,
- const ResId& rResId);
- SfxFloatingWindow( SfxBindings *pBindings,
- SfxChildWindow *pCW,
- Window* pParent,
const OString& rID, const OUString& rUIXMLDescription,
const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
virtual ~SfxFloatingWindow();
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 7b6821225867..27bcb9e31171 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -150,10 +150,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
Window* pParentWindow,
WinBits nBits );
- SfxPopupWindow( sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- Window* pParentWindow,
- const ResId &rId );
virtual ~SfxPopupWindow();
virtual SfxPopupWindow* Clone() const;
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 3c77bdc5aa39..d76e5e86960c 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -150,12 +150,6 @@ typedef short RSWND_STYLE;
#define RSC_TOOLBOX_ITEMIMAGELIST 0x40
#define RSC_TOOLBOX_ITEMLIST 0x80
-// For "FloatingWindow" resources:
-#define RSC_FLOATINGWINDOW_WHMAPMODE 0x01
-#define RSC_FLOATINGWINDOW_WIDTH 0x02
-#define RSC_FLOATINGWINDOW_HEIGHT 0x04
-#define RSC_FLOATINGWINDOW_ZOOMIN 0x08
-
// For "DockingWindow" resources:
#define RSC_DOCKINGWINDOW_XYMAPMODE 0x01
#define RSC_DOCKINGWINDOW_X 0x02
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index f9ad6ede08d4..16ab69b92c09 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -51,8 +51,6 @@
#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36)
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
-#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
-
#define RSC_CONTROL (RSC_NOTYPE + 0x44)
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46)
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 2d4981ef1fad..580c6c16229a 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -103,7 +103,6 @@ protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings();
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, HitTest& rHitTest );
@@ -123,7 +122,6 @@ public:
explicit FloatingWindow(Window* pParent, WinBits nStyle = WB_STDFLOATWIN);
explicit FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
- explicit FloatingWindow( Window* pParent, const ResId& );
virtual ~FloatingWindow();
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
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 =
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index a15dd9913c23..59ea7c2ceab6 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -460,26 +460,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl));
}
-
-
-SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
- SfxChildWindow *pCW,
- Window* pParent,
- const ResId& rResId) :
- FloatingWindow(pParent, rResId),
- pBindings(pBindinx),
- pImp( new SfxFloatingWindow_Impl )
-{
- pImp->pMgr = pCW;
- pImp->bConstructed = false;
- SetUniqueId( GetHelpId() );
- SetHelpId("");
- if ( pBindinx )
- pImp->StartListening( *pBindinx );
- pImp->aMoveTimer.SetTimeout(50);
- pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl));
-}
-
SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
SfxChildWindow *pCW,
Window* pParent,
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 6aa1c9c60b06..71af4187dafe 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1174,23 +1174,6 @@ SfxPopupWindow::SfxPopupWindow(
SfxPopupWindow::SfxPopupWindow(
sal_uInt16 nId,
- const Reference< XFrame >& rFrame,
- Window* pParentWindow,
- const ResId &rId ) :
- FloatingWindow( pParentWindow, rId )
- , m_bFloating( false )
- , m_bCascading( false )
- , m_nId( nId )
- , m_xFrame( rFrame )
- , m_pStatusListener( 0 )
-{
- Window* pWindow = GetTopMostParentSystemWindow( this );
- if ( pWindow )
- ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
-}
-
-SfxPopupWindow::SfxPopupWindow(
- sal_uInt16 nId,
Window* pParentWindow,
const OString& rID, const OUString& rUIXMLDescription,
const Reference< XFrame >& rFrame ) :
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 977b44e2d375..caa30296a3cb 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -134,7 +134,6 @@
#define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX"
#define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX"
#define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX"
-#define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX"
#define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN"
#define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU"
#define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU"
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 73194cfc7d01..b3cd18ebb0af 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1460,7 +1460,6 @@ OString ResMgr::GetAutoHelpId()
switch( pRC->pResource->GetRT() ) {
case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break;
case RSC_WORKWIN: aHID.append( "WorkWindow" ); break;
- case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break;
default: return OString();
}
}
@@ -1471,7 +1470,6 @@ OString ResMgr::GetAutoHelpId()
switch( pRC1->pResource->GetRT() ) {
case RSC_DOCKINGWINDOW:
case RSC_WORKWIN:
- case RSC_FLOATINGWINDOW:
// intentionally no breaks!
// auto help ids for controls
switch( pRC->pResource->GetRT() ) {
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 05b806f7d120..718683fc883d 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -152,18 +152,6 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) :
- SystemWindow( WINDOW_FLOATINGWINDOW )
-{
- rResId.SetRT( RSC_FLOATINGWINDOW );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame)
: SystemWindow(WINDOW_FLOATINGWINDOW)
{
@@ -179,36 +167,6 @@ void FloatingWindow::doDeferredInit(WinBits nBits)
mbIsDefferedInit = false;
}
-void FloatingWindow::ImplLoadRes( const ResId& rResId )
-{
- SystemWindow::ImplLoadRes( rResId );
-
- sal_uLong nObjMask = ReadLongRes();
-
- if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH |
- RSC_FLOATINGWINDOW_HEIGHT) & nObjMask )
- {
- // use Sizes from the Resource
- Size aSize;
- MapUnit eSizeMap = MAP_PIXEL;
-
- if ( RSC_FLOATINGWINDOW_WHMAPMODE & nObjMask )
- eSizeMap = (MapUnit) ReadShortRes();
- if ( RSC_FLOATINGWINDOW_WIDTH & nObjMask )
- aSize.Width() = ReadShortRes();
- if ( RSC_FLOATINGWINDOW_HEIGHT & nObjMask )
- aSize.Height() = ReadShortRes();
-
- SetRollUpOutputSizePixel( LogicToPixel( aSize, eSizeMap ) );
- }
-
- if (nObjMask & RSC_FLOATINGWINDOW_ZOOMIN )
- {
- if ( ReadShortRes() )
- RollUp();
- }
-}
-
FloatingWindow::~FloatingWindow()
{
if( mbPopupModeCanceled )