diff options
-rw-r--r-- | include/svtools/DocumentToGraphicRenderer.hxx | 17 | ||||
-rw-r--r-- | include/svtools/GraphicExportOptionsDialog.hxx | 10 | ||||
-rw-r--r-- | svtools/source/filter/GraphicExportOptionsDialog.cxx | 4 |
3 files changed, 12 insertions, 19 deletions
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx index 3033e6473129..2120ea43b7cd 100644 --- a/include/svtools/DocumentToGraphicRenderer.hxx +++ b/include/svtools/DocumentToGraphicRenderer.hxx @@ -30,22 +30,17 @@ #include "svtools/svtdllapi.h" -using namespace css; -using namespace css::uno; -using namespace css::lang; -using namespace css::beans; - class SVT_DLLPUBLIC DocumentToGraphicRenderer { - const Reference<XComponent>& mxDocument; + const css::uno::Reference<css::lang::XComponent>& mxDocument; - Reference<frame::XModel> mxModel; - Reference<frame::XController> mxController; - Reference<view::XRenderable> mxRenderable; - Reference<awt::XToolkit> mxToolkit; + css::uno::Reference<css::frame::XModel> mxModel; + css::uno::Reference<css::frame::XController> mxController; + css::uno::Reference<css::view::XRenderable> mxRenderable; + css::uno::Reference<css::awt::XToolkit> mxToolkit; public: - DocumentToGraphicRenderer(const Reference<XComponent>& xDocument); + DocumentToGraphicRenderer(const css::uno::Reference<css::lang::XComponent>& xDocument); ~DocumentToGraphicRenderer(); sal_Int32 getCurrentPageWriter( ); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index b346f8c25671..9f3784f912be 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -34,12 +34,6 @@ #include "svtools/svtdllapi.h" -using namespace css; -using namespace css::uno; -using namespace css::lang; -using namespace css::frame; -using namespace css::beans; - class SVT_DLLPUBLIC GraphicExportOptionsDialog : public ModalDialog { private: @@ -67,10 +61,10 @@ private: DECL_LINK( resolutionModifiedHandle, void* ); public: - GraphicExportOptionsDialog( Window* pWindow, const Reference<XComponent>& rxSourceDocument ); + GraphicExportOptionsDialog( Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); ~GraphicExportOptionsDialog(); - Sequence<PropertyValue> getFilterData(); + css::uno::Sequence<css::beans::PropertyValue> getFilterData(); }; #endif diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index 0c542d9148d3..ac9358f0a543 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -19,6 +19,10 @@ #include "GraphicExportOptionsDialog.hxx" +using namespace css::beans; +using namespace css::lang; +using namespace css::uno; + GraphicExportOptionsDialog::GraphicExportOptionsDialog(Window* pWindow, const Reference<XComponent>& rxSourceDocument) : ModalDialog(pWindow, "GraphicExporter", "svt/ui/GraphicExportOptionsDialog.ui"), mResolution(96.0), |