f325b2
From 8d464eb04df9fe579f8ee24a476c18af8afe3fcb Mon Sep 17 00:00:00 2001
f325b2
From: Pranav Kant <pranavk@gnome.org>
f325b2
Date: Mon, 19 Oct 2015 22:36:12 +0530
f325b2
Subject: [PATCH 221/398] lokdocview: Use G_PARAM_STATIC_STRINGS
f325b2
f325b2
... as `name`, `nick`, and `blurb` are guaranteed to remain valid
f325b2
and unmodified for the lifetime of the parameters.
f325b2
f325b2
Change-Id: Ic6463b470546669d5a815842daedb170df85d161
f325b2
Reviewed-on: https://gerrit.libreoffice.org/19472
f325b2
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
f325b2
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
f325b2
(cherry picked from commit d2d5a00e0e3972c0021e2e664301a32da6e54c1a)
f325b2
---
f325b2
 libreofficekit/source/gtk/lokdocview.cxx | 42 ++++++++++++++++++++------------
f325b2
 1 file changed, 26 insertions(+), 16 deletions(-)
f325b2
f325b2
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
index 4af48bbea5a5..dc1ae5544558 100644
f325b2
--- a/libreofficekit/source/gtk/lokdocview.cxx
f325b2
+++ b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
@@ -1638,8 +1638,9 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                               "LO Path",
f325b2
                               "LibreOffice Install Path",
f325b2
                               0,
f325b2
-                              static_cast<GParamFlags>(G_PARAM_READWRITE
f325b2
-                                                       | G_PARAM_CONSTRUCT_ONLY)));
f325b2
+                              static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                       G_PARAM_CONSTRUCT_ONLY |
f325b2
+                                                       G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:lopointer:
f325b2
@@ -1650,10 +1651,11 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
     g_object_class_install_property (pGObjectClass,
f325b2
           PROP_LO_POINTER,
f325b2
           g_param_spec_pointer("lopointer",
f325b2
-                              "LO Pointer",
f325b2
-                              "A LibreOfficeKit* from lok_init()",
f325b2
-                              static_cast<GParamFlags>(G_PARAM_READWRITE
f325b2
-                                                       | G_PARAM_CONSTRUCT_ONLY)));
f325b2
+                               "LO Pointer",
f325b2
+                               "A LibreOfficeKit* from lok_init()",
f325b2
+                               static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                        G_PARAM_CONSTRUCT_ONLY |
f325b2
+                                                        G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:docpath:
f325b2
@@ -1666,7 +1668,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                               "Document Path",
f325b2
                               "The URI of the document to open",
f325b2
                               0,
f325b2
-                              static_cast<GParamFlags>(G_PARAM_READWRITE)));
f325b2
+                              static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                       G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:docpointer:
f325b2
@@ -1677,9 +1680,10 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
     g_object_class_install_property (pGObjectClass,
f325b2
           PROP_DOC_POINTER,
f325b2
           g_param_spec_pointer("docpointer",
f325b2
-                              "Document Pointer",
f325b2
-                              "A LibreOfficeKitDocument* from documentLoad()",
f325b2
-                              static_cast<GParamFlags>(G_PARAM_READWRITE)));
f325b2
+                               "Document Pointer",
f325b2
+                               "A LibreOfficeKitDocument* from documentLoad()",
f325b2
+                               static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                        G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:editable:
f325b2
@@ -1692,7 +1696,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                                "Editable",
f325b2
                                "Whether the content is in edit mode or not",
f325b2
                                FALSE,
f325b2
-                               static_cast<GParamFlags>(G_PARAM_READWRITE)));
f325b2
+                               static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                        G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:load-progress:
f325b2
@@ -1708,7 +1713,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                               "Estimated Load Progress",
f325b2
                               "Shows the progress of the document load operation",
f325b2
                               0.0, 1.0, 0.0,
f325b2
-                              G_PARAM_READABLE));
f325b2
+                              static_cast<GParamFlags>(G_PARAM_READABLE |
f325b2
+                                                       G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:zoom-level:
f325b2
@@ -1723,7 +1729,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                              "The current zoom level of the content",
f325b2
                              0, 5.0, 1.0,
f325b2
                              static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
-                                                      G_PARAM_CONSTRUCT)));
f325b2
+                                                      G_PARAM_CONSTRUCT |
f325b2
+                                                      G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:is-loading:
f325b2
@@ -1737,7 +1744,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                                "Is Loading",
f325b2
                                "Whether the view is loading a document",
f325b2
                                FALSE,
f325b2
-                               static_cast<GParamFlags>(G_PARAM_READABLE)));
f325b2
+                               static_cast<GParamFlags>(G_PARAM_READABLE |
f325b2
+                                                        G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:doc-width:
f325b2
@@ -1750,7 +1758,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                             "Document Width",
f325b2
                             "Width of the document in twips",
f325b2
                             0, G_MAXLONG, 0,
f325b2
-                            static_cast<GParamFlags>(G_PARAM_READWRITE)));
f325b2
+                            static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                     G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:doc-height:
f325b2
@@ -1763,7 +1772,8 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                             "Document Height",
f325b2
                             "Height of the document in twips",
f325b2
                             0, G_MAXLONG, 0,
f325b2
-                            static_cast<GParamFlags>(G_PARAM_READWRITE)));
f325b2
+                            static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
+                                                     G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
     /**
f325b2
      * LOKDocView:can-zoom-in:
f325b2
-- 
f325b2
2.12.0
f325b2