diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 09:29:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 11:21:03 +0000 |
commit | 2b12a5b87b1de9ae95d9562ba21201890b1100c5 (patch) | |
tree | ae0c1b5064c4d92e65db301e4d8acd87e891b159 /sc | |
parent | a95b58060b01046a8881e97e0c5016e44200dd32 (diff) |
the return of callcatcher
Change-Id: I447ebcc61ff061bce15678c6fcfd3d0a4669908f
Diffstat (limited to 'sc')
-rw-r--r-- | sc/Library_sc.mk | 1 | ||||
-rw-r--r-- | sc/source/ui/dbgui/expftext.cxx | 83 | ||||
-rw-r--r-- | sc/source/ui/inc/dbnamdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/expftext.hxx | 39 | ||||
-rw-r--r-- | sc/source/ui/inc/instbdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/simpref.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/xmlsourcedlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/sidebar/CellLineStyleValueSet.hxx | 2 |
9 files changed, 0 insertions, 134 deletions
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 397ca2229bc1..32d71da259ce 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -389,7 +389,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/dbgui/csvsplits \ sc/source/ui/dbgui/csvtablebox \ sc/source/ui/dbgui/dbnamdlg \ - sc/source/ui/dbgui/expftext \ $(if $(filter TRUE,$(MPL_SUBSET)),, \ sc/source/ui/dbgui/fieldwnd) \ sc/source/ui/dbgui/filtdlg \ diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx deleted file mode 100644 index 95017bfd9d1e..000000000000 --- a/sc/source/ui/dbgui/expftext.cxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "expftext.hxx" -#include <vcl/help.hxx> - -/************************************************************************* -#* Member: ScExpandedFixedText -#*------------------------------------------------------------------------ -#* -#* Klasse: MD_Test -#* -#* Funktion: Konstruktor der Klasse SvxCtrDial -#* -#* Input: Parent- Window, Resource ID -#* -#* Output: --- -#* -#************************************************************************/ - -ScExpandedFixedText::ScExpandedFixedText( Window* pParent, - const ResId& rResId) : - FixedText( pParent, rResId ) -{ - -} - -/************************************************************************* -#* Member: RequestHelp -#*------------------------------------------------------------------------ -#* -#* Klasse: ScExpandedFixedText -#* -#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster -#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text -#* an, so wird selbiger in voller Laenge angezeigt. -#* -#* Input: HelpEvent -#* -#* Output: --- -#* -#************************************************************************/ - -void ScExpandedFixedText::RequestHelp(const HelpEvent& rEvt) -{ - OUString aTxtStr = GetText(); - long nTxtWidth = GetTextWidth(aTxtStr); - if ( ( rEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK && - nTxtWidth > GetSizePixel().Width()) - { - Point aShowPoint = OutputToScreenPixel(Point(0,0)); - long nTxtHeight = GetTextHeight(); - - Help::ShowQuickHelp( this, - Rectangle( aShowPoint, Size(nTxtWidth,nTxtHeight) ), aTxtStr, - QUICKHELP_TOP|QUICKHELP_LEFT ); - } - else - { - FixedText::RequestHelp( rEvt ); - } -} - - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 2fccd0ee2dce..7ea6ad6d3501 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -28,7 +28,6 @@ #include "anyrefdg.hxx" #include "dbdata.hxx" -#include "expftext.hxx" class ScViewData; class ScDocument; diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx deleted file mode 100644 index 09ba390e9ccc..000000000000 --- a/sc/source/ui/inc/expftext.hxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _SC_EXPFTEXT_HXX -#define _SC_EXPFTEXT_HXX - -#include <vcl/fixed.hxx> -#include "scdllapi.h" - -class SC_DLLPUBLIC ScExpandedFixedText: public FixedText -{ - protected: - - void RequestHelp( const HelpEvent& rHEvt ); - - public: - ScExpandedFixedText( Window* pWindow, const ResId& rResId); -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index fd74a90c69cd..754b03b304d2 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -31,7 +31,6 @@ #include <sfx2/objsh.hxx> #include <vcl/field.hxx> -#include "expftext.hxx" class ScViewData; class ScDocument; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 71ff5bcf5356..c61d1d25b39f 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -29,7 +29,6 @@ #include <vcl/morebtn.hxx> #include "anyrefdg.hxx" #include "dbdata.hxx" -#include "expftext.hxx" class ScViewData; class ScDocument; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 8669405032d9..e71b9df20fd0 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -15,7 +15,6 @@ #include <vcl/layout.hxx> #include "svtools/treelistbox.hxx" -#include "expftext.hxx" #include "anyrefdg.hxx" #include "orcusxml.hxx" diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index fbc1ff73480e..6cfbd0c43bd5 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -59,11 +59,6 @@ void CellLineStyleValueSet::SetSelItem(sal_uInt16 nSel) } } -void CellLineStyleValueSet::SetImage(Image img) -{ - imgCus = img; -} - void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { Rectangle aRect = rUDEvt.GetRect(); diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index 1f6ff5e0da07..971688c7bff8 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -32,14 +32,12 @@ private: VirtualDevice* pVDev; sal_uInt16 nSelItem; OUString maStrUnit[CELL_LINE_STYLE_ENTRIES]; - Image imgCus; public: CellLineStyleValueSet( Window* pParent, const ResId& rResId); virtual ~CellLineStyleValueSet(); void SetUnit(const OUString* str); void SetSelItem(sal_uInt16 nSel); - void SetImage(Image img); virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; |