diff options
Diffstat (limited to 'dbaccess/inc')
-rw-r--r-- | dbaccess/inc/AsyncronousLink.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/IController.hxx | 9 | ||||
-rw-r--r-- | dbaccess/inc/IReference.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/ToolBoxHelper.hxx | 16 | ||||
-rw-r--r-- | dbaccess/inc/controllerframe.hxx | 3 | ||||
-rw-r--r-- | dbaccess/inc/dataview.hxx | 3 | ||||
-rw-r--r-- | dbaccess/inc/dbaccessdllapi.h | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | dbaccess/inc/dbaundomanager.hxx | 0 | ||||
-rw-r--r-- | dbaccess/inc/dbsubcomponentcontroller.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/makefile.mk | 47 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.cxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.hxx | 9 |
13 files changed, 30 insertions, 69 deletions
diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx index 576f1a1a90af..3fff1f7deb20 100644 --- a/dbaccess/inc/AsyncronousLink.hxx +++ b/dbaccess/inc/AsyncronousLink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ namespace dbaui } #endif // DBAUI_ASYNCRONOUSLINK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 46d5a78922f3..962782ea5e18 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,15 +29,9 @@ #ifndef DBAUI_ICONTROLLER_HXX #define DBAUI_ICONTROLLER_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef DBAUI_IREFERENCE_HXX #include "IReference.hxx" -#endif #include "dbaccessdllapi.h" namespace com { namespace sun { namespace star { @@ -138,3 +133,5 @@ namespace dbaui }; } #endif // DBAUI_ICONTROLLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/IReference.hxx b/dbaccess/inc/IReference.hxx index ba78811e1e85..01534f6063e0 100644 --- a/dbaccess/inc/IReference.hxx +++ b/dbaccess/inc/IReference.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ namespace dbaui #endif // DBAUI_IREFERENCE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index 0bb93681d8c6..280d523a8ca0 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,18 +29,10 @@ #ifndef DBAUI_TOOLBOXHELPER_HXX #define DBAUI_TOOLBOXHELPER_HXX -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef _LINK_HXX #include <tools/link.hxx> -#endif -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif -#ifndef _SV_IMAGE_HXX #include <vcl/image.hxx> -#endif #include "dbaccessdllapi.h" class SvtMiscOptions; @@ -50,7 +43,6 @@ namespace dbaui { class DBACCESS_DLLPUBLIC OToolBoxHelper { - sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps ToolBox* m_pToolBox; // our toolbox (may be NULL) public: @@ -69,7 +61,7 @@ namespace dbaui @param _bHiContast <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0; + virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const = 0; /** only the member will be set, derived classes can overload this function and do what need to be done. @param _pTB @@ -79,13 +71,12 @@ namespace dbaui */ virtual void setToolBox(ToolBox* _pTB); - inline ToolBox* getToolBox() const { return m_pToolBox; } + inline ToolBox* getToolBox() const { return m_pToolBox; } /** checks if the toolbox needs a new imagelist. */ void checkImageList(); - inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } protected: DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); DECL_LINK(SettingsChanged, VclWindowEvent* ); @@ -93,3 +84,4 @@ namespace dbaui } #endif // DBAUI_TOOLBOXHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx index 942bdc42da64..19daaebb3d69 100644 --- a/dbaccess/inc/controllerframe.hxx +++ b/dbaccess/inc/controllerframe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_CONTROLLERFRAME_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index fdb99014433a..813faa4a8dd4 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,6 +32,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/acceleratorexecute.hxx> +#include <sal/macros.h> #include <vcl/fixed.hxx> #include <memory> @@ -90,3 +92,4 @@ namespace dbaui } #endif // DBAUI_DATAVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 7edac96cf07c..7365d0c4c84f 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ #endif /* INCLUDED_DBACCESSDLLAPI_H */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dbaundomanager.hxx b/dbaccess/inc/dbaundomanager.hxx index 1b8627f66326..1b8627f66326 100755..100644 --- a/dbaccess/inc/dbaundomanager.hxx +++ b/dbaccess/inc/dbaundomanager.hxx diff --git a/dbaccess/inc/dbsubcomponentcontroller.hxx b/dbaccess/inc/dbsubcomponentcontroller.hxx index cd93a29df321..a4d24359cebc 100644 --- a/dbaccess/inc/dbsubcomponentcontroller.hxx +++ b/dbaccess/inc/dbsubcomponentcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,3 +212,4 @@ namespace dbaui #endif // DBAUI_SUBCOMPONENTCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 6c47ca6f397f..3dad26798ec1 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -540,3 +541,4 @@ namespace dbaui #endif //DBAUI_GENERICCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/makefile.mk b/dbaccess/inc/makefile.mk deleted file mode 100644 index 5aa9bfe11018..000000000000 --- a/dbaccess/inc/makefile.mk +++ /dev/null @@ -1,47 +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=dbaccess -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx index 1ef5d4b9c7a5..0fe2c43d1189 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.cxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_dbaccess.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index 099adaf03988..daa7a324ab60 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -476,6 +477,8 @@ #include "editeng/svxenum.hxx" #include "svx/svxids.hrc" +#include "rtl/ref.hxx" +#include "salhelper/simplereferenceobject.hxx" #include "tools/diagnose_ex.h" @@ -498,10 +501,7 @@ #include "unotools/processfactory.hxx" -#include "vos/mutex.hxx" -#include "vos/ref.hxx" -#include "vos/refernce.hxx" -#include "vos/thread.hxx" +#include "osl/mutex.hxx" #include "xmloff/ProgressBarHelper.hxx" #include "xmloff/XMLConstantsPropertyHandler.hxx" @@ -518,3 +518,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |