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

[Libreoffice Gerrit user]

 comphelper/source/misc/lok.cxx |    2 +-
 desktop/source/lib/init.cxx    |    2 +-
 desktop/unx/source/splashx.c   |    2 +-
 include/comphelper/lok.hxx     |    4 ++--
 include/vcl/outdev.hxx         |    2 +-
 vcl/source/window/window.cxx   |    6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 8aa579830b20072af8d6e149d6b279362fe98b91
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Mar 12 11:46:17 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Mar 12 11:48:43 2019 +0200

    Write HiDPI consistently without a hyphen
    
    Hopefully makes it easier to find locations in the code related to
    HiDPI issues.
    
    Change-Id: I2b4e5ff6d66c0ca5792250c3fd0d42eeb59eb3ef

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index e5f3573cb391..2b47c6aa36d0 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -38,7 +38,7 @@ static bool g_bLocalRendering(false);
 
 static LanguageTag g_aLanguageTag("en-US", true);
 
-/// Scaling of the cairo or CoreGraphics canvas painting for hi-dpi or zooming in Calc.
+/// Scaling of the cairo or CoreGraphics canvas painting for HiDPI or zooming in Calc.
 static double g_fDPIScale(1.0);
 
 void setActive(bool bActive)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0ec7bdf3bad7..78c3d27474ed 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2332,7 +2332,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 
 #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
 
-    // Painting of zoomed or hi-dpi spreadsheets is special, we actually draw everything at 100%,
+    // Painting of zoomed or HiDPI spreadsheets is special, we actually draw everything at 100%,
     // and only set cairo's (or CoreGraphic's, in the iOS case) scale factor accordingly, so that
     // everything is painted bigger or smaller. This is different to what Calc's internal scaling
     // would do - because that one is trying to fit the lines between cells to integer multiples of
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index e03fc094abcb..9136876aa9df 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -554,7 +554,7 @@ static sal_Bool isHiDPI(struct splash* splash)
     double nDPI;
 
     /*
-     * GNOME currently enables hi-dpi support when the screen resolution is at least 192 dpi
+     * GNOME currently enables HiDPI support when the screen resolution is at least 192 dpi
      * and the screen height (in device pixels) is at least 1200.
      */
 
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index a2b7eb02bef3..5f132f9d15f8 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -59,9 +59,9 @@ COMPHELPER_DLLPUBLIC void setTiledPainting(bool bTiledPainting);
 COMPHELPER_DLLPUBLIC bool isDialogPainting();
 /// Set if we are painting the dialog.
 COMPHELPER_DLLPUBLIC void setDialogPainting(bool bDialogPainting);
-/// Set the DPI scale for rendering for hi-dpi displays.  Used also for zoom in Calc.
+/// Set the DPI scale for rendering for HiDPI displays.  Used also for zoom in Calc.
 COMPHELPER_DLLPUBLIC void setDPIScale(double fDPIScale);
-/// Get the DPI scale for rendering for hi-dpi displays.  Used also for zoom in Calc.
+/// Get the DPI scale for rendering for HiDPI displays.  Used also for zoom in Calc.
 COMPHELPER_DLLPUBLIC double getDPIScale();
 /// Set if we want no annotations rendering
 COMPHELPER_DLLPUBLIC void setTiledAnnotations(bool bTiledAnnotations);
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 42b1685a1e93..4beb600f3e02 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -348,7 +348,7 @@ private:
     long                            mnOutHeight;
     sal_Int32                       mnDPIX;
     sal_Int32                       mnDPIY;
-    sal_Int32                       mnDPIScalePercentage; ///< For Hi-DPI displays, we want to draw elements for a percentage larger
+    sal_Int32                       mnDPIScalePercentage; ///< For HiDPI displays, we want to draw elements for a percentage larger
     /// font specific text alignment offsets in pixel units
     mutable long                    mnTextOffX;
     mutable long                    mnTextOffY;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 10d1a4385622..c9ea334c0e66 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -917,7 +917,7 @@ static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI)
     // insult to an injury, the system is constantly lying to us about
     // the DPI and whatnot
     // eg. fdo#77059 - set the value from which we do consider the
-    // screen hi-dpi to greater than 168
+    // screen HiDPI to greater than 168
     if (nDPI > 216)      // 96 * 2   + 96 / 4
         return 250;
     else if (nDPI > 168) // 96 * 2   - 96 / 4
@@ -1129,7 +1129,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
 
     }
 
-    // setup the scale factor for Hi-DPI displays
+    // setup the scale factor for HiDPI displays
     mnDPIScalePercentage = CountDPIScaleFactor(mpWindowImpl->mpFrameData->mnDPIY);
     mnDPIX = mpWindowImpl->mpFrameData->mnDPIX;
     mnDPIY = mpWindowImpl->mpFrameData->mnDPIY;
@@ -1312,7 +1312,7 @@ void Window::ImplInitResolutionSettings()
         mnDPIX = mpWindowImpl->mpFrameData->mnDPIX;
         mnDPIY = mpWindowImpl->mpFrameData->mnDPIY;
 
-        // setup the scale factor for Hi-DPI displays
+        // setup the scale factor for HiDPI displays
         mnDPIScalePercentage = CountDPIScaleFactor(mpWindowImpl->mpFrameData->mnDPIY);
         const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings();
         SetPointFont(*this, rStyleSettings.GetAppFont());