summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-17 13:18:36 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-17 14:27:26 +0000
commit4c612cd089580c3a50d3a383d3fd12fb68e7acfb (patch)
treea2e137595a0deb7e39cf9965b6a2c5b9e7c52443 /starmath
parent4923624069d932b33f13017b4e288ad44eef8dbf (diff)
RID_CMDBOXWINDOW is so hacky and src entry so small just hardcode in cxx
Change-Id: I63e97e91792fcf2bf8758a1444bb29e3c1ccd541
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/smres.src19
-rw-r--r--starmath/source/view.cxx13
2 files changed, 6 insertions, 26 deletions
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 114d81be6d08..6d5b3eae0241 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -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
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c5448d0e042e..9a66da7c9e29 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -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)
{