From 4cda571eda7bd9abe5f95d13a6d0b0cb93ed24b0 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 8 Jul 2010 12:27:24 +0200 Subject: [PATCH] renaissance1: resolved merge conflicts, cleanup. --- desktop/source/app/check_ext_deps.cxx | 0 desktop/source/deployment/gui/dp_gui.hrc | 0 .../source/deployment/gui/dp_gui_dialog.src | 0 .../source/deployment/gui/dp_gui_dialog2.cxx | 0 .../source/deployment/gui/dp_gui_dialog2.hxx | 0 .../gui/dp_gui_extensioncmdqueue.cxx | 0 .../gui/dp_gui_extensioncmdqueue.hxx | 0 .../source/deployment/gui/dp_gui_service.cxx | 0 .../deployment/gui/dp_gui_theextmgr.cxx | 0 .../deployment/gui/dp_gui_theextmgr.hxx | 0 desktop/source/deployment/inc/dp_update.hxx | 0 desktop/source/deployment/misc/dp_update.cxx | 0 desktop/source/migration/migration.cxx | 0 oovbaapi/ooo/vba/XVBAAppService.idl | 0 oovbaapi/ooo/vba/XVBADocService.idl | 0 oovbaapi/ooo/vba/excel/SheetObject.idl | 0 oovbaapi/ooo/vba/excel/SheetObjects.idl | 0 oovbaapi/ooo/vba/excel/XHyperlinks.idl | 0 sfx2/inc/brokenpackageint.hxx | 0 sfx2/inc/sfx2/objsh.hxx | 0 sfx2/inc/sfx2/securitypage.hxx | 0 sfx2/inc/sfx2/sfx.hrc | 0 sfx2/inc/sfx2/titledockwin.hxx | 10 ++++++++ sfx2/sdi/sfx.sdi | 0 sfx2/source/appl/appuno.cxx | 0 sfx2/source/dialog/dinfdlg.cxx | 0 sfx2/source/dialog/dinfdlg.src | 0 sfx2/source/dialog/makefile.mk | 0 sfx2/source/dialog/securitypage.cxx | 0 sfx2/source/dialog/securitypage.hrc | 0 sfx2/source/dialog/securitypage.src | 0 sfx2/source/dialog/titledockwin.cxx | 24 ++++++++----------- sfx2/source/doc/objxtor.cxx | 0 sfx2/source/inc/helpid.hrc | 0 svx/inc/svx/svxids.hrc | 0 uui/source/cookiedg.cxx | 0 uui/source/cookiedg.hxx | 0 uui/source/iahndl-authentication.cxx | 0 uui/source/ids.hrc | 0 uui/source/logindlg.cxx | 0 uui/source/logindlg.hrc | 0 uui/source/logindlg.hxx | 0 uui/source/logindlg.src | 0 uui/source/loginerr.hxx | 0 uui/source/passworddlg.cxx | 0 uui/source/passworddlg.hxx | 0 uui/source/passworddlg.src | 0 uui/source/passworderrs.src | 0 .../source/msforms/vbasystemaxcontrol.cxx | 0 .../source/msforms/vbasystemaxcontrol.hxx | 0 50 files changed, 20 insertions(+), 14 deletions(-) mode change 100644 => 100755 desktop/source/app/check_ext_deps.cxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui.hrc mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_dialog.src mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_dialog2.cxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_dialog2.hxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_service.cxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_theextmgr.cxx mode change 100644 => 100755 desktop/source/deployment/gui/dp_gui_theextmgr.hxx mode change 100644 => 100755 desktop/source/deployment/inc/dp_update.hxx mode change 100644 => 100755 desktop/source/deployment/misc/dp_update.cxx mode change 100644 => 100755 desktop/source/migration/migration.cxx mode change 100644 => 100755 oovbaapi/ooo/vba/XVBAAppService.idl mode change 100644 => 100755 oovbaapi/ooo/vba/XVBADocService.idl mode change 100644 => 100755 oovbaapi/ooo/vba/excel/SheetObject.idl mode change 100644 => 100755 oovbaapi/ooo/vba/excel/SheetObjects.idl mode change 100644 => 100755 oovbaapi/ooo/vba/excel/XHyperlinks.idl mode change 100644 => 100755 sfx2/inc/brokenpackageint.hxx mode change 100644 => 100755 sfx2/inc/sfx2/objsh.hxx mode change 100644 => 100755 sfx2/inc/sfx2/securitypage.hxx mode change 100644 => 100755 sfx2/inc/sfx2/sfx.hrc mode change 100644 => 100755 sfx2/sdi/sfx.sdi mode change 100644 => 100755 sfx2/source/appl/appuno.cxx mode change 100644 => 100755 sfx2/source/dialog/dinfdlg.cxx mode change 100644 => 100755 sfx2/source/dialog/dinfdlg.src mode change 100644 => 100755 sfx2/source/dialog/makefile.mk mode change 100644 => 100755 sfx2/source/dialog/securitypage.cxx mode change 100644 => 100755 sfx2/source/dialog/securitypage.hrc mode change 100644 => 100755 sfx2/source/dialog/securitypage.src mode change 100644 => 100755 sfx2/source/doc/objxtor.cxx mode change 100644 => 100755 sfx2/source/inc/helpid.hrc mode change 100644 => 100755 svx/inc/svx/svxids.hrc mode change 100644 => 100755 uui/source/cookiedg.cxx mode change 100644 => 100755 uui/source/cookiedg.hxx mode change 100644 => 100755 uui/source/iahndl-authentication.cxx mode change 100644 => 100755 uui/source/ids.hrc mode change 100644 => 100755 uui/source/logindlg.cxx mode change 100644 => 100755 uui/source/logindlg.hrc mode change 100644 => 100755 uui/source/logindlg.hxx mode change 100644 => 100755 uui/source/logindlg.src mode change 100644 => 100755 uui/source/loginerr.hxx mode change 100644 => 100755 uui/source/passworddlg.cxx mode change 100644 => 100755 uui/source/passworddlg.hxx mode change 100644 => 100755 uui/source/passworddlg.src mode change 100644 => 100755 uui/source/passworderrs.src mode change 100644 => 100755 vbahelper/source/msforms/vbasystemaxcontrol.cxx mode change 100644 => 100755 vbahelper/source/msforms/vbasystemaxcontrol.hxx diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx old mode 100644 new mode 100755 diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx old mode 100644 new mode 100755 diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx old mode 100644 new mode 100755 diff --git a/oovbaapi/ooo/vba/XVBAAppService.idl b/oovbaapi/ooo/vba/XVBAAppService.idl old mode 100644 new mode 100755 diff --git a/oovbaapi/ooo/vba/XVBADocService.idl b/oovbaapi/ooo/vba/XVBADocService.idl old mode 100644 new mode 100755 diff --git a/oovbaapi/ooo/vba/excel/SheetObject.idl b/oovbaapi/ooo/vba/excel/SheetObject.idl old mode 100644 new mode 100755 diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl b/oovbaapi/ooo/vba/excel/SheetObjects.idl old mode 100644 new mode 100755 diff --git a/oovbaapi/ooo/vba/excel/XHyperlinks.idl b/oovbaapi/ooo/vba/excel/XHyperlinks.idl old mode 100644 new mode 100755 diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc old mode 100644 new mode 100755 diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index ebb4497a0ba2..2728cc621138 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -100,6 +100,11 @@ namespace sfx2 ToolBox& GetToolBox() { return m_aToolbox; } const ToolBox& GetToolBox() const { return m_aToolbox; } + /** Return the border that is painted around the inner window as + decoration. + */ + SvBorder GetDecorationBorder (void) const { return m_aBorder; } + protected: // Window overridables virtual void Paint( const Rectangle& i_rArea ); @@ -153,6 +158,11 @@ namespace sfx2 since the last Paint(). */ bool m_bLayoutPending; + + /** Height of the title bar. Calculated in impl_layout(). + */ + int m_nTitleBarHeight; + }; //...................................................................................................................... diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi old mode 100644 new mode 100755 diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/securitypage.hrc b/sfx2/source/dialog/securitypage.hrc old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src old mode 100644 new mode 100755 diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 58a61d66ba8b..4be0948d8047 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -51,6 +51,7 @@ namespace sfx2 ,m_aContentWindow( this, WB_DIALOGCONTROL ) ,m_aBorder( 3, 1, 3, 3 ) ,m_bLayoutPending( false ) + ,m_nTitleBarHeight(0) { impl_construct(); } @@ -139,23 +140,23 @@ namespace sfx2 Size aWindowSize( GetOutputSizePixel() ); // position the tool box - int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() ); - if ( aToolBoxSize.Height() > nTitleBarHeight ) - nTitleBarHeight = aToolBoxSize.Height(); + m_nTitleBarHeight = GetSettings().GetStyleSettings().GetTitleHeight(); + if ( aToolBoxSize.Height() > m_nTitleBarHeight ) + m_nTitleBarHeight = aToolBoxSize.Height(); m_aToolbox.SetPosSizePixel( Point( aWindowSize.Width() - aToolBoxSize.Width(), - ( nTitleBarHeight - aToolBoxSize.Height() ) / 2 + ( m_nTitleBarHeight - aToolBoxSize.Height() ) / 2 ), aToolBoxSize ); // Place the content window. - if ( nTitleBarHeight < aToolBoxSize.Height() ) - nTitleBarHeight = aToolBoxSize.Height(); - aWindowSize.Height() -= nTitleBarHeight; + if ( m_nTitleBarHeight < aToolBoxSize.Height() ) + m_nTitleBarHeight = aToolBoxSize.Height(); + aWindowSize.Height() -= m_nTitleBarHeight; m_aContentWindow.SetPosSizePixel( - Point( m_aBorder.Left(), nTitleBarHeight + m_aBorder.Top() ), + Point( m_aBorder.Left(), m_nTitleBarHeight + m_aBorder.Top() ), Size( aWindowSize.Width() - m_aBorder.Left() - m_aBorder.Right(), aWindowSize.Height() - m_aBorder.Top() - m_aBorder.Bottom() @@ -175,11 +176,6 @@ namespace sfx2 Push( PUSH_FONT | PUSH_FILLCOLOR | PUSH_LINECOLOR ); - int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() ); - const Size aToolBoxSize = m_aToolbox.CalcWindowSizePixel(); - if ( aToolBoxSize.Height() > nTitleBarHeight ) - nTitleBarHeight = aToolBoxSize.Height(); - SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); SetLineColor(); @@ -194,7 +190,7 @@ namespace sfx2 int nInnerLeft = nOuterLeft + m_aBorder.Left() - 1; int nOuterRight = aWindowSize.Width() - 1; int nInnerRight = nOuterRight - m_aBorder.Right() + 1; - int nInnerTop = nTitleBarHeight + m_aBorder.Top() - 1; + int nInnerTop = m_nTitleBarHeight + m_aBorder.Top() - 1; int nOuterBottom = aWindowSize.Height() - 1; int nInnerBottom = nOuterBottom - m_aBorder.Bottom() + 1; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx old mode 100644 new mode 100755 diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc old mode 100644 new mode 100755 diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc old mode 100644 new mode 100755 diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx old mode 100644 new mode 100755 diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx old mode 100644 new mode 100755 diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx old mode 100644 new mode 100755 diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc old mode 100644 new mode 100755 diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx old mode 100644 new mode 100755 diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc old mode 100644 new mode 100755 diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx old mode 100644 new mode 100755 diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src old mode 100644 new mode 100755 diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx old mode 100644 new mode 100755 diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx old mode 100644 new mode 100755 diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx old mode 100644 new mode 100755 diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src old mode 100644 new mode 100755 diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src old mode 100644 new mode 100755 diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx old mode 100644 new mode 100755 diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx old mode 100644 new mode 100755