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

[Sumit Chauhan (via logerrit)]

 include/vcl/notebookbar.hxx        |    5 -----
 vcl/source/control/notebookbar.cxx |   31 +++++++++++++++++--------------
 2 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit e598440a946ba3e7785b81f57a36673f7b88db2e
Author:     Sumit Chauhan <sumitcn25 at gmail.com>
AuthorDate: Fri Jun 14 02:30:48 2019 +0530
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jun 14 08:20:43 2019 +0200

    Refactoring - Converting private methods to static non-member methods
    
    Related Patch: https://gerrit.libreoffice.org/#/c/72313/
    
    Change-Id: I3f30b4abe87f16e94d7c29bf9b9413b59b825e5e
    Reviewed-on: https://gerrit.libreoffice.org/73986
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 5ca3798587c4..e7ed5c79dc44 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -13,7 +13,6 @@
 #include <vcl/builder.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/settings.hxx>
-#include <osl/file.hxx>
 #include <vector>
 
 namespace com { namespace sun { namespace star { namespace ui { class XContextChangeEventListener; } } } }
@@ -58,12 +57,8 @@ private:
 
     void UpdateDefaultSettings();
     void UpdatePersonaSettings();
-    static OUString getCustomizedUIRootDir();
-    static bool doesFileExist(const OUString& sUIDir, const OUString& sUIFile);
-
 };
 
-
 #endif // INCLUDED_VCL_NOTEBOOKBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 1865af605799..7a3a70370497 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -16,8 +16,25 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/vclevent.hxx>
 #include <rtl/bootstrap.hxx>
+#include <osl/file.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
+
+static OUString getCustomizedUIRootDir()
+{
+    OUString sShareLayer("$BRAND_BASE_DIR/user/config/soffice.cfg/");
+    rtl::Bootstrap::expandMacros(sShareLayer);
+    return sShareLayer;
+}
+
+static bool doesFileExist(const OUString& sUIDir, const OUString& sUIFile)
+{
+    OUString sUri = sUIDir + sUIFile;
+    osl::File file(sUri);
+    sal_uInt32 flag = 0;
+    return( file.open(flag) == osl::FileBase::E_None );
+}
+
 /**
  * split from the main class since it needs different ref-counting mana
  */
@@ -257,18 +274,4 @@ void NotebookBar::UpdatePersonaSettings()
     PersonaSettings = aAllSettings;
 }
 
-OUString NotebookBar::getCustomizedUIRootDir()
-{
-    OUString sShareLayer("$BRAND_BASE_DIR/user/config/soffice.cfg/");
-    rtl::Bootstrap::expandMacros(sShareLayer);
-    return sShareLayer;
-}
-
-bool NotebookBar::doesFileExist(const OUString& sUIDir, const OUString& sUIFile)
-{
-    OUString sUri = sUIDir + sUIFile;
-    osl::File file(sUri);
-    sal_uInt32 flag = 0;
-    return( file.open(flag) == osl::FileBase::E_None );
-}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file