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

RID_CMDBOXWINDOW is so hacky and src entry so small just hardcode in cxx

Browse Source 
Change-Id: I63e97e91792fcf2bf8758a1444bb29e3c1ccd541
This commit is contained in:
Caolán McNamara 2014-12-17 13:18:36 +00:00
parent 4923624069
commit 4c612cd089
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
starmath/source/smres.src
View File

@ -104,23 +104,6 @@ Menu RID_VIEWMENU
};
};
#define CMDBOXWINDOW_TEXT \
Text [ en-US ] = "Commands" ; \
DockingWindow RID_CMDBOXWINDOW\
{
HelpId = HID_SMA_COMMAND_WIN ;
Moveable = TRUE ;
Closeable = FALSE ;
Sizeable = TRUE ;
OutputSize = TRUE ;
HideWhenDeactivate = FALSE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 292 , 94 ) ;
Dockable = TRUE ;
CMDBOXWINDOW_TEXT
};
String STR_BLACK
{
Text [ en-US ] = "black" ;
@ -218,7 +201,7 @@ String STR_ALIGN_RIGHT
String STR_CMDBOXWINDOW
{
CMDBOXWINDOW_TEXT
Text [ en-US ] = "Commands" ;
};
String RID_DOCUMENTSTR

13
starmath/source/view.cxx
View File

@ -702,30 +702,30 @@ void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
SfxControllerItem::StateChanged (nSID, eState, pState);
}
/**************************************************************************/
SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWindow,
vcl::Window *pParent) :
SfxDockingWindow(pBindings_, pChildWindow, pParent, SmResId(RID_CMDBOXWINDOW)),
SfxDockingWindow(pBindings_, pChildWindow, pParent, WB_MOVEABLE|WB_CLOSEABLE|WB_SIZEABLE|WB_DOCKABLE),
aEdit (*this),
aController (aEdit, SID_TEXT, *pBindings_),
bExiting (false)
{
SetHelpId( HID_SMA_COMMAND_WIN );
SetSizePixel(LogicToPixel(Size(292 , 94), MapMode(MAP_APPFONT)));
SetText(SM_RESSTR(STR_CMDBOXWINDOW));
Hide ();
aInitialFocusTimer.SetTimeoutHdl(LINK(this, SmCmdBoxWindow, InitialFocusTimerHdl));
aInitialFocusTimer.SetTimeout(100);
}
SmCmdBoxWindow::~SmCmdBoxWindow ()
{
aInitialFocusTimer.Stop();
bExiting = true;
}
SmViewShell * SmCmdBoxWindow::GetView()
{
SfxDispatcher *pDispatcher = GetBindings().GetDispatcher();
@ -749,7 +749,6 @@ void SmCmdBoxWindow::Resize()
Invalidate();
}
void SmCmdBoxWindow::Paint(const Rectangle& /*rRect*/)
{
Rectangle aRect = Rectangle(Point(0, 0), GetOutputSizePixel());
@ -762,7 +761,6 @@ void SmCmdBoxWindow::Paint(const Rectangle& /*rRect*/)
aView.DrawFrame( aRect, FRAME_DRAW_IN );
}
Size SmCmdBoxWindow::CalcDockingSize(SfxChildAlignment eAlign)
{
switch (eAlign)
@ -776,7 +774,6 @@ Size SmCmdBoxWindow::CalcDockingSize(SfxChildAlignment eAlign)
return SfxDockingWindow::CalcDockingSize(eAlign);
}
SfxChildAlignment SmCmdBoxWindow::CheckAlignment(SfxChildAlignment eActual,
SfxChildAlignment eWish)
{