[Libreoffice-commits] core.git: desktop/inc desktop/source

[Huzaifa Iftikhar]

 desktop/inc/dp_gui.hrc                          |   94 ++++++++++++++++++++++++
 desktop/inc/dp_gui_shared.hxx                   |   48 ++++++++++++
 desktop/source/deployment/gui/dp_gui.hrc        |   94 ------------------------
 desktop/source/deployment/gui/dp_gui_shared.hxx |   48 ------------
 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx  |    4 -
 desktop/source/pkgchk/unopkg/unopkg_misc.cxx    |    2 
 6 files changed, 145 insertions(+), 145 deletions(-)

New commits:
commit fe18f5d51fcbdf1f331440265ba1b8866d03e459
Author: Huzaifa Iftikhar <huzaifa3196 at gmail.com>
Date:   Wed Dec 21 01:54:00 2016 +0530

    tdf#95416 Fix an include for 2 files in unopkg
    
    Change-Id: Id1fa09b6db6c90cd727182133e5f9f39383aa5e5
    Reviewed-on: https://gerrit.libreoffice.org/32255
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/inc/dp_gui.hrc
similarity index 100%
rename from desktop/source/deployment/gui/dp_gui.hrc
rename to desktop/inc/dp_gui.hrc
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/inc/dp_gui_shared.hxx
similarity index 100%
rename from desktop/source/deployment/gui/dp_gui_shared.hxx
rename to desktop/inc/dp_gui_shared.hxx
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index afd58d7..db83877 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "../../deployment/gui/dp_gui.hrc"
-#include "../../deployment/gui/dp_gui_shared.hxx"
+#include "dp_gui.hrc"
+#include "dp_gui_shared.hxx"
 #include "unopkg_shared.h"
 #include <osl/thread.h>
 #include <tools/resmgr.hxx>
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index c36a90b..eaab730 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -22,7 +22,7 @@
 #include "deployment.hrc"
 #include "unopkg_shared.h"
 #include "dp_identifier.hxx"
-#include "../../deployment/gui/dp_gui.hrc"
+#include "dp_gui.hrc"
 #include "lockfile.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>