Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3681
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3681/1
fdo#46808, Convert some XMultiServiceFactory to XComponentContext
The new constructor is not happy with forward declarations of types
so I need to updates lots of files to include the necessary headers.
Change-Id: I1dcfee9fa0fdc4457754396ffb52cc8462f3906a
---
M accessibility/source/extended/accessibletabbar.cxx
M accessibility/source/standard/accessiblemenucomponent.cxx
M basctl/source/basicide/baside2b.cxx
M canvas/source/tools/canvastools.cxx
M chart2/source/controller/dialogs/tp_DataSource.cxx
M connectivity/source/commontools/dbtools2.cxx
M dbaccess/source/ui/control/sqledit.cxx
M dbaccess/source/ui/dlg/UserAdmin.cxx
M dbaccess/source/ui/dlg/adminpages.cxx
M desktop/source/deployment/registry/dp_backend.cxx
M extensions/source/propctrlr/formlinkdialog.cxx
M filter/source/msfilter/msocximex.cxx
M forms/source/runtime/formoperations.cxx
M fpicker/source/generic/fpicker.cxx
M include/com/sun/star/uno/Reference.h
M oox/source/core/xmlfilterbase.cxx
M oox/source/drawingml/chart/converterbase.cxx
M oox/source/drawingml/chart/objectformatter.cxx
M oox/source/drawingml/chart/typegroupconverter.cxx
M oox/source/vml/vmltextbox.cxx
M reportdesign/inc/RptDef.hxx
M reportdesign/source/core/api/FormattedField.cxx
M reportdesign/source/core/sdr/RptObject.cxx
M reportdesign/source/filter/xml/xmlExport.cxx
M sc/source/core/tool/chartlock.cxx
M sc/source/filter/inc/workbookhelper.hxx
M sc/source/filter/inc/xlchart.hxx
M sc/source/filter/oox/excelchartconverter.cxx
M sc/source/filter/xcl97/xcl97esc.cxx
M sc/source/filter/xml/xmlstyle.cxx
M sc/source/ui/vba/vbasheetobjects.hxx
M sd/source/core/CustomAnimationEffect.cxx
M sd/source/ui/framework/factories/Pane.cxx
M sd/source/ui/toolpanel/ToolPanel.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/Metadatable.cxx
M sfx2/source/doc/iframe.cxx
M sfx2/source/view/sfxbasecontroller.cxx
M slideshow/source/engine/rehearsetimingsactivity.cxx
M svtools/source/brwbox/brwimpl.hxx
M svtools/source/uno/wizard/unowizard.cxx
M svx/source/form/fmmodel.cxx
M sw/source/ui/docvw/srcedtw.cxx
M writerfilter/source/ooxml/OOXMLStreamImpl.cxx
M xmloff/source/text/XMLTextNumRuleInfo.cxx
M xmloff/source/xforms/xformsapi.cxx
46 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 8e1730b..8c318f5 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index 3bf4d15..c7e12a6 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 7b7e3c7..e4579aa 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/script/XLibraryContainer2.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 26775be..cba537b 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/geometry/AffineMatrix2D.hpp>
#include <com/sun/star/geometry/Matrix2D.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/util/Endianness.hpp>
#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 13a2fe4..d11ee84 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
+#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index df243d3..d2981ef 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/DriverManager.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 11446c9..6800f02 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -23,6 +23,7 @@
#include "com/sun/star/beans/XMultiPropertySet.hpp"
#include "com/sun/star/beans/XPropertiesChangeListener.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
#include "officecfg/Office/Common.hxx"
#include "sqledit.hxx"
#include "QueryTextView.hxx"
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index ad921e5..199dd15 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -25,6 +25,7 @@
#include <comphelper/types.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
#include <com/sun/star/sdbcx/XDrop.hpp>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 3fbebe0a..d83106c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -33,6 +33,7 @@
#include "optionalboolitem.hxx"
#include "sqlmessage.hxx"
+#include <com/sun/star/sdbc/XConnection.hpp>
#include <osl/file.hxx>
#include <vcl/accel.hxx>
#include <vcl/button.hxx>
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index 8c6cdfa..c116d66 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -195,7 +195,7 @@
if (insertion.second)
{ // first insertion
SAL_WARN_IF(
- Reference<XInterface>(insertion.first->second) != xNewPackage,
+ Reference<deployment::XPackage>(insertion.first->second) != xNewPackage,
"desktop.deployment", "mismatch");
}
else
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx
b/extensions/source/propctrlr/formlinkdialog.cxx
index 2fdf007..f6ccdc9 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -39,6 +39,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
+#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 5706df0..23ec242 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <filter/msfilter/msocximex.hxx>
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 914ae6a..0e5f188 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/sdb/OrderDialog.hpp>
#include <com/sun/star/sdb/FilterDialog.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/form/XReset.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 4bc8d9d..fee7d66 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -22,6 +22,8 @@
#include "cppuhelper/implementationentry.hxx"
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker2.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker2.hpp"
#include "svtools/miscopt.hxx"
#include "svl/pickerhistoryaccess.hxx"
@@ -145,7 +147,11 @@
Reference< css::lang::XMultiComponentFactory > xFactory (rxContext->getServiceManager());
if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog())
{
- xResult = Reference< css::uno::XInterface >( Application::createFolderPicker( rxContext )
);
+
+
+
+ Reference<css::util::XCancellable> tmp1( Application::createFolderPicker( rxContext ) );
+ xResult.set( tmp1 );
if (!xResult.is())
{
try
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index 94551a0..1cfbdfa 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -20,6 +20,8 @@
#define _COM_SUN_STAR_UNO_REFERENCE_H_
#include <rtl/alloc.h>
+#include "boost/type_traits/is_base_of.hpp"
+#include "boost/utility/enable_if.hpp"
namespace com
@@ -248,6 +250,21 @@
@param rRef another reference
*/
inline Reference( const Reference< interface_type > & rRef ) SAL_THROW(());
+
+ /** Up-casting conversion constructor: Copies interface reference.
+
+ @param rRef another reference
+ */
+ template< class derived_interface_type >
+ inline Reference( const Reference< derived_interface_type > & rRef,
+ // SFINAE - use boost type_traits to prevent this template from being used
to cast between unrelated types
+ typename boost::enable_if< boost::is_base_of<interface_type,
derived_interface_type> >::type* = 0 ) SAL_THROW(())
+ {
+ BaseReference br = rRef;
+ XInterface* p = br.get();
+ _pInterface = iquery( p );
+ }
+
/** Constructor: Sets given interface pointer.
@param pInterface an interface pointer
@@ -477,7 +494,7 @@
@return this reference
*/
inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface )
SAL_THROW(());
- /** Assignment operator: Acquires given interface reference and sets reference.
+ /** Assignment operator: Acquires given interface reference and sets reference..
An interface already set will be released.
@param rRef an interface reference
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 4cd7665..fb32a03 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -22,6 +22,7 @@
#include <cstdio>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/embed/XRelationshipAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
diff --git a/oox/source/drawingml/chart/converterbase.cxx
b/oox/source/drawingml/chart/converterbase.cxx
index 65d813d..dafc422 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -26,6 +26,8 @@
#include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/chart2/RelativeSize.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/oox/source/drawingml/chart/objectformatter.cxx
b/oox/source/drawingml/chart/objectformatter.cxx
index c2eabfe..c7c3566 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -19,6 +19,7 @@
#include "oox/drawingml/chart/objectformatter.hxx"
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <osl/thread.h>
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 7f996bf..b6ccffe 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XCoordinateSystem.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include "oox/drawingml/lineproperties.hxx"
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 1499091..d726c4f 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -22,6 +22,7 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/text/XTextAppend.hpp>
#include <com/sun/star/text/WritingMode.hpp>
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index f633259..b1808d6 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -27,14 +27,12 @@
#include <comphelper/uno3.hxx>
#include <svx/fmglob.hxx>
#include <boost/shared_ptr.hpp>
+#include <com/sun/star/style/XStyle.hpp>
namespace com { namespace sun { namespace star {
namespace report {
class XReportComponent;
class XReportDefinition;
- }
- namespace style {
- class XStyle;
}
namespace beans {
class XPropertySet;
diff --git a/reportdesign/source/core/api/FormattedField.cxx
b/reportdesign/source/core/api/FormattedField.cxx
index 0b2ba8c..c9a3b0d 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -19,6 +19,7 @@
#include "FormattedField.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/sdbc/XDataSource.hpp>
#include "corestrings.hrc"
#include "core_resource.hrc"
#include "core_resource.hxx"
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 280f3de..93bafd5 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -48,6 +48,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 713611f..0323f5a 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/report/XFixedText.hpp>
#include <com/sun/star/report/XImageControl.hpp>
#include <com/sun/star/report/XShape.hpp>
+#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/report/XFunction.hpp>
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index 5e73c82..81b30fa 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -28,6 +28,7 @@
#include "drwlayer.hxx"
#include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
using namespace com::sun::star;
using ::com::sun::star::uno::Reference;
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index fa1ce19..8d9dbb4 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -25,6 +25,8 @@
#include "oox/helper/storagebase.hxx"
#include "biffhelper.hxx"
#include "rangenam.hxx"
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
namespace com { namespace sun { namespace star {
namespace container { class XNameAccess; }
@@ -32,8 +34,6 @@
namespace lang { class XMultiServiceFactory; }
namespace sheet { class XDatabaseRange; }
namespace sheet { class XNamedRange; }
- namespace sheet { class XSpreadsheet; }
- namespace sheet { class XSpreadsheetDocument; }
namespace sheet { struct FormulaToken; }
namespace style { class XStyle; }
namespace table { struct CellAddress; }
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 0df3408..555c240 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -29,12 +29,12 @@
#include <tools/gen.hxx>
#include "fapihelper.hxx"
#include <boost/shared_ptr.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
namespace lang { class XMultiServiceFactory; }
namespace chart { class XChartDocument; }
- namespace chart2 { class XChartDocument; }
namespace drawing { class XShape; }
} } }
diff --git a/sc/source/filter/oox/excelchartconverter.cxx
b/sc/source/filter/oox/excelchartconverter.cxx
index 59870a4..779c5e9 100644
--- a/sc/source/filter/oox/excelchartconverter.cxx
+++ b/sc/source/filter/oox/excelchartconverter.cxx
@@ -20,6 +20,7 @@
#include "excelchartconverter.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XDataProvider.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/chart2/data/XSheetDataProvider.hpp>
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 6d7a15b..f6364df 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/embed/XClassifiedObject.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index a331b0a..3d9c01e 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
#include <com/sun/star/sheet/XSheetCondition.hpp>
+#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <comphelper/extract.hxx>
diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx
index 0f96a1d..fc41b84 100644
--- a/sc/source/ui/vba/vbasheetobjects.hxx
+++ b/sc/source/ui/vba/vbasheetobjects.hxx
@@ -21,13 +21,13 @@
#define SC_VBA_SHEETOBJECTS_HXX
#include <ooo/vba/excel/XGraphicObjects.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
#include <rtl/ref.hxx>
namespace com { namespace sun { namespace star {
namespace container { class XEnumeration; }
namespace frame { class XModel; }
- namespace sheet { class XSpreadsheet; }
} } }
// ============================================================================
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 21a098f..827bed2 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1022,7 +1022,7 @@
xAnimate->setFill( AnimationFill::HOLD );
xAnimate->setTarget( maTarget );
- return Reference< XAnimationNode >( xAnimate, UNO_QUERY_THROW );
+ return xAnimate;
}
// --------------------------------------------------------------------
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 4eeb5c5..21e3512 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -26,6 +26,7 @@
#include <vcl/window.hxx>
#include <cppcanvas/vclfactory.hxx>
#include <comphelper/servicehelper.hxx>
+#include <com/sun/star/rendering/XSpriteCanvas.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index c89d648..30d7b95 100644
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -23,6 +23,7 @@
#include <taskpane/TaskPaneTreeNode.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <vcl/window.hxx>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 945e256..accf4be 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/frame/DocumentTemplates.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/frame/XDocumentTemplates.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 0a9e4a2..cdb54ef 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -18,6 +18,7 @@
*/
+#include <com/sun/star/frame/XModel.hpp>
#include <sfx2/Metadatable.hxx>
#include <sfx2/XmlIdRegistry.hxx>
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index d43d338..ea6c7de 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -21,6 +21,7 @@
#include "iframe.hxx"
#include <sfx2/sfxdlg.hxx>
#include <sfx2/sfxsids.hrc>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/Frame.hpp>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 9816437..80aaa8b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/XCloseBroadcaster.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx
b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 44e0305..05fa5c1 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
#include "eventqueue.hxx"
#include "screenupdater.hxx"
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index e4f5f72..bcee74c 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -21,6 +21,7 @@
#include "svtaccessiblefactory.hxx"
#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
#include <map>
#include <functional>
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 963853c..525e82e 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -21,6 +21,7 @@
#include "../unowizard.hxx"
#include "wizardshell.hxx"
+#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index b84f8b6..f39c4bd 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -22,6 +22,8 @@
#include "fmdocumentclassification.hxx"
#include "fmcontrollayout.hxx"
+#include <com/sun/star/form/XForms.hpp>
+
#include <svx/fmmodel.hxx>
#include <svx/fmpage.hxx>
#include <svx/svdobj.hxx>
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 4eefa5e..68b997c 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <cppuhelper/implbase1.hxx>
#include <officecfg/Office/Common.hxx>
#include <rtl/ustring.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 96f37bd..a5c7054 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -23,6 +23,7 @@
#include <iostream>
#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index d78f566..0d4d0f4 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/style/NumberingType.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include "XMLTextNumRuleInfo.hxx"
#include "xmloff/XMLTextListAutoStylePool.hxx"
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 9f1b32c..5d12437 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/xforms/XFormsSupplier.hpp>
#include <com/sun/star/xforms/XDataTypeRepository.hpp>
#include <com/sun/star/xforms/Model.hpp>
--
To view, visit https://gerrit.libreoffice.org/3681
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dcfee9fa0fdc4457754396ffb52cc8462f3906a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin <noelgrandin@gmail.com>
Context
- [PATCH] fdo#46808, Convert some XMultiServiceFactory to XComponentCo... · Noel Grandin (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.