[Libreoffice-commits] core.git: include/vcl svtools/inc svtools/source

[Shubham Verma]

 include/vcl/fltcall.hxx                         |   15 -------
 svtools/inc/FltCallDialogParameter.hxx          |   49 ++++++++++++++++++++++++
 svtools/source/filter/SvFilterOptionsDialog.cxx |    2 
 svtools/source/filter/exportdialog.hxx          |    2 
 4 files changed, 51 insertions(+), 17 deletions(-)

New commits:
commit 63a342ec65f702bfe27de0f0343f75198e6103dc
Author: Shubham Verma <lifemeansmore008 at gmail.com>
Date:   Sat Feb 24 01:30:09 2018 +0530

    tdf#97228 Moved struct FltCallDialogParameter
    
    Moved struct FltCallDialogParameter to svtools/inc as this struct is
    used only in the files located there . A separate header file is made
    named FltCallDialogParameter.hxx which has this struct and appropriate
    modification are done to the inclusion of header files in each file.
    
    Change-Id: I60326b58fcbbb9c34abdb7c3de48667268b5d5e5
    Reviewed-on: https://gerrit.libreoffice.org/50265
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx
index 1aba65e43aae..6d0b3d223f30 100644
--- a/include/vcl/fltcall.hxx
+++ b/include/vcl/fltcall.hxx
@@ -30,21 +30,6 @@ class SvStream;
 class Graphic;
 namespace vcl { class Window; }
 
-struct FltCallDialogParameter
-{
-
-    VclPtr<vcl::Window> pWindow;
-    FieldUnit   eFieldUnit;
-    OUString    aFilterExt;
-
-    // In and Out PropertySequence for all filter dialogs
-    css::uno::Sequence< css::beans::PropertyValue > aFilterData;
-
-    FltCallDialogParameter( vcl::Window* pW, FieldUnit eFiUni ) :
-        pWindow         ( pW ),
-        eFieldUnit      ( eFiUni ) {};
-};
-
 typedef bool (*PFilterCall)(SvStream & rStream, Graphic & rGraphic,
                             FilterConfigItem* pConfigItem);
     // Of this type are both export-filter and import-filter functions
diff --git a/svtools/inc/FltCallDialogParameter.hxx b/svtools/inc/FltCallDialogParameter.hxx
new file mode 100644
index 000000000000..d3310a078cbb
--- /dev/null
+++ b/svtools/inc/FltCallDialogParameter.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVTOOLS_INC_FTLCALLDIALOGPARAMETER_HXX
+#define INCLUDED_SVTOOLS_INC_FTLCALLDIALOGPARAMETER_HXX
+#include <sal/types.h>
+#include <vcl/field.hxx>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <vcl/FilterConfigItem.hxx>
+
+class FilterConfigItem;
+class SvStream;
+class Graphic;
+namespace vcl
+{
+class Window;
+}
+
+struct FltCallDialogParameter
+{
+    VclPtr<vcl::Window> pWindow;
+    FieldUnit eFieldUnit;
+    OUString aFilterExt;
+
+    // In and Out PropertySequence for all filter dialogs
+    css::uno::Sequence<css::beans::PropertyValue> aFilterData;
+
+    FltCallDialogParameter(vcl::Window* pW, FieldUnit eFiUni)
+        : pWindow(pW)
+        , eFieldUnit(eFiUni){};
+};
+#endif
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index d132af8d0734..43a466b1b947 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -25,7 +25,7 @@
 #include <osl/module.hxx>
 #include <rtl/ref.hxx>
 #include <svl/solar.hrc>
-#include <vcl/fltcall.hxx>
+#include <FltCallDialogParameter.hxx>
 #include <vcl/settings.hxx>
 #include "exportdialog.hxx"
 #include <uno/mapping.hxx>
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index a6fb96e77e2a..ad41a4d8b125 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX
 #define INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX
 
-#include <vcl/fltcall.hxx>
+#include <FltCallDialogParameter.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>