diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:13:32 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:54:56 -0500 |
commit | 84869b63b49405bede76a152f9c8d3d1e35db3b8 (patch) | |
tree | 387e69a8c18886082437414a0b48e480feca9ebf /reportdesign | |
parent | merge vosremoval-reference.diff (diff) | |
download | core-84869b63b49405bede76a152f9c8d3d1e35db3b8.tar.gz core-84869b63b49405bede76a152f9c8d3d1e35db3b8.zip |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'reportdesign')
10 files changed, 10 insertions, 10 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 4ecd1a38c563..fd9360e30b3c 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/chart2/data/DatabaseDataProvider.hpp> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/document/XEventListener.hpp> diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 43cdd2c8f120..737e43af74be 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -55,7 +55,7 @@ #include <vcl/svapp.hxx> #include <dbaccess/singledoccontroller.hxx> #include <svx/unoshape.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace rptui { diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 556563b56908..780113958495 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -54,7 +54,7 @@ #include <vcl/svapp.hxx> #include <dbaccess/singledoccontroller.hxx> #include <svx/unoshape.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace rptui { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 591f0a74489c..a8fdacf51e9e 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -64,7 +64,7 @@ #include "RptDef.hxx" // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sal/macros.h> #include <boost/bind.hpp> diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 2843fafc4773..1e1f2ba71305 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -59,7 +59,7 @@ #include <xmloff/xmlmetai.hxx> #include <com/sun/star/util/XModifiable.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 42c1b5a13e0f..f2a87ea06bde 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -55,7 +55,7 @@ #include <vcl/fldunit.hxx> #include "metadata.hxx" #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "helpids.hrc" #include "uistrings.hrc" #include "RptResId.hrc" diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index df462f9ee450..a169c8279026 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -38,7 +38,7 @@ #include <vcl/svapp.hxx> #include <vcl/status.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> namespace rptui diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 5f7c59b8c9d8..a009e4393de0 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -43,7 +43,7 @@ #include <svtools/miscopt.hxx> #include <unotools/moduleoptions.hxx> #include <svtools/menuoptions.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/svxids.hrc> #define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a028dfaf52c6..2f7fc8997d16 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -143,7 +143,7 @@ #include <unotools/syslocale.hxx> #include <unotools/viewoptions.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "PropertyForward.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 115d03de8e5b..45c389f94bef 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -32,7 +32,7 @@ #include <ReportControllerObserver.hxx> #include <ReportController.hxx> #include <svl/smplhint.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/awt/FontSlant.hpp> |