This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 02bef86  Cleaned up resource files
02bef86 is described below

commit 02bef86092403eda21272770cf5745708c5c933e
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Jun 1 23:04:23 2020 +0200

    Cleaned up resource files
    
    (cherry picked from commit de77cd1de9d6cd3f569c19926e790d30576a52b3)
---
 main/sfx2/source/dialog/dialog.src  | 25 +++++------
 main/sfx2/source/dialog/dinfdlg.src |  4 +-
 main/sfx2/source/dialog/dinfedt.src | 51 +++++++++++-----------
 main/sfx2/source/dialog/srchdlg.src | 87 +++++++++++++++++++------------------
 4 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/main/sfx2/source/dialog/dialog.src 
b/main/sfx2/source/dialog/dialog.src
index c0b62d9..3ddeb77 100644
--- a/main/sfx2/source/dialog/dialog.src
+++ b/main/sfx2/source/dialog/dialog.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,21 +7,21 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
- // include ---------------------------------------------------------------
+// include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "dialog.hrc"
 #include "helpid.hrc"
@@ -33,7 +33,7 @@ String STR_RESET
 };
 String STR_APPLY
 {
-       Text [ en-US ] = "Apply";
+       Text [ en-US ] = "Apply" ;
 };
 String STR_TABPAGE_MANAGESTYLES
 {
@@ -97,36 +97,35 @@ Menu MN_CONTEXT_TEMPLDLG
  //------------------------------------------------------------------------
 String SID_NAVIGATOR
 {
-       Text [ en-US ] = "Navigator";
+       Text [ en-US ] = "Navigator" ;
 };
 String SID_TASKPANE
 {
-    Text [ en-US ] = "Task Pane";
+       Text [ en-US ] = "Task Pane" ;
 };
 String SID_SIDEBAR
 {
-    Text [ en-US ] = "Sidebar";
+       Text [ en-US ] = "Sidebar" ;
 };
 
 ErrorBox MSG_ERROR_WRONG_CONFIRM
 {
        BUTTONS = WB_OK ;
        DEFBUTTON = WB_DEF_OK ;
-       Message [ en-US ] = "Faulty password confirmation";
+       Message [ en-US ] = "Faulty password confirmation" ;
 };
 
 String STR_PDF_EXPORT_SEND
 {
-  Text [ en-US ] = "Send" ;
+       Text [ en-US ] = "Send" ;
 };
 
 Image IMG_INFO
 {
        ImageBitmap = Bitmap
        {
-        File = "info.png" ;
+               File = "info.png" ;
        };
 };
 
 // ******************************************************************* EOF
-
diff --git a/main/sfx2/source/dialog/dinfdlg.src 
b/main/sfx2/source/dialog/dinfdlg.src
index a181d45..e08a643 100644
--- a/main/sfx2/source/dialog/dinfdlg.src
+++ b/main/sfx2/source/dialog/dinfdlg.src
@@ -702,11 +702,11 @@ ImageButton SFX_PB_PROPERTY_REMOVE
 };
 Image SFX_IMG_PROPERTY_REMOVE
 {
-       ImageBitmap = Bitmap { File = "deleterow.png" ; } ;
+       ImageBitmap = Bitmap {File = "deleterow.png" ;} ;
 };
 Image SFX_IMG_PROPERTY_REMOVE_HC
 {
-       ImageBitmap = Bitmap { File = "deleterow_h.png" ; } ;
+       ImageBitmap = Bitmap {File = "deleterow_h.png" ;} ;
 };
 
 QueryBox SFX_QB_WRONG_TYPE
diff --git a/main/sfx2/source/dialog/dinfedt.src 
b/main/sfx2/source/dialog/dinfedt.src
index 5e96a6d..df58181 100644
--- a/main/sfx2/source/dialog/dinfedt.src
+++ b/main/sfx2/source/dialog/dinfedt.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -30,61 +30,62 @@ ModalDialog DLG_DOCINFO_EDT
        HelpId = HID_DOCINFO_EDT ;
        OutputSize = TRUE ;
        SVLook = TRUE ;
