summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-04-22 10:27:38 +0200
committerobo <obo@openoffice.org>2010-04-22 10:27:38 +0200
commitd7e61179bc19df3b0d19b8a803bdee1efd7dcb08 (patch)
tree2e09e0beb17a36bf10596a0384ecae9088d2697a /framework/source
parentedaa6f16f0d0802244fd006107719599243dc6cb (diff)
parent9923a1479d8b14bf9d369ae209f56831fe4b7d69 (diff)
CWS-TOOLING: integrate CWS fwk140ooo/OOO320_m16
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/services/backingwindow.cxx6
-rw-r--r--framework/source/services/backingwindow.hxx1
2 files changed, 6 insertions, 1 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index d178426ecd..4a0d508dbe 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -132,7 +132,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
mbInitControls( false ),
mnLayoutStyle( 0 ),
mpAccExec( NULL ),
- mnBtnPos( 120 )
+ mnBtnPos( 120 ),
+ mnBtnTop( 150 )
{
mnColumnWidth[0] = mnColumnWidth[1] = 0;
mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
@@ -722,6 +723,9 @@ void BackingWindow::Resize()
nYPos += nPDelta - nDiff;
nYPos += nWDelta/2 - nDiff;
+
+ if( mnLayoutStyle != 1 )
+ nYPos = maControlRect.Top() + mnBtnTop;
maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 2c5e75d027..b8fd46073c 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -122,6 +122,7 @@ namespace framework
svt::AcceleratorExecute* mpAccExec;
long mnBtnPos;
+ long mnBtnTop;
static const int nItemId_Extensions = 1;
static const int nItemId_Reg = 2;