diff options
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/button.cxx | 22 | ||||
| -rw-r--r-- | vcl/source/control/combobox.cxx | 14 | ||||
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 15 | ||||
| -rwxr-xr-x | vcl/source/control/edit.cxx | 15 | ||||
| -rw-r--r-- | vcl/source/control/field.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/control/field2.cxx | 13 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/control/group.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/control/ilstbox.cxx | 20 | ||||
| -rw-r--r-- | vcl/source/control/longcurr.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 22 | ||||
| -rw-r--r-- | vcl/source/control/makefile.mk | 78 | ||||
| -rw-r--r-- | vcl/source/control/scrbar.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/spinfld.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/control/tabctrl.cxx | 9 |
15 files changed, 79 insertions, 165 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 5ffe94212d20..1a6439a0502e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -29,14 +29,10 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> +#include <tools/poly.hxx> +#include <tools/rc.h> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> -#ifndef _SV_IAMGE_HXX #include <vcl/image.hxx> -#endif #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/decoview.hxx> @@ -44,20 +40,14 @@ #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#include <tools/poly.hxx> #include <vcl/button.hxx> -#include <vcl/window.h> -#include <vcl/controldata.hxx> -#ifndef _SV_NATIVEWIDGET_HXX #include <vcl/salnativewidgets.hxx> -#endif #include <vcl/edit.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif - - +#include <svids.hrc> +#include <svdata.hxx> +#include <window.h> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 2fd0ade0f65d..2d6cb76b0512 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -27,23 +27,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/table.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/decoview.hxx> -#include <vcl/ilstbox.hxx> #include <vcl/lstbox.h> #include <vcl/button.hxx> -#include <vcl/subedit.hxx> #include <vcl/event.hxx> #include <vcl/combobox.hxx> -#include <vcl/controldata.hxx> - +#include <svdata.hxx> +#include <subedit.hxx> +#include <ilstbox.hxx> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 6bbe5bb32c38..26ef9b076d8c 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -28,20 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H +#include <comphelper/processfactory.hxx> + +#include <tools/diagnose_ex.h> #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/ctrl.hxx> #include <vcl/decoview.hxx> -#include <vcl/controldata.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/textlayout.hxx> -#include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <textlayout.hxx> +#include <svdata.hxx> +#include <controldata.hxx> + using namespace vcl; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 769614a9259b..cd8d64516919 100755 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -28,25 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> #include <vcl/decoview.hxx> #include <vcl/event.hxx> #include <vcl/cursor.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif #include <vcl/menu.hxx> #include <vcl/cmdevt.h> -#include <vcl/subedit.hxx> #include <vcl/edit.hxx> #include <vcl/svapp.hxx> -#include <vcl/controldata.hxx> #include <vcl/msgbox.hxx> -#include <vcl/window.h> + +#include <window.h> +#include <svdata.hxx> +#include <svids.hrc> +#include <subedit.hxx> +#include <controldata.hxx> #include <vos/mutex.hxx> diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 4a42abd3ea79..fd69457c8026 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -37,12 +37,15 @@ #include "tools/rc.h" #include "tools/resary.hxx" -#include "vcl/svids.hrc" + #include "vcl/field.hxx" #include "vcl/event.hxx" #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" #include "vcl/unohelp.hxx" + +#include "svids.hrc" +#include "svdata.hxx" + #include "i18nutil/unicode.hxx" #include "rtl/math.hxx" diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 4b14a5a4b199..9aac58e1a30a 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -29,21 +29,18 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> -#ifndef _SV_EVENT_HXX -#include <vcl/field.hxx> -#endif + #include <vcl/svapp.hxx> #include <vcl/sound.hxx> #include <vcl/event.hxx> #include <vcl/field.hxx> -#include <i18npool/mslangid.hxx> - #include <vcl/unohelp.hxx> +#include <svdata.hxx> + +#include <i18npool/mslangid.hxx> + #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index db92cd0b09af..5455f9410f54 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -27,13 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + +#include "tools/rc.h" + #include "vcl/decoview.hxx" #include "vcl/event.hxx" #include "vcl/fixed.hxx" -#include "vcl/controldata.hxx" -#include "vcl/window.h" -#include "tools/rc.h" +#include "controldata.hxx" +#include "window.h" // ======================================================================= diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 5b09bf6bb3b5..6bf4d519a64b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -27,15 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/event.hxx> -#include <vcl/group.hxx> -#include <vcl/controldata.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif +#include <vcl/event.hxx> +#include <vcl/group.hxx> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 793d12a0e93e..016facae8e2c 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -27,29 +27,25 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/event.hxx> #include <vcl/scrbar.hxx> #include <vcl/help.hxx> #include <vcl/lstbox.h> -#include <vcl/ilstbox.hxx> -#include <vcl/i18nhelp.hxx> -#include <vcl/controldata.hxx> #include <vcl/unohelp.hxx> -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ -#include <com/sun/star/i18n/XCollator.hpp> -#endif +#include <vcl/i18nhelp.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_ -#include <com/sun/star/accessibility/XAccessible.hpp> -#endif +#include <ilstbox.hxx> +#include <controldata.hxx> +#include <svdata.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ +#include <com/sun/star/i18n/XCollator.hpp> +#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #define MULTILINE_ENTRY_DRAW_FLAGS ( TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE | TEXT_DRAW_VCENTER ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index aae78baa3fb7..40b897bbb35c 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -34,15 +34,13 @@ #include <tools/debug.hxx> #include <tools/bigint.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/longcurr.hxx> +#include <svdata.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 594b76684a1a..94d865f79bc1 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -29,22 +29,23 @@ #include "precompiled_vcl.hxx" #include "tools/rc.h" +#include "tools/debug.hxx" + -#include "vcl/svdata.hxx" #include "vcl/decoview.hxx" #include "vcl/event.hxx" #include "vcl/scrbar.hxx" #include "vcl/button.hxx" #include "vcl/edit.hxx" -#include "vcl/subedit.hxx" -#include "vcl/ilstbox.hxx" #include "vcl/lstbox.hxx" #include "vcl/combobox.hxx" -#include "vcl/controldata.hxx" -#include "tools/debug.hxx" +#include "svdata.hxx" +#include "controldata.hxx" +#include "subedit.hxx" +#include "ilstbox.hxx" +#include "dndevdis.hxx" -#include <vcl/dndevdis.hxx> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> // ======================================================================= @@ -290,8 +291,15 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) Image aImage = mpImplLB->GetEntryList()->GetEntryImage( nChanged ); mpImplWin->SetImage( aImage ); } - mpImplWin->Invalidate(); } + else + { + mpImplWin->SetItemPos( LISTBOX_ENTRY_NOTFOUND ); + mpImplWin->SetString( ImplGetSVEmptyStr() ); + Image aImage; + mpImplWin->SetImage( aImage ); + } + mpImplWin->Invalidate(); } return 1; } diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk deleted file mode 100644 index de2613b1084f..000000000000 --- a/vcl/source/control/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=ctrl - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -.IF "$(COM)"=="ICC" -CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/button.obj \ - $(SLO)$/ctrl.obj \ - $(SLO)$/edit.obj \ - $(SLO)$/field2.obj \ - $(SLO)$/ilstbox.obj \ - $(SLO)$/tabctrl.obj \ - $(SLO)$/throbber.obj - -SLOFILES= $(EXCEPTIONSFILES) \ - $(SLO)$/combobox.obj \ - $(SLO)$/field.obj \ - $(SLO)$/fixbrd.obj \ - $(SLO)$/fixed.obj \ - $(SLO)$/group.obj \ - $(SLO)$/imgctrl.obj \ - $(SLO)$/longcurr.obj \ - $(SLO)$/lstbox.obj \ - $(SLO)$/morebtn.obj \ - $(SLO)$/menubtn.obj \ - $(SLO)$/scrbar.obj \ - $(SLO)$/slider.obj \ - $(SLO)$/spinfld.obj \ - $(SLO)$/spinbtn.obj \ - $(SLO)$/quickselectionengine.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 9bc71f1a55e3..17ecbd4a6ce8 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -33,7 +33,8 @@ #include "vcl/decoview.hxx" #include "vcl/scrbar.hxx" #include "vcl/timer.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include "rtl/string.hxx" #include "tools/rc.h" diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index d7501a6f99b6..ed0bb4374c53 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -29,12 +29,14 @@ #include "precompiled_vcl.hxx" #include "tools/rc.h" + #include "vcl/event.hxx" #include "vcl/decoview.hxx" #include "vcl/spin.h" #include "vcl/spinfld.hxx" -#include "vcl/controldata.hxx" -#include "vcl/svdata.hxx" + +#include "controldata.hxx" +#include "svdata.hxx" // ======================================================================= diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3140d100aa86..6cc07e85ffb7 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -27,10 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/debug.hxx" +#include "tools/debug.hxx" #include "tools/rc.h" -#include "vcl/svdata.hxx" + #include "vcl/svapp.hxx" #include "vcl/help.hxx" #include "vcl/event.hxx" @@ -39,11 +39,12 @@ #include "vcl/tabpage.hxx" #include "vcl/tabctrl.hxx" #include "vcl/controllayout.hxx" -#include "vcl/controldata.hxx" #include "vcl/sound.hxx" #include "vcl/lstbox.hxx" -#include "vcl/window.h" +#include "controldata.hxx" +#include "svdata.hxx" +#include "window.h" #include <hash_map> #include <vector> |