-       Size = MAP_APPFONT ( 166 , 79 ) ;
+       Size = MAP_APPFONT ( 166, 79 ) ;
        Text [ en-US ] = "Edit Field Names" ;
        Moveable = TRUE ;
        FixedLine FL_INFO
        {
-               Pos = MAP_APPFONT ( 6 , 3 ) ;
-               Size = MAP_APPFONT ( 98 , 8 ) ;
+               Pos = MAP_APPFONT ( 6, 3 ) ;
+               Size = MAP_APPFONT ( 98, 8 ) ;
                Text [ en-US ] = "Names" ;
        };
        Edit ED_INFO1
        {
-           HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1";
+               HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1" ;
                Border = TRUE ;
-               Pos = MAP_APPFONT ( 12 , 14 ) ;
-               Size = MAP_APPFONT ( 86 , 12 ) ;
+               Pos = MAP_APPFONT ( 12, 14 ) ;
+               Size = MAP_APPFONT ( 86, 12 ) ;
        };
        Edit ED_INFO2
        {
-           HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2";
+               HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2" ;
                Border = TRUE ;
-               Pos = MAP_APPFONT ( 12 , 29 ) ;
-               Size = MAP_APPFONT ( 86 , 12 ) ;
+               Pos = MAP_APPFONT ( 12, 29 ) ;
+               Size = MAP_APPFONT ( 86, 12 ) ;
        };
        Edit ED_INFO3
        {
-           HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3";
+               HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3" ;
                Border = TRUE ;
-               Pos = MAP_APPFONT ( 12 , 44 ) ;
-               Size = MAP_APPFONT ( 86 , 12 ) ;
+               Pos = MAP_APPFONT ( 12, 44 ) ;
+               Size = MAP_APPFONT ( 86, 12 ) ;
        };
        Edit ED_INFO4
        {
-           HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4";
+               HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4" ;
                Border = TRUE ;
-               Pos = MAP_APPFONT ( 12 , 59 ) ;
-               Size = MAP_APPFONT ( 86 , 12 ) ;
+               Pos = MAP_APPFONT ( 12, 59 ) ;
+               Size = MAP_APPFONT ( 86, 12 ) ;
        };
        OKButton BT_OK
        {
-               Pos = MAP_APPFONT ( 110 , 6 ) ;
-               Size = MAP_APPFONT ( 50 , 14 ) ;
+               Pos = MAP_APPFONT ( 110, 6 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
                DefButton = TRUE ;
        };
        CancelButton BT_CANCEL
        {
-               Pos = MAP_APPFONT ( 110 , 23 ) ;
-               Size = MAP_APPFONT ( 50 , 14 ) ;
+               Pos = MAP_APPFONT ( 110, 23 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
        };
        HelpButton BTN_HELP
        {
-               Pos = MAP_APPFONT ( 110 , 43 ) ;
-               Size = MAP_APPFONT ( 50 , 14 ) ;
+               Pos = MAP_APPFONT ( 110, 43 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
        };
 };
 
+// ********************************************************************** EOF
diff --git a/main/sfx2/source/dialog/srchdlg.src 
b/main/sfx2/source/dialog/srchdlg.src
index 740f902..b2af04e 100644
--- a/main/sfx2/source/dialog/srchdlg.src
+++ b/main/sfx2/source/dialog/srchdlg.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -33,75 +33,75 @@
 
 ModelessDialog RID_DLG_SEARCH
 {
-       HelpId = HID_SEARCHDIALOG;
-       OutputSize = TRUE;
-       Moveable = TRUE;
-       Closeable = TRUE;
-       Hide = TRUE;
-       Size = MAP_APPFONT( 218, 84 );
-       Text [ en-US ] = "Find on this Page";
+       HelpId = HID_SEARCHDIALOG ;
+       OutputSize = TRUE ;
+       Moveable = TRUE ;
+       Closeable = TRUE ;
+       Hide = TRUE ;
+       Size = MAP_APPFONT ( 218, 84 ) ;
+       Text [ en-US ] = "Find on this Page" ;
        FixedText FT_SEARCH
        {
-               Pos = MAP_APPFONT( 6, 3 );
-               Size = MAP_APPFONT( 150, 8 );
-               Text [ en-US ] = "~Search for";
+               Pos = MAP_APPFONT ( 6, 3 ) ;
+               Size = MAP_APPFONT ( 150, 8 ) ;
+               Text [ en-US ] = "~Search for" ;
        };
        ComboBox ED_SEARCH
        {
-           HelpID = "sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH";
-               Border = TRUE;
-               Pos = MAP_APPFONT( 6, 14 );
-               Size = MAP_APPFONT( 150, 50 );
+               HelpID = "sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH" ;
+               Border = TRUE ;
+               Pos = MAP_APPFONT ( 6, 14 ) ;
+               Size = MAP_APPFONT ( 150, 50 ) ;
                DropDown = TRUE ;
-               TabStop = TRUE;
+               TabStop = TRUE ;
        };
        CheckBox CB_WHOLEWORDS
        {
-           HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS";
-               Pos = MAP_APPFONT( 6, 29 );
-               Size = MAP_APPFONT( 150, 10 );
+               HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS" ;
+               Pos = MAP_APPFONT ( 6, 29 ) ;
+               Size = MAP_APPFONT ( 150, 10 ) ;
                Text [ en-US ] = "~Whole words only" ;
-               TabStop = TRUE;
+               TabStop = TRUE ;
        };
        CheckBox CB_MATCHCASE
        {
-           HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE";
-               Pos = MAP_APPFONT( 6, 42 );
-               Size = MAP_APPFONT( 150, 10 );
-               Text[ en-US ] = "~Match case";
-               TabStop = TRUE;
+               HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE" ;
+               Pos = MAP_APPFONT ( 6, 42 ) ;
+               Size = MAP_APPFONT ( 150, 10 ) ;
+               Text [ en-US ] = "~Match case" ;
+               TabStop = TRUE ;
        };
        CheckBox CB_WRAPAROUND
        {
-           HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND";
-               Pos = MAP_APPFONT( 6, 55 );
-               Size = MAP_APPFONT( 150, 10 );
+               HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND" ;
+               Pos = MAP_APPFONT ( 6, 55 ) ;
+               Size = MAP_APPFONT ( 150, 10 ) ;
                Text [ en-US ] = "Wrap ~around" ;
-               TabStop = TRUE;
+               TabStop = TRUE ;
        };
        CheckBox CB_BACKWARDS
        {
-           HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS";
-               Pos = MAP_APPFONT( 6, 68 );
-               Size = MAP_APPFONT( 150, 10 );
+               HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS" ;
+               Pos = MAP_APPFONT ( 6, 68 ) ;
+               Size = MAP_APPFONT ( 150, 10 ) ;
                Text [ en-US ] = "~Backwards" ;
-               TabStop = TRUE;
+               TabStop = TRUE ;
        };
        PushButton PB_FIND
        {
-           HelpID = "sfx2:PushButton:RID_DLG_SEARCH:PB_FIND";
-               Pos = MAP_APPFONT( 162, 6 );
-               Size = MAP_APPFONT( 50, 14 );
+               HelpID = "sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" ;
+               Pos = MAP_APPFONT ( 162, 6 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                Text [ en-US ] = "~Find" ;
-               TabStop = TRUE;
+               TabStop = TRUE ;
                DefButton = TRUE ;
        };
        CancelButton PB_CANCELFIND
        {
-               Pos = MAP_APPFONT( 162, 23 );
-               Size = MAP_APPFONT( 50, 14 );
+               Pos = MAP_APPFONT ( 162, 23 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                Text [ en-US ] = "~Close" ;
-               TabStop = TRUE;
+               TabStop = TRUE ;
        };
 
        String STR_TOGGLE
@@ -110,3 +110,4 @@ ModelessDialog RID_DLG_SEARCH
        };
 };
 
+// ********************************************************************** EOF

Reply via email to