diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2016-08-07 19:24:03 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2016-08-07 19:24:03 +0000 |
| commit | ca68acda60fa352d2a272a2a10d15a4cc209a681 (patch) | |
| tree | 76d808631e0a71ea683c8d7852f9d60f9e49dd06 /extensions | |
| parent | 5b6c4bddf6134f377a61446d8bcf1be2f096aad1 (diff) | |
Merge branches/gbuild-reintegration to trunk.
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/prj/build.lst | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/admininvokationimpl.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/fontdialog.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 8a815ee31cec..4a03cc9cff89 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -1,4 +1,4 @@ -ex extensions : officecfg L10N:l10n rdbmaker svx SANE:sane TWAIN:twain offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL +ex extensions : officecfg L10N:l10n rdbmaker svx SANE:sane TWAIN:twain offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL ex extensions usr1 - all ex_mkout NULL ex extensions\inc nmake - all ex_inc NULL diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 5bfbb6458401..611d05296e88 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <vcl/stdtext.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 7b7f46a42755..d17998ed3bfb 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <tools/debug.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #include <vcl/stdtext.hxx> #include <com/sun/star/util/AliasProgrammaticPair.hpp> diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 0b0fdb50bb75..da6f028468b2 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -36,7 +36,7 @@ #endif #include <vcl/svapp.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #include <comphelper/types.hxx> #include <comphelper/extract.hxx> diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 6fb7c747aeb8..7ce26572fc86 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -54,7 +54,7 @@ #include <comphelper/extract.hxx> #include <toolkit/awt/vclxwindow.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #endif #include <comphelper/property.hxx> #include <vcl/msgbox.hxx> |