summaryrefslogtreecommitdiff
path: root/sc/source/ui/cctrl
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-06-26 10:50:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-06-26 10:50:01 +0000
commit4cb1455112804f2cb18e802e4a8f6027443967b9 (patch)
treebcb7a24260f0286682262bb4f2869a855edf7f0a /sc/source/ui/cctrl
parent620c60b7e55c59c6512f21ffdda79eece44f5b58 (diff)
INTEGRATION: CWS aw046 (1.6.176); FILE MERGED
2007/06/01 09:02:46 aw 1.6.176.3: changes after resync 2007/04/23 15:57:38 aw 1.6.176.2: RESYNC: (1.6-1.7); FILE MERGED 2007/02/22 17:56:07 nn 1.6.176.1: #i74768# use variable pContentDev to draw content in ScGridWindow::Draw
Diffstat (limited to 'sc/source/ui/cctrl')
-rw-r--r--sc/source/ui/cctrl/cbuttonw.cxx18
1 files changed, 11 insertions, 7 deletions
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index b000778c6ae1..8a8d6f7ff2dd 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: cbuttonw.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: vg $ $Date: 2007-02-27 13:00:35 $
+ * last change: $Author: hr $ $Date: 2007-06-26 11:50:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,20 +36,17 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
+#include <vcl/outdev.hxx>
#include <vcl/window.hxx>
#include <vcl/decoview.hxx>
#include <vcl/svapp.hxx>
-
#include "cbutton.hxx"
-
//========================================================================
// class ScDDComboBoxButton
//========================================================================
-ScDDComboBoxButton::ScDDComboBoxButton( Window* pOutputDevice )
+ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice )
: pOut( pOutputDevice )
{
SetOptSizePixel();
@@ -63,6 +60,13 @@ __EXPORT ScDDComboBoxButton::~ScDDComboBoxButton()
// -------------------------------------------------------------------------
+void ScDDComboBoxButton::SetOutputDevice( OutputDevice* pOutputDevice )
+{
+ pOut = pOutputDevice;
+}
+
+// -------------------------------------------------------------------------
+
void ScDDComboBoxButton::SetOptSizePixel()
{
aBtnSize = pOut->LogicToPixel( Size(0,11), MAP_APPFONT );