Move ImplInitAppFontData from Window to Application

I have renamed ImplInitAppFontData to InitAppFontData and moved it from
Window to Application. This is because this is something that sets
*application* global variables, it just so happens it gets it from a
Window parameter. But it should be set when the application starts, so
I have moved it to Main().

Change-Id: I9d98aa5b533166f91352218af267930034648c7a
Reviewed-on: https://gerrit.libreoffice.org/9242
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

2 files changed, 19 insertions, 15 deletions

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 1b8f6e1deab0..ddf5c63cf7ac 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -265,6 +265,12 @@ public:
     */
     virtual void                Init();
 
+protected:
+    /** Initialize font data for the application.
+     */
+    virtual void                InitAppFontData();
+
+public:
     /** Finish initialization of the application.
 
      @see Init, DeInit
@@ -348,7 +354,7 @@ public:
 
      @returns true if exited successfully, false if not able to fully exit
     */
-    virtual bool           QueryExit();
+    virtual bool                QueryExit();
 
     /** Send user event.
 
@@ -626,7 +632,7 @@ public:
 
      @see IsInExecute, IsInModalMode
     */
-    static bool             IsInMain();
+    static bool                 IsInMain();
 
     /** Queries whether the application is in the event loop
 
@@ -634,7 +640,7 @@ public:
 
      @see IsInMain, IsInModalMode
     */
-    static bool             IsInExecute();
+    static bool                 IsInExecute();
 
     /** Queries whether application has a modal dialog active.
 
@@ -642,7 +648,7 @@ public:
 
      @see IsInMain, IsInExecute
     */
-    static bool             IsInModalMode();
+    static bool                 IsInModalMode();
 
     /** Return how many events are being dispatched.
 
@@ -679,7 +685,7 @@ public:
 
      @returns   true if UI is captured, false if not
      */
-    static bool             IsUICaptured();
+    static bool                 IsUICaptured();
 
     /** @name Settings
 
@@ -836,7 +842,7 @@ public:
 
      @see PostKeyEvent
     */
-    static bool             HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent );
+    static bool                 HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent );
 
     /** Send keypress event
 
@@ -902,7 +908,7 @@ public:
 
      @return true if there is a default window and the event could be posted to it successfully.
     */
-    static bool             PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
+    static bool                 PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
 
     /** Remove user event based on event ID
 
@@ -920,7 +926,7 @@ public:
 
      @return true if the handler was inserted successfully, false if it couldn't be inserted.
     */
-    static bool             InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority );
+    static bool                 InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority );
 
     /** Remove an idle handler from the application.
 
@@ -1173,7 +1179,7 @@ public:
 
      @see RemoveAccel
     */
-    static bool             InsertAccel( Accelerator* pAccel );
+    static bool                 InsertAccel( Accelerator* pAccel );
 
     /** Remove accelerator
 
@@ -1197,7 +1203,7 @@ public:
 
      @see EnableAutoMnemonic
     */
-    static bool             IsAutoMnemonicEnabled();
+    static bool                 IsAutoMnemonicEnabled();
 
     /** Get the number of reserved key codes used by the application.
 
@@ -1258,7 +1264,7 @@ public:
 
      @see EnableAutoHelpId
     */
-    static bool             IsAutoHelpIdEnabled();
+    static bool                 IsAutoHelpIdEnabled();
 
     ///@}
 
@@ -1316,7 +1322,7 @@ public:
 
      @see GetDialogCancelMode, SetDialogCancelMode
     */
-    static bool             IsDialogCancelEnabled();
+    static bool                 IsDialogCancelEnabled();
 
 
     /** Make a dialog box a system window or not.
@@ -1419,7 +1425,7 @@ public:
 
      @see EnableHeadlessMode, IsHeadlessModeRequested
     */
-    static bool             IsHeadlessModeEnabled();
+    static bool                 IsHeadlessModeEnabled();
 
     /** Check command line arguments for \code --headless \endcode
 
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 001dfd5c1d7c..9aa9a74cb4e0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -384,8 +384,6 @@ public:
     DECL_DLLPRIVATE_LINK(      ImplHideOwnerDrawWindowsHdl, void* );
 
 
-    SAL_DLLPRIVATE static void          ImplInitAppFontData( Window* pWindow );
-
     SAL_DLLPRIVATE Window*              ImplGetFrameWindow() const;
     SalFrame*                           ImplGetFrame() const;
     SAL_DLLPRIVATE ImplFrameData*       ImplGetFrameData